wip

tari-project · Oct 26, 2021 · 4b2e41f · 4b2e41f
1 parent ac42d5e
commit 4b2e41f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/base_layer/wallet/src/transaction_service/service.rs b/base_layer/wallet/src/transaction_service/service.rs
@@ -1625,12 +1625,14 @@ where
         }
 
         trace!(target: LOG_TARGET, "Restarting transaction broadcast protocols");
-        self.broadcast_selected_completed_transactions(broadcast_join_handles)
+        self.rebroadcast_completed_and_broadcast_transactions(broadcast_join_handles)
             .await
             .map_err(|resp| {
                 error!(
                     target: LOG_TARGET,
-                    "Error broadcasting all completed transactions: {:?}", resp
+                    "Error broadcasting all valid and not cancelled Completed Transactions with status 'Completed' \
+                     and 'Broadcast': {:?}",
+                    resp
                 );
                 resp
             })?;
@@ -1684,7 +1686,7 @@ where
 
     /// Broadcast all valid and not cancelled completed transactions with status 'Completed' and 'Broadcast' to the base
     /// node.
-    async fn broadcast_selected_completed_transactions(
+    async fn rebroadcast_completed_and_broadcast_transactions(
         &mut self,
         join_handles: &mut FuturesUnordered<JoinHandle<Result<u64, TransactionServiceProtocolError>>>,
     ) -> Result<(), TransactionServiceError> {

diff --git a/integration_tests/features/WalletCli.feature b/integration_tests/features/WalletCli.feature
@@ -81,7 +81,7 @@ Feature: Wallet CLI
         # TODO: base node connection.
         And I wait 30 seconds
         And I stop wallet SENDER
-        And I make it rain from wallet SENDER 1 tx / sec 10 sec 8000 uT 100 increment to RECEIVER via command line
+        And I make it rain from wallet SENDER 1 tx per sec 10 sec 8000 uT 100 increment to RECEIVER via command line
         Then wallet SENDER has at least 10 transactions that are all TRANSACTION_STATUS_BROADCAST and valid
         Then wallet RECEIVER has at least 10 transactions that are all TRANSACTION_STATUS_BROADCAST and valid
         And mining node MINE mines 5 blocks

diff --git a/integration_tests/features/support/steps.js b/integration_tests/features/support/steps.js
@@ -3547,7 +3547,7 @@ When(
 );
 
 Then(
-  "I make it rain from wallet {word} {int} tx / sec {int} sec {int} uT {int} increment to {word} via command line",
+  "I make it rain from wallet {word} {int} tx per sec {int} sec {int} uT {int} increment to {word} via command line",
   { timeout: 300 * 1000 },
   async function (sender, freq, duration, amount, amount_inc, receiver) {
     let wallet = this.getWallet(sender);