input-output-hk · jpraynaud · Jun 23, 2022 · Jun 23, 2022 · Jun 23, 2022 · Jun 23, 2022
diff --git a/mithril-aggregator/README.md b/mithril-aggregator/README.md
@@ -59,7 +59,7 @@ make build
 ./mithril-aggregator -r testnet
 
 # Run with custom configuration with env vars
-NETWORK=testnet URL_SNAPSHOT_MANIFEST=https://storage.googleapis.com/cardano-testnet/snapshots.json ./mithril-aggregator
+RUN_INTERVAL=60000 NETWORK=testnet URL_SNAPSHOT_MANIFEST=https://storage.googleapis.com/cardano-testnet/snapshots.json ./mithril-aggregator
 ```
 
 ## Build and run Docker container

diff --git a/mithril-aggregator/config/dev.json b/mithril-aggregator/config/dev.json
@@ -1,5 +1,6 @@
 {
     "network": "testnet",
+    "run_interval": 30000,
     "url_snapshot_manifest": "https://storage.googleapis.com/cardano-testnet/snapshots.json",
     "snapshot_store_type": "local",
     "snapshot_uploader_type": "local",

diff --git a/mithril-aggregator/config/testnet.json b/mithril-aggregator/config/testnet.json
@@ -1,5 +1,6 @@
 {
     "network": "testnet",
+    "run_interval": 60000,
     "url_snapshot_manifest": "https://storage.googleapis.com/cardano-testnet/snapshots.json",
     "snapshot_store_type": "local",
     "snapshot_uploader_type": "gcp",

diff --git a/mithril-aggregator/src/dependency.rs b/mithril-aggregator/src/dependency.rs
@@ -139,6 +139,7 @@ impl DependencyManager {
     pub fn fake() -> DependencyManager {
         let config = Config {
             network: "testnet".to_string(),
+            run_interval: 1000,
             url_snapshot_manifest: "https://storage.googleapis.com/cardano-testnet/snapshots.json"
                 .to_string(),
             snapshot_store_type: SnapshotStoreType::Local,

diff --git a/mithril-aggregator/src/entities.rs b/mithril-aggregator/src/entities.rs
@@ -32,6 +32,9 @@ pub struct Config {
     /// Server listening IP
     pub server_url: String,
 
+    /// Run Interval is the interval between two runtime cycles in ms
+    pub run_interval: u64,
+
     /// Directory to snapshot
     pub db_directory: PathBuf,
 

diff --git a/mithril-aggregator/src/main.rs b/mithril-aggregator/src/main.rs
@@ -40,11 +40,6 @@ pub struct Args {
     #[clap(short, long, default_value = "dev")]
     run_mode: String,
 
-    /// Runtime interval, in seconds
-    /// Defaults to 10 minutes
-    #[clap(long, default_value_t = 600)]
-    runtime_interval: u32,
-
     /// Directory to snapshot
     #[clap(long, default_value = "/db")]
     db_directory: PathBuf,
@@ -172,14 +167,14 @@ async fn main() -> Result<(), Box<dyn Error>> {
     let runtime_dependencies = dependency_manager.clone();
     let handle = tokio::spawn(async move {
         let config = AggregatorConfig::new(
-            args.runtime_interval,
+            config.run_interval,
             &config.network.clone(),
             &config.db_directory.clone(),
             &snapshot_directory,
             runtime_dependencies,
         );
         let mut runtime = AggregatorRuntime::new(
-            Duration::from_secs(config.interval.into()),
+            Duration::from_millis(config.interval),
             None,
             Arc::new(AggregatorRunner::new(config)),
         )

diff --git a/mithril-aggregator/src/runtime/runner.rs b/mithril-aggregator/src/runtime/runner.rs
@@ -19,8 +19,8 @@ use mockall::automock;
 
 use super::RuntimeError;
 pub struct AggregatorConfig {
-    /// Interval between each snapshot, in seconds
-    pub interval: u32,
+    /// Interval between each snapshot, in ms
+    pub interval: u64,
 
     /// Cardano network
     pub network: String,
@@ -37,7 +37,7 @@ pub struct AggregatorConfig {
 
 impl AggregatorConfig {
     pub fn new(
-        interval: u32,
+        interval: u64,
         network: &str,
         db_directory: &Path,
         snapshot_directory: &Path,

diff --git a/mithril-aggregator/src/runtime/state_machine.rs b/mithril-aggregator/src/runtime/state_machine.rs
@@ -85,7 +85,7 @@ impl AggregatorRuntime {
                 error!("{:?}", e)
             }
 
-            info!("Sleeping for {} seconds", self.state_sleep.as_secs());
+            info!("Sleeping for {} ms", self.state_sleep.as_millis());
             sleep(self.state_sleep).await;
         }
     }

diff --git a/mithril-infra/docker-compose.yaml b/mithril-infra/docker-compose.yaml
@@ -30,8 +30,10 @@ services:
     image: ghcr.io/input-output-hk/mithril-aggregator:${IMAGE_ID:-latest}
     restart: always
     environment:
+      - RUST_BACKTRACE=1
       - GOOGLE_APPLICATION_CREDENTIALS_JSON=${GOOGLE_APPLICATION_CREDENTIALS_JSON}
       - NETWORK=${NETWORK:-testnet}
+      - RUN_INTERVAL=60000
       - URL_SNAPSHOT_MANIFEST=https://storage.googleapis.com/cardano-${NETWORK:-testnet}/snapshots.json
       - SNAPSHOT_STORE_TYPE=local
       - SNAPSHOT_UPLOADER_TYPE=gcp
@@ -61,6 +63,7 @@ services:
         max-size: "100m"
         max-file: "5"
     environment:
+      - RUST_BACKTRACE=1
       - AGGREGATOR_ENDPOINT=http://mithril-aggregator:8080/aggregator
       - NETWORK=testnet
       - PARTY_ID=0
@@ -80,6 +83,7 @@ services:
         max-size: "100m"
         max-file: "5"
     environment:
+      - RUST_BACKTRACE=1
       - AGGREGATOR_ENDPOINT=http://mithril-aggregator:8080/aggregator
       - NETWORK=testnet
       - PARTY_ID=1
@@ -99,6 +103,7 @@ services:
         max-size: "100m"
         max-file: "5"
     environment:
+      - RUST_BACKTRACE=1
       - AGGREGATOR_ENDPOINT=http://mithril-aggregator:8080/aggregator
       - NETWORK=testnet
       - PARTY_ID=2
@@ -118,6 +123,7 @@ services:
         max-size: "100m"
         max-file: "5"
     environment:
+      - RUST_BACKTRACE=1
       - AGGREGATOR_ENDPOINT=http://mithril-aggregator:8080/aggregator
       - NETWORK=testnet
       - PARTY_ID=3

diff --git a/mithril-signer/src/entities.rs b/mithril-signer/src/entities.rs
@@ -20,7 +20,7 @@ pub struct Config {
     pub party_id: PartyId,
 
     /// Run Interval
-    #[table(title = "Interval between two signatures attempts")]
+    #[table(title = "Interval between two runtime cycles in ms")]
     pub run_interval: u64,
 
     /// Directory to snapshot

diff --git a/mithril-test-lab/mithril-devnet/devnet-mkfiles.sh b/mithril-test-lab/mithril-devnet/devnet-mkfiles.sh
@@ -767,6 +767,7 @@ cat >> docker-compose.yaml <<EOF
       - RUST_BACKTRACE=1
       - GOOGLE_APPLICATION_CREDENTIALS_JSON=
       - NETWORK=devnet
+      - RUN_INTERVAL=5000
       - URL_SNAPSHOT_MANIFEST=
       - SNAPSHOT_STORE_TYPE=local
       - SNAPSHOT_UPLOADER_TYPE=local
@@ -783,8 +784,6 @@ cat >> docker-compose.yaml <<EOF
         "/data/mithril/aggregator",
         "--server-port",
         "8080", 
-        "--runtime-interval", 
-        "5", 
         "-vvv"
       ]
 

diff --git a/mithril-test-lab/mithril-end-to-end/src/mithril/aggregator.rs b/mithril-test-lab/mithril-end-to-end/src/mithril/aggregator.rs
@@ -20,6 +20,7 @@ impl Aggregator {
         let port = server_port.to_string();
         let env = HashMap::from([
             ("NETWORK", "testnet"),
+            ("RUN_INTERVAL", "5000"),
             ("URL_SNAPSHOT_MANIFEST", ""),
             ("SNAPSHOT_STORE_TYPE", "local"),
             ("SNAPSHOT_UPLOADER_TYPE", "local"),
@@ -40,8 +41,6 @@ impl Aggregator {
             db_directory.to_str().unwrap(),
             "--server-port",
             &port,
-            "--runtime-interval",
-            "5",
             "-vvv",
         ];