Merge pull request #260 from Rqnsom/update_collector

chore(synth_node_bin): rt_collector improvements
runziggurat · Jul 10, 2023 · 5e8761a · 5e8761a
2 parents 5c6f7d0 + 932d6be
commit 5e8761a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/synth_node_bin/src/action/constantly_ask_for_random_blocks.rs b/synth_node_bin/src/action/constantly_ask_for_random_blocks.rs
@@ -6,7 +6,6 @@ use rand::{
     rngs::StdRng,
     SeedableRng,
 };
-use tokio::time::{sleep, Duration};
 use ziggurat_zcash::{
     protocol::{
         message::Message,
@@ -82,7 +81,7 @@ impl SynthNodeAction for Action {
                             min = elapsed;
                         }
 
-                        avg = avg + elapsed;
+                        avg += elapsed;
 
                         count += 1;
 

diff --git a/synth_node_bin/src/action/rt_s1_collector.rs b/synth_node_bin/src/action/rt_s1_collector.rs
@@ -15,7 +15,7 @@ use ziggurat_zcash::{
 use super::{ActionCfg, SynthNodeAction};
 
 // Configurable status printout interval.
-const BROADCAST_INTERVAL_SEC: Duration = Duration::from_secs(3);
+const BROADCAST_INTERVAL_SEC: Duration = Duration::from_secs(60);
 const DBG_INFO_LOG_INTERVAL_SEC: Duration = Duration::from_secs(10);
 
 const MAX_PEER_LIST_LEN: usize = 1000;
@@ -38,6 +38,7 @@ impl SynthNodeAction for Action {
             network_cfg: NodeConfig {
                 listener_ip: Some(IpAddr::V4(Ipv4Addr::UNSPECIFIED)),
                 desired_listening_port: Some(18233),
+                max_connections: 3000,
                 ..Default::default()
             },
             allow_proper_shutdown: true,
@@ -48,6 +49,7 @@ impl SynthNodeAction for Action {
     async fn run(&self, synth_node: &mut SyntheticNode, addr: Option<SocketAddr>) -> Result<()> {
         let mut broadcast_msgs_interval = interval(BROADCAST_INTERVAL_SEC);
         let mut dbg_info_interval = interval(DBG_INFO_LOG_INTERVAL_SEC);
+        let mut num_connected = synth_node.num_connected();
 
         loop {
             tokio::select! {
@@ -57,6 +59,13 @@ impl SynthNodeAction for Action {
                 },
                 // Broadcast an Addr message to all peers.
                 _ = broadcast_msgs_interval.tick() => {
+                    let num_connected_new = synth_node.num_connected();
+
+                    if num_connected == num_connected_new {
+                        continue;
+                    }
+
+                    num_connected = num_connected_new;
                     let _ = broadcast_addr_msg(synth_node);
                 },
                 // Clear inbound queue.

diff --git a/synth_node_bin/src/action/rt_s1_tainter.rs b/synth_node_bin/src/action/rt_s1_tainter.rs
@@ -38,6 +38,7 @@ impl SynthNodeAction for Action {
             network_cfg: NodeConfig {
                 listener_ip: Some(IpAddr::V4(Ipv4Addr::UNSPECIFIED)),
                 desired_listening_port: Some(8233),
+                max_connections: 1000,
                 ..Default::default()
             },
             allow_proper_shutdown: true,