Use database settings from BSL

blockscout · Dec 27, 2023 · bad8909 · bad8909
1 parent cb6b4ec
commit bad8909
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 58 deletions.
diff --git a/blockscout-ens/Cargo.lock b/blockscout-ens/Cargo.lock
diff --git a/blockscout-ens/bens-server/Cargo.toml b/blockscout-ens/bens-server/Cargo.toml
@@ -12,7 +12,7 @@ bens-logic = { path = "../bens-logic" }
 actix-web = "4.2"
 anyhow = "1.0"
 blockscout-display-bytes = "1.0"
-blockscout-service-launcher = { version = "0.9.0", features = [ "database-0_12" ] }
+blockscout-service-launcher = { git = "https://github.com/blockscout/blockscout-rs", rev = "22ba428", features = ["database-0_12"] }
 config = "0.13"
 ethers = "2.0.0"
 serde = "1.0"
@@ -38,6 +38,6 @@ features = [
 
 [dev-dependencies]
 bens-logic = { path = "../bens-logic", features = ["test-utils"] }
-blockscout-service-launcher = { version = "0.9.0", features = [ "database-0_12", "test-server" ] }
+blockscout-service-launcher = { git = "https://github.com/blockscout/blockscout-rs", rev = "22ba428", features = [ "database-0_12", "test-server" ] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 pretty_assertions = "1.4.0"
diff --git a/blockscout-ens/bens-server/src/settings.rs b/blockscout-ens/bens-server/src/settings.rs
@@ -1,4 +1,5 @@
 use blockscout_service_launcher::{
+    database::{DatabaseConnectSettings, DatabaseSettings},
     launcher::{ConfigSettings, MetricsSettings, ServerSettings},
     tracing::{JaegerSettings, TracingSettings},
 };
@@ -84,59 +85,6 @@ impl From<SubgraphSettings> for bens_logic::subgraphs_reader::SubgraphSettings {
     }
 }
 
-// TODO: move database settings to blockscout-service-launcher
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq)]
-#[serde(deny_unknown_fields)]
-pub struct DatabaseSettings {
-    pub connect: DatabaseConnectSettings,
-}
-
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq)]
-#[serde(deny_unknown_fields, rename_all = "lowercase")]
-pub enum DatabaseConnectSettings {
-    Url(String),
-    Kv(DatabaseKvConnection),
-}
-
-impl DatabaseConnectSettings {
-    pub fn url(self) -> String {
-        match self {
-            DatabaseConnectSettings::Url(s) => s,
-            DatabaseConnectSettings::Kv(kv) => kv.url(),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq)]
-#[serde(deny_unknown_fields)]
-pub struct DatabaseKvConnection {
-    pub host: String,
-    pub port: u16,
-    pub user: String,
-    pub password: String,
-    #[serde(default)]
-    pub dbname: Option<String>,
-    #[serde(default)]
-    pub options: Option<String>,
-}
-
-impl DatabaseKvConnection {
-    pub fn url(self) -> String {
-        let dbname = self
-            .dbname
-            .map(|dbname| format!("/{dbname}"))
-            .unwrap_or_default();
-        let options = self
-            .options
-            .map(|options| format!("?{options}"))
-            .unwrap_or_default();
-        format!(
-            "postgresql://{}:{}@{}:{}{}{}",
-            self.user, self.password, self.host, self.port, dbname, options
-        )
-    }
-}
-
 #[derive(Debug, Clone, Deserialize, PartialEq, Eq)]
 #[serde(deny_unknown_fields, default)]
 pub struct BlockscoutSettings {
@@ -179,6 +127,8 @@ impl Settings {
             subgraphs_reader: Default::default(),
             database: DatabaseSettings {
                 connect: DatabaseConnectSettings::Url(database_url),
+                create_database: Default::default(),
+                run_migrations: Default::default(),
             },
         }
     }