[refactor]: Custom genesis wait time for tps benchmark

Signed-off-by: Shanin Roman <shanin1000@yandex.ru>
hyperledger · Nov 20, 2023 · af85650 · af85650
1 parent 73712f3
commit af85650
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/client/benches/tps/config.json b/client/benches/tps/config.json
@@ -3,5 +3,6 @@
     "interval_us_per_tx": 0,
     "max_txs_per_block": 1024,
     "blocks": 15,
-    "sample_size": 10
+    "sample_size": 10,
+    "genesis_max_retries": 30
 }
diff --git a/client/benches/tps/utils.rs b/client/benches/tps/utils.rs
@@ -30,6 +30,7 @@ pub struct Config {
     pub max_txs_per_block: u32,
     pub blocks: u32,
     pub sample_size: u32,
+    pub genesis_max_retries: u32,
 }
 
 impl fmt::Display for Config {
@@ -57,7 +58,7 @@ impl Config {
         // READY
         let (_rt, network, client) = <Network>::start_test_with_runtime(self.peers, None);
         let clients = network.clients();
-        wait_for_genesis_committed(&clients, 0);
+        wait_for_genesis_committed_with_max_retries(&clients, 0, self.genesis_max_retries);
 
         client.submit_blocking(
             ParametersBuilder::new()

diff --git a/core/test_network/src/lib.rs b/core/test_network/src/lib.rs
@@ -322,10 +322,23 @@ impl Network {
 /// # Panics
 /// When unsuccessful after `MAX_RETRIES`.
 pub fn wait_for_genesis_committed(clients: &[Client], offline_peers: u32) {
-    const POLL_PERIOD: Duration = Duration::from_millis(1000);
     const MAX_RETRIES: u32 = 30;
+    wait_for_genesis_committed_with_max_retries(clients, offline_peers, MAX_RETRIES)
+}
+
+/// Wait for peers to have committed genesis block for specified amount of retries.
+/// Each retry once per second.
+///
+/// # Panics
+/// When unsuccessful after `MAX_RETRIES`.
+pub fn wait_for_genesis_committed_with_max_retries(
+    clients: &[Client],
+    offline_peers: u32,
+    max_retries: u32,
+) {
+    const POLL_PERIOD: Duration = Duration::from_millis(1000);
 
-    for _ in 0..MAX_RETRIES {
+    for _ in 0..max_retries {
         let without_genesis_peers = clients.iter().fold(0_u32, |acc, client| {
             client.get_status().map_or(
                 acc + 1,
@@ -339,7 +352,7 @@ pub fn wait_for_genesis_committed(clients: &[Client], offline_peers: u32) {
     }
     panic!(
         "Failed to wait for online peers to commit genesis block. Total wait time: {:?}",
-        POLL_PERIOD * MAX_RETRIES
+        POLL_PERIOD * max_retries
     );
 }