refactor(config)!: re-design and clean-up configuration

src/bin/inx-chronicle/cli.rs

@@ -113,12 +113,20 @@ impl From<&InfluxDbArgs> for chronicle::db::influxdb::InfluxDbConfig {
             password: value.influxdb_password.clone(),
             #[cfg(feature = "analytics")]
             analytics_enabled: !value.disable_analytics,
+            #[cfg(not(feature = "analytics"))]
+            analytics_enabled: false,
             #[cfg(feature = "analytics")]
             analytics_database_name: value.analytics_database_name.clone(),
+            #[cfg(not(feature = "analytics"))]
+            analytics_database_name: String::new(),
             #[cfg(feature = "metrics")]
             metrics_enabled: !value.disable_metrics,
+            #[cfg(not(feature = "metrics"))]
+            metrics_enabled: false,
             #[cfg(feature = "metrics")]
             metrics_database_name: value.metrics_database_name.clone(),
+            #[cfg(not(feature = "metrics"))]
+            metrics_database_name: String::new(),
         }
     }
 }
@@ -291,7 +299,7 @@ impl ClArgs {
                     );
                     return Ok(PostCommand::Exit);
                 }
-                #[cfg(all(feature = "analytics", feature = "stardust"))]
+                #[cfg(all(feature = "analytics", feature = "stardust", feature = "inx"))]
                 Subcommands::FillAnalytics {
                     start_milestone,
                     end_milestone,

src/bin/inx-chronicle/main.rs

@@ -54,14 +54,16 @@ async fn main() -> eyre::Result<()> {
     #[cfg(all(feature = "inx", feature = "stardust"))]
     if config.inx.enabled {
         #[cfg(any(feature = "analytics", feature = "metrics"))]
+        #[allow(clippy::vec_init_then_push)]
         let influx_db = if config.influxdb.analytics_enabled || config.influxdb.metrics_enabled {
             info!("Connecting to influx database at address `{}`", config.influxdb.url);
             let influx_db = chronicle::db::influxdb::InfluxDb::connect(&config.influxdb).await?;
-            info!(
-                "Connected to influx databases `{}` and `{}`",
-                influx_db.analytics().database_name(),
-                influx_db.metrics().database_name()
-            );
+            let mut databases = vec![];
+            #[cfg(feature = "analytics")]
+            databases.push(influx_db.analytics().database_name());
+            #[cfg(feature = "metrics")]
+            databases.push(influx_db.metrics().database_name());
+            info!("Connected to influx databases `{databases:?}`");
             Some(influx_db)
         } else {
             None

src/db/influxdb/config.rs

@@ -12,16 +12,12 @@ pub const DEFAULT_USERNAME: &str = "root";
 /// The default InfluxDb password.
 pub const DEFAULT_PASSWORD: &str = "password";
 /// The default whether to enable influx analytics writes.
-#[cfg(feature = "analytics")]
 pub const DEFAULT_ANALYTICS_ENABLED: bool = true;
 /// The default name of the analytics database to connect to.
-#[cfg(feature = "analytics")]
 pub const DEFAULT_ANALYTICS_DATABASE_NAME: &str = "chronicle_analytics";
 /// The default whether to enable influx metrics writes.
-#[cfg(feature = "metrics")]
 pub const DEFAULT_METRICS_ENABLED: bool = true;
 /// The default name of the metrics database to connect to.
-#[cfg(feature = "metrics")]
 pub const DEFAULT_METRICS_DATABASE_NAME: &str = "chronicle_metrics";
 
 /// The influxdb [`influxdb::Client`] config.
@@ -36,16 +32,12 @@ pub struct InfluxDbConfig {
     /// The InfluxDb password.
     pub password: String,
     /// Whether to enable influx analytics writes.
-    #[cfg(feature = "analytics")]
     pub analytics_enabled: bool,
     /// The name of the database to insert analytics.
-    #[cfg(feature = "analytics")]
     pub analytics_database_name: String,
     /// Whether to enable influx metrics writes.
-    #[cfg(feature = "metrics")]
     pub metrics_enabled: bool,
     /// The name of the database to insert metrics.
-    #[cfg(feature = "metrics")]
     pub metrics_database_name: String,
 }
 
@@ -55,13 +47,9 @@ impl Default for InfluxDbConfig {
             url: DEFAULT_URL.to_string(),
             username: DEFAULT_USERNAME.to_string(),
             password: DEFAULT_PASSWORD.to_string(),
-            #[cfg(feature = "analytics")]
             analytics_enabled: DEFAULT_ANALYTICS_ENABLED,
-            #[cfg(feature = "analytics")]
             analytics_database_name: DEFAULT_ANALYTICS_DATABASE_NAME.to_string(),
-            #[cfg(feature = "metrics")]
             metrics_enabled: DEFAULT_METRICS_ENABLED,
-            #[cfg(feature = "metrics")]
             metrics_database_name: DEFAULT_METRICS_DATABASE_NAME.to_string(),
         }
     }

src/db/mongodb/collection.rs

@@ -145,12 +145,13 @@ pub trait MongoDbCollectionExt: MongoDbCollection {
 }
 impl<T: MongoDbCollection> MongoDbCollectionExt for T {}
 
-pub(crate) struct InsertResult {
-    pub(crate) _ignored: usize,
+pub struct InsertResult {
+    pub _ignored: usize,
 }
 
+#[allow(missing_docs)]
 #[async_trait]
-pub(crate) trait InsertIgnoreDuplicatesExt<T> {
+pub trait InsertIgnoreDuplicatesExt<T> {
     /// Inserts many records and ignores duplicate key errors.
     async fn insert_many_ignore_duplicates(
         &self,

src/db/mongodb/mod.rs

@@ -16,8 +16,7 @@ use mongodb::{
     Client,
 };
 
-pub(crate) use self::collection::InsertIgnoreDuplicatesExt;
-pub use self::collection::{MongoDbCollection, MongoDbCollectionExt};
+pub use self::collection::{InsertIgnoreDuplicatesExt, MongoDbCollection, MongoDbCollectionExt};
 
 const DUPLICATE_KEY_CODE: i32 = 11000;