fix default configuration

Author: ghubertpalo

mithril-aggregator/Cargo.toml

@@ -36,7 +36,7 @@ warp = "0.3"
 
 [dev-dependencies]
 httpmock = "0.6.6"
-mithril-common = { path = "../mithril-common", features = ["test_only", "allow_skip_signer_certification"] }
+mithril-common = { path = "../mithril-common", features = ["allow_skip_signer_certification"] }
 mockall = "0.11.0"
 slog-term = "2.9.0"
 tempfile = "3.3.0"

mithril-aggregator/config/preview.json

@@ -1,4 +1,5 @@
 {
+    "environment": "Production",
     "cardano_cli_path": "cardano-cli",
     "cardano_node_socket_path": "/tmp/cardano.sock",
     "network": "preview",
@@ -16,4 +17,4 @@
     "genesis_verification_key": "5b3132372c37332c3132342c3136312c362c3133372c3133312c3231332c3230372c3131372c3139382c38352c3137362c3139392c3136322c3234312c36382c3132332c3131392c3134352c31332c3233322c3234332c34392c3232392c322c3234392c3230352c3230352c33392c3233352c34345d",
     "limit_keys_in_stores": 5,
     "era_adapter_type": "bootstrap"
-}
+}

mithril-aggregator/src/configuration.rs

@@ -66,9 +66,6 @@ pub struct Configuration {
     /// Protocol parameters
     pub protocol_parameters: ProtocolParameters,
 
-    /// Snapshots manifest location
-    pub url_snapshot_manifest: String,
-
     /// Type of snapshot uploader to use
     pub snapshot_uploader_type: SnapshotUploaderType,
 
@@ -97,7 +94,10 @@ pub struct Configuration {
     pub genesis_verification_key: HexEncodedGenesisVerificationKey,
 
     /// Should the immutable cache be reset or not
-    pub reset_digests_cache: Option<bool>,
+    pub reset_digests_cache: bool,
+
+    /// Use the digest caching strategy
+    pub disable_digests_cache: bool,
 
     /// Max number of records in stores.
     /// When new records are added, oldest records are automatically deleted so
@@ -122,8 +122,9 @@ pub enum SnapshotUploaderType {
     Local,
 }
 
-impl Default for Configuration {
-    fn default() -> Self {
+impl Configuration {
+    /// Create a sample configuration mainly for tests
+    pub fn new_sample() -> Self {
         let genesis_verification_key = ProtocolGenesisSigner::create_deterministic_genesis_signer()
             .create_genesis_verifier()
             .to_verification_key();
@@ -139,8 +140,6 @@ impl Default for Configuration {
                 m: 100,
                 phi_f: 0.95,
             },
-            url_snapshot_manifest: "https://storage.googleapis.com/cardano-testnet/snapshots.json"
-                .to_string(),
             snapshot_uploader_type: SnapshotUploaderType::Local,
             snapshot_bucket_name: None,
             server_ip: "0.0.0.0".to_string(),
@@ -150,15 +149,14 @@ impl Default for Configuration {
             snapshot_directory: PathBuf::new(),
             data_stores_directory: PathBuf::new(),
             genesis_verification_key: key_encode_hex(genesis_verification_key).unwrap(),
-            reset_digests_cache: Some(false),
+            reset_digests_cache: false,
+            disable_digests_cache: false,
             store_retention_limit: None,
             era_reader_adapter_type: EraReaderAdapterType::Bootstrap,
             era_reader_adapter_params: None,
         }
     }
-}
 
-impl Configuration {
     /// Build the server URL from configuration.
     pub fn get_server_url(&self) -> String {
         format!("http://{}:{}/", self.server_ip, self.server_port)
@@ -204,6 +202,9 @@ impl Configuration {
 /// Default configuration with all the default values for configurations.
 #[derive(Debug, Clone)]
 pub struct DefaultConfiguration {
+    /// Execution environment
+    pub environment: ExecutionEnvironment,
+
     /// Server listening IP
     pub server_ip: String,
 
@@ -227,11 +228,15 @@ pub struct DefaultConfiguration {
 
     /// ImmutableDigesterCacheProvider default setting
     pub reset_digests_cache: String,
+
+    /// ImmutableDigesterCacheProvider default setting
+    pub disable_digests_cache: String,
 }
 
 impl Default for DefaultConfiguration {
     fn default() -> Self {
         Self {
+            environment: ExecutionEnvironment::Production,
             server_ip: "0.0.0.0".to_string(),
             server_port: "8080".to_string(),
             db_directory: "/db".to_string(),
@@ -240,6 +245,16 @@ impl Default for DefaultConfiguration {
             snapshot_uploader_type: "gcp".to_string(),
             era_reader_adapter_type: "bootstrap".to_string(),
             reset_digests_cache: "false".to_string(),
+            disable_digests_cache: "false".to_string(),
+        }
+    }
+}
+
+impl From<ExecutionEnvironment> for ValueKind {
+    fn from(value: ExecutionEnvironment) -> Self {
+        match value {
+            ExecutionEnvironment::Production => ValueKind::String("Production".to_string()),
+            ExecutionEnvironment::Test => ValueKind::String("Test".to_string()),
         }
     }
 }
@@ -253,6 +268,10 @@ impl Source for DefaultConfiguration {
         let mut result = Map::new();
         let namespace = "default configuration".to_string();
         let myself = self.clone();
+        result.insert(
+            "environment".to_string(),
+            Value::new(Some(&namespace), ValueKind::from(myself.environment)),
+        );
         result.insert(
             "server_ip".to_string(),
             Value::new(Some(&namespace), ValueKind::from(myself.server_ip)),
@@ -297,6 +316,13 @@ impl Source for DefaultConfiguration {
                 ValueKind::from(myself.reset_digests_cache),
             ),
         );
+        result.insert(
+            "disable_digests_cache".to_string(),
+            Value::new(
+                Some(&namespace),
+                ValueKind::from(myself.disable_digests_cache),
+            ),
+        );
 
         Ok(result)
     }

mithril-aggregator/src/dependency.rs

@@ -289,7 +289,7 @@ pub mod tests {
     use mithril_common::CardanoNetwork;
 
     pub async fn initialize_dependencies() -> (DependencyManager, AggregatorConfig) {
-        let config = Configuration::default();
+        let config = Configuration::new_sample();
         let mut builder = DependenciesBuilder::new(config);
         let dependency_manager = builder.build_dependency_container().await.unwrap();
 

mithril-aggregator/src/dependency_injection/builder.rs

@@ -621,7 +621,7 @@ impl DependenciesBuilder {
             &self.configuration.data_stores_directory,
             &format!("immutables_digests_{}.json", self.configuration.network),
         )
-        .should_reset_digests_cache(self.configuration.reset_digests_cache.unwrap_or(false))
+        .should_reset_digests_cache(self.configuration.reset_digests_cache)
         .build()
         .await?;
 

mithril-aggregator/src/stake_distribution_service.rs

@@ -232,7 +232,7 @@ mod tests {
     use mithril_common::chain_observer::MockChainObserver;
 
     async fn get_service(chain_observer: MockChainObserver) -> MithrilStakeDistributionService {
-        let mut builder = DependenciesBuilder::new(crate::Configuration::default());
+        let mut builder = DependenciesBuilder::new(crate::Configuration::new_sample());
         let stake_service = MithrilStakeDistributionService::new(
             builder.get_stake_store().await.unwrap(),
             Arc::new(chain_observer),

mithril-aggregator/tests/test_extensions/mod.rs

@@ -4,7 +4,6 @@
 
 #[macro_use]
 pub mod runtime_tester;
-//mod dependency;
 #[macro_use]
 pub mod utilities;
 

mithril-aggregator/tests/test_extensions/runtime_tester.rs

@@ -70,7 +70,7 @@ impl RuntimeTester {
             )]));
         let configuration = Configuration {
             protocol_parameters: default_protocol_parameters,
-            ..Default::default()
+            ..Configuration::new_sample()
         };
         let mut deps_builder = DependenciesBuilder::new(configuration);
         deps_builder.snapshot_uploader = Some(snapshot_uploader.clone());

mithril-client/Cargo.toml

@@ -34,7 +34,7 @@ tokio = { version = "1", features = ["full"] }
 
 [dev-dependencies]
 httpmock = "0.6.6"
-mithril-common = { path = "../mithril-common", features = ["test_only"] }
+mithril-common = { path = "../mithril-common" }
 mockall = "0.11.0"
 
 [features]

mithril-common/Cargo.toml

@@ -75,6 +75,5 @@ serde_yaml = "0.9.10"
 [features]
 default = []
 portable = ["mithril-stm/portable"] # portable feature avoids SIGILL crashes on CPUs not supporting Intel ADX instruction set when built on CPUs that support it
-test_only = []
 allow_skip_signer_certification = []