Updated spammer

utils/src/lib.rs

@@ -130,6 +130,9 @@ pub struct SpamCmd {
     /// Rate of transactions per second
     #[clap(short, long, default_value = "1000")]
     rate: u64,
+    /// Interval in ms for sending batches of transactions
+    #[clap(short, long, default_value = "200")]
+    interval: u64,
     /// Time to run the spammer for in seconds
     #[clap(short, long, default_value = "0")]
     time: u64,
@@ -150,24 +153,23 @@ impl SpamCmd {
             rpc_url,
             num_txs,
             rate,
+            interval,
             time,
             blobs,
             signer_index,
             chain_id,
         } = self;
 
         let url: Url = rpc_url.parse()?;
-        Spammer::new(
-            url,
-            *signer_index,
-            *num_txs,
-            *time,
-            *rate,
-            *blobs,
-            *chain_id,
-        )?
-        .run()
-        .await
+        let config = spammer::SpammerConfig {
+            max_num_txs: *num_txs,
+            max_time: *time,
+            max_rate: *rate,
+            batch_interval: *interval,
+            blobs: *blobs,
+            chain_id: *chain_id,
+        };
+        Spammer::new(url, *signer_index, config)?.run().await
     }
 }
 
@@ -296,6 +298,9 @@ pub struct SpamContractCmd {
     /// Rate of transactions per second
     #[clap(short, long, default_value_t = 1000)]
     rate: u64,
+    /// Interval in ms for sending batches of transactions
+    #[clap(short, long, default_value = "200")]
+    interval: u64,
     /// Time to run the spammer for in seconds
     #[clap(short, long, default_value_t = 0)]
     time: u64,
@@ -315,23 +320,22 @@ impl SpamContractCmd {
             rpc_url,
             num_txs,
             rate,
+            interval,
             time,
             signer_index,
             chain_id,
         } = self;
         let url = format!("http://{rpc_url}").parse()?;
-        Spammer::new_contract(
-            url,
-            *signer_index,
-            *num_txs,
-            *time,
-            *rate,
-            contract,
-            function,
-            args,
-            *chain_id,
-        )?
-        .run()
-        .await
+        let config = spammer::SpammerConfig {
+            max_num_txs: *num_txs,
+            max_time: *time,
+            max_rate: *rate,
+            batch_interval: *interval,
+            blobs: false,
+            chain_id: *chain_id,
+        };
+        Spammer::new_contract(url, *signer_index, config, contract, function, args)?
+            .run()
+            .await
     }
 }