fix: move to config

Signed-off-by: Simon Paitrault <[email protected]>
topos-protocol · Nov 27, 2023 · 07bc464 · 07bc464
1 parent 9a57258
commit 07bc464
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 7 deletions.
diff --git a/crates/topos-tce/src/config.rs b/crates/topos-tce/src/config.rs
@@ -31,6 +31,7 @@ pub struct TceConfiguration {
     pub network_bootstrap_timeout: Duration,
     pub minimum_cluster_size: usize,
     pub version: &'static str,
+    pub node_sync_interval: u64,
 }
 
 #[derive(Debug)]

diff --git a/crates/topos-tce/src/lib.rs b/crates/topos-tce/src/lib.rs
@@ -166,12 +166,7 @@ pub async fn run(
             .with_store(validator_store.clone())
             .with_gatekeeper_client(gatekeeper_client.clone())
             .with_network_client(network_client.clone())
-            .with_sync_interval_seconds(
-                std::env::var("TOPOS_SYNC_INTERVAL")
-                    .unwrap_or("1".to_string())
-                    .parse()
-                    .unwrap_or(1),
-            )
+            .with_sync_interval_seconds(config.node_sync_interval)
             .build()?;
 
     spawn(synchronizer_runtime.into_future());

diff --git a/crates/topos/src/components/node/commands/up.rs b/crates/topos/src/components/node/commands/up.rs
@@ -18,10 +18,12 @@ pub struct Up {
     /// Usable for cases where edge endpoint is available as infura (or similar cloud provider) endpoint
     #[arg(long, env = "TOPOS_NO_EDGE_PROCESS", action)]
     pub no_edge_process: bool,
+
     /// Socket of the opentelemetry agent endpoint.
     /// If not provided open telemetry will not be used
     #[arg(long, env = "TOPOS_OTLP_AGENT")]
     pub otlp_agent: Option<String>,
+
     /// Otlp service name.
     /// If not provided open telemetry will not be used
     #[arg(long, env = "TOPOS_OTLP_SERVICE_NAME")]

diff --git a/crates/topos/src/components/node/services/process.rs b/crates/topos/src/components/node/services/process.rs
@@ -104,6 +104,7 @@ pub(crate) fn spawn_tce_process(
             .minimum_tce_cluster_size
             .unwrap_or(NetworkConfig::MINIMUM_CLUSTER_SIZE),
         version: env!("TOPOS_VERSION"),
+        node_sync_interval: config.node_sync_interval,
     };
 
     debug!("TCE args: {tce_config:?}");

diff --git a/crates/topos/src/config/tce.rs b/crates/topos/src/config/tce.rs
@@ -10,6 +10,8 @@ use serde::{Deserialize, Serialize};
 use crate::config::Config;
 use topos_p2p::{Multiaddr, PeerId};
 
+const DEFAULT_NODE_SYNC_INTERVAL: u64 = 1;
+
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(rename_all = "kebab-case")]
 pub struct TceConfig {
@@ -44,6 +46,14 @@ pub struct TceConfig {
     /// Otlp service name
     /// If not provided open telemetry will not be used
     pub otlp_service_name: Option<String>,
+
+    /// Interval in seconds to sync the node with the network
+    #[serde(default = "default_node_sync_interval")]
+    pub node_sync_interval: u64,
+}
+
+fn default_node_sync_interval() -> u64 {
+    DEFAULT_NODE_SYNC_INTERVAL
 }
 
 fn default_db_path() -> PathBuf {

diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml
@@ -125,7 +125,6 @@ services:
       - env/telemetry.env
     environment:
       - RUST_LOG=topos=info
-      - TOPOS_SYNC_INTERVAL=60
 
   spammer:
     container_name: spam

diff --git a/tools/node_config/node/boot/config.toml b/tools/node_config/node/boot/config.toml
@@ -11,3 +11,4 @@ graphql-api-addr = "0.0.0.0:4030"
 grpc-api-addr = "0.0.0.0:1340"
 libp2p-api-addr = "0.0.0.0:9090"
 metrics-api-addr = "0.0.0.0:3000"
+node-sync-interval = 60
diff --git a/tools/node_config/node/test/config.toml b/tools/node_config/node/test/config.toml
@@ -11,3 +11,4 @@ graphql-api-addr = "0.0.0.0:4030"
 grpc-api-addr = "0.0.0.0:1340"
 libp2p-api-addr = "0.0.0.0:9090"
 metrics-api-addr = "0.0.0.0:3000"
+node-sync-interval = 60