feat: fixed messages and renamed config vars

config/maximal-config-example.toml

@@ -35,11 +35,11 @@ port = 7300
 postgres_url = "postgres://postgres@postgres:5432/postgres"
 # You can also use the following fields to specify the connection details separately.
 # either use `postgres_url` or the following fields.
-postgres_host = "postgres-host"
-postgres_port = 5432
-postgres_user = "user"
-postgres_password = "pwd"
-postgress_db = "postgres"
+host = "postgres-host"
+port = 5432
+user = "user"
+password = "pwd"
+database = "postgres"
 
 [graph_node]
 # URL to your graph-node's query endpoint

config/minimal-config-example.toml

@@ -21,11 +21,11 @@ operator_mnemonic = "celery smart tip orange scare van steel radio dragon joy al
 postgres_url = "postgres://postgres@postgres:5432/postgres"
 # You can also use the following fields to specify the connection details separately.
 # either use `postgres_url` or the following fields.
-postgres_host = "postgres-host"
-postgres_port = 5432
-postgres_user = "user"
-postgres_password = "pwd"
-postgress_db = "postgres"
+host = "postgres-host"
+port = 5432
+user = "user"
+password = "pwd"
+database = "postgres"
 
 [graph_node]
 # URL to your graph-node's query endpoint

config/src/config.rs

@@ -161,9 +161,9 @@ pub enum DatabaseConfig {
     },
 }
 impl DatabaseConfig {
-    pub fn get_formated_postgres_url(&self) -> Url {
+    pub fn get_formated_postgres_url(self) -> Url {
         match self {
-            DatabaseConfig::PostgresUrl { postgres_url } => postgres_url.clone(),
+            DatabaseConfig::PostgresUrl { postgres_url } => postgres_url,
             DatabaseConfig::PostgresVars {
                 host,
                 port,
@@ -172,11 +172,14 @@ impl DatabaseConfig {
                 database,
             } => {
                 let postgres_url_str = format!("postgres://{}@{}/{}", user, host, database);
-                let mut postgres_url = Url::parse(&postgres_url_str).unwrap();
+                let mut postgres_url =
+                    Url::parse(&postgres_url_str).expect("Failed to parse database_url");
                 postgres_url
                     .set_password(password.as_deref())
-                    .expect("url is wrong");
-                postgres_url.set_port(*port).expect("url is wrong");
+                    .expect("Failed to set password for database");
+                postgres_url
+                    .set_port(port)
+                    .expect("Failed to set port for database");
                 postgres_url
             }
         }