Use factored out Postgres config args

mintlayer · Sep 27, 2023 · 4b49754 · 4b49754
1 parent 4d50127
commit 4b49754
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/api-server/scanner-daemon/src/main.rs b/api-server/scanner-daemon/src/main.rs
@@ -124,12 +124,7 @@ async fn main() -> Result<(), ApiServerScannerError> {
         rpc_cookie_file,
         rpc_username,
         rpc_password,
-        postgres_host,
-        postgres_port,
-        postgres_user,
-        postgres_password,
-        postgres_database,
-        postgres_max_connections,
+        postgres_config,
     } = args;
 
     let chain_type: ChainType = network.into();
@@ -161,12 +156,12 @@ async fn main() -> Result<(), ApiServerScannerError> {
         .map_err(ApiServerScannerError::RpcError)?;
 
     let storage = make_postgres_storage(
-        postgres_host,
-        postgres_port,
-        postgres_user,
-        postgres_password,
-        postgres_database,
-        postgres_max_connections,
+        postgres_config.postgres_host,
+        postgres_config.postgres_port,
+        postgres_config.postgres_user,
+        postgres_config.postgres_password,
+        postgres_config.postgres_database,
+        postgres_config.postgres_max_connections,
         &chain_config,
     )
     .await?;

diff --git a/api-server/web-server/src/main.rs b/api-server/web-server/src/main.rs
@@ -44,12 +44,12 @@ async fn main() {
     let chain_config = Arc::new(create_unit_test_config());
 
     let storage = TransactionalApiServerPostgresStorage::new(
-        &args.postgres_host,
-        args.postgres_port,
-        &args.postgres_user,
-        args.postgres_password.as_deref(),
-        args.postgres_database.as_deref(),
-        args.postgres_max_connections,
+        &args.postgres_config.postgres_host,
+        args.postgres_config.postgres_port,
+        &args.postgres_config.postgres_user,
+        args.postgres_config.postgres_password.as_deref(),
+        args.postgres_config.postgres_database.as_deref(),
+        args.postgres_config.postgres_max_connections,
         &chain_config,
     )
     .await