From 3ac9636934e9623ed933c07944d252d2817967e4 Mon Sep 17 00:00:00 2001
From: Leonid Tyurin <lenyatyurin162586@gmail.com>
Date: Thu, 16 Jan 2025 07:03:10 +0100
Subject: [PATCH] feat: update launcher (#1190)

---
 multichain-aggregator/Cargo.lock                         | 5 +++--
 multichain-aggregator/Cargo.toml                         | 2 +-
 .../multichain-aggregator-server/src/server.rs           | 9 +--------
 .../multichain-aggregator-server/src/settings.rs         | 1 +
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/multichain-aggregator/Cargo.lock b/multichain-aggregator/Cargo.lock
index 351c5d97c..32894556b 100644
--- a/multichain-aggregator/Cargo.lock
+++ b/multichain-aggregator/Cargo.lock
@@ -960,9 +960,9 @@ dependencies = [
 
 [[package]]
 name = "blockscout-service-launcher"
-version = "0.14.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a63d6b6e01527cefc2c82f2ef1b874817d4d6cb51f9bacffd116a94917387dc6"
+checksum = "b8e45f89da573b06db372454bdabe7fd3efb96ce12a1d27fffe042ef032177be"
 dependencies = [
  "actix-cors",
  "actix-web",
@@ -982,6 +982,7 @@ dependencies = [
  "sea-orm-migration",
  "serde",
  "serde_json",
+ "serde_with 3.12.0",
  "tokio",
  "tonic",
  "tracing",
diff --git a/multichain-aggregator/Cargo.toml b/multichain-aggregator/Cargo.toml
index 3e93fc70e..2217b569a 100644
--- a/multichain-aggregator/Cargo.toml
+++ b/multichain-aggregator/Cargo.toml
@@ -21,7 +21,7 @@ actix-prost-build = { git = "https://github.com/blockscout/actix-prost", tag = "
 ] }
 actix-prost-macros = { git = "https://github.com/blockscout/actix-prost", tag = "v1.0.2" }
 actix-web = "4.2"
-blockscout-service-launcher = { version = "0.14.0", features = [
+blockscout-service-launcher = { version = "0.16.1", features = [
     "database-1_0",
 ] }
 prost = "0.11"
diff --git a/multichain-aggregator/multichain-aggregator-server/src/server.rs b/multichain-aggregator/multichain-aggregator-server/src/server.rs
index 0c4df9ce9..04c3203a7 100644
--- a/multichain-aggregator/multichain-aggregator-server/src/server.rs
+++ b/multichain-aggregator/multichain-aggregator-server/src/server.rs
@@ -52,14 +52,7 @@ pub async fn run(settings: Settings) -> Result<(), anyhow::Error> {
 
     let health = Arc::new(HealthService::default());
 
-    let mut connect_options = sea_orm::ConnectOptions::new(settings.database.connect.clone().url());
-    connect_options.sqlx_logging_level(tracing::log::LevelFilter::Debug);
-    let db = database::initialize_postgres::<Migrator>(
-        connect_options,
-        settings.database.create_database,
-        settings.database.run_migrations,
-    )
-    .await?;
+    let db = database::initialize_postgres::<Migrator>(&settings.database).await?;
 
     // Initialize/update Blockscout chains
     let blockscout_chains = BlockscoutChainsClient::builder()
diff --git a/multichain-aggregator/multichain-aggregator-server/src/settings.rs b/multichain-aggregator/multichain-aggregator-server/src/settings.rs
index 0b8e1ba4a..92a6a55b5 100644
--- a/multichain-aggregator/multichain-aggregator-server/src/settings.rs
+++ b/multichain-aggregator/multichain-aggregator-server/src/settings.rs
@@ -74,6 +74,7 @@ impl Settings {
             jaeger: Default::default(),
             database: DatabaseSettings {
                 connect: DatabaseConnectSettings::Url(database_url),
+                connect_options: Default::default(),
                 create_database: Default::default(),
                 run_migrations: Default::default(),
             },