diff --git a/mithril-aggregator/src/main.rs b/mithril-aggregator/src/main.rs index 62861453d50..13985a1c8ea 100644 --- a/mithril-aggregator/src/main.rs +++ b/mithril-aggregator/src/main.rs @@ -36,10 +36,10 @@ pub struct Args { #[clap(short, long, default_value = "dev")] run_mode: String, - /// Snapshot interval, in seconds - /// Defaults to 4 hours - #[clap(long, default_value_t = 14400)] - snapshot_interval: u32, + /// 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")] @@ -150,7 +150,7 @@ async fn main() -> Result<(), Box> { let snapshot_directory = config.snapshot_directory.clone(); let handle = tokio::spawn(async move { let runtime = AggregatorRuntime::new( - args.snapshot_interval * 1000, + args.runtime_interval * 1000, config.network.clone(), config.db_directory.clone(), snapshot_directory, diff --git a/mithril-infra/docker-compose.yaml b/mithril-infra/docker-compose.yaml index 5e4c4eff583..56d3e1b6f49 100644 --- a/mithril-infra/docker-compose.yaml +++ b/mithril-infra/docker-compose.yaml @@ -60,7 +60,7 @@ services: - AGGREGATOR_ENDPOINT=http://mithril-aggregator:8080/aggregator - NETWORK=testnet - PARTY_ID=0 - - RUN_INTERVAL=2 + - RUN_INTERVAL=60000 - DB_DIRECTORY=/db volumes: - ./testnet/node.db:/db @@ -77,7 +77,7 @@ services: - AGGREGATOR_ENDPOINT=http://mithril-aggregator:8080/aggregator - NETWORK=testnet - PARTY_ID=1 - - RUN_INTERVAL=2 + - RUN_INTERVAL=60000 - DB_DIRECTORY=/db volumes: - ./testnet/node.db:/db @@ -94,7 +94,7 @@ services: - AGGREGATOR_ENDPOINT=http://mithril-aggregator:8080/aggregator - NETWORK=testnet - PARTY_ID=2 - - RUN_INTERVAL=2 + - RUN_INTERVAL=60000 - DB_DIRECTORY=/db volumes: - ./testnet/node.db:/db @@ -111,7 +111,7 @@ services: - AGGREGATOR_ENDPOINT=http://mithril-aggregator:8080/aggregator - NETWORK=testnet - PARTY_ID=3 - - RUN_INTERVAL=2 + - RUN_INTERVAL=60000 - DB_DIRECTORY=/db volumes: - ./testnet/node.db:/db diff --git a/mithril-signer/Dockerfile.ci b/mithril-signer/Dockerfile.ci index e67b65367a0..82b63c09d25 100644 --- a/mithril-signer/Dockerfile.ci +++ b/mithril-signer/Dockerfile.ci @@ -21,4 +21,4 @@ RUN chown -R appuser /app/ && chmod a+x /app/bin/mithril-signer USER appuser # Run the executable -ENTRYPOINT ["/app/bin/mithril-signer"] +ENTRYPOINT ["/app/bin/mithril-signer","-vv"] diff --git a/mithril-test-lab/mithril-end-to-end/src/Mithril/Aggregator.hs b/mithril-test-lab/mithril-end-to-end/src/Mithril/Aggregator.hs index 2c649739203..8251590dc4d 100644 --- a/mithril-test-lab/mithril-end-to-end/src/Mithril/Aggregator.hs +++ b/mithril-test-lab/mithril-end-to-end/src/Mithril/Aggregator.hs @@ -114,4 +114,4 @@ aggregatorProcess cwd port = do ] <> baseEnv unlessM (doesFileExist aggregator) $ failure $ "cannot find mithril-aggregator executable in expected location (" <> binDir <> ")" - pure $ (proc aggregator ["--db-directory", "db", "--server-port", show port, "--snapshot-interval", "5", "-vvv"]) {cwd, env} + pure $ (proc aggregator ["--db-directory", "db", "--server-port", show port, "--runtime-interval", "5", "-vvv"]) {cwd, env} diff --git a/mithril-test-lab/mithril-end-to-end/src/Mithril/Signer.hs b/mithril-test-lab/mithril-end-to-end/src/Mithril/Signer.hs index 608d2b253e9..daf93ee644f 100644 --- a/mithril-test-lab/mithril-end-to-end/src/Mithril/Signer.hs +++ b/mithril-test-lab/mithril-end-to-end/src/Mithril/Signer.hs @@ -56,7 +56,7 @@ signerProcess cwd aggregatorEndpoint = do [ ("AGGREGATOR_ENDPOINT", toString aggregatorEndpoint), ("NETWORK", "testnet"), ("PARTY_ID", "0"), - ("RUN_INTERVAL", "2"), + ("RUN_INTERVAL", "2000"), ("DB_DIRECTORY", "db") ] <> baseEnv