Merge #2205: Fixed failing test. Fixed trace message content

Fixed failing test. Fixed trace message content that was copied from elsewhere.
tari-project · Sep 9, 2020 · cccda73 · cccda73
2 parents 6ba5c28 + 7ab2d8b
commit cccda73
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/base_layer/wallet/src/transaction_service/protocols/transaction_chain_monitoring_protocol.rs b/base_layer/wallet/src/transaction_service/protocols/transaction_chain_monitoring_protocol.rs
@@ -250,7 +250,7 @@ where TBackend: TransactionBackend + Clone + 'static
                     () = delay => {
                         trace!(
                             target: LOG_TARGET,
-                            "Transaction monitoring event 'time_out' for Mempool broadcast (Id: {}) ", self.id
+                            "Chain monitoring protocol event 'time_out' triggered (Id: {}) ", self.id
                         );
                         break;
                     },

diff --git a/base_layer/wallet/tests/transaction_service/service.rs b/base_layer/wallet/tests/transaction_service/service.rs
@@ -170,6 +170,7 @@ pub fn setup_transaction_service<T: TransactionBackend + Clone + 'static, P: AsR
         .add_initializer(TransactionServiceInitializer::new(
             TransactionServiceConfig {
                 broadcast_monitoring_timeout: Duration::from_secs(5),
+                chain_monitoring_timeout: Duration::from_secs(5),
                 low_power_polling_timeout: Duration::from_secs(20),
                 ..Default::default()
             },
@@ -245,6 +246,7 @@ pub fn setup_transaction_service_no_comms<T: TransactionBackend + Clone + 'stati
     let ts_service = TransactionService::new(
         TransactionServiceConfig {
             broadcast_monitoring_timeout: mined_request_timeout.unwrap_or(Duration::from_secs(5)),
+            chain_monitoring_timeout: Duration::from_secs(5),
             direct_send_timeout: Duration::from_secs(5),
             broadcast_send_timeout: Duration::from_secs(5),
             low_power_polling_timeout: Duration::from_secs(15),