fix(sumeragi): remove expired transaction from cache (#4922)

Signed-off-by: Shanin Roman <[email protected]>
hyperledger-iroha · Jul 31, 2024 · a62640d · a62640d
1 parent 26c8323
commit a62640d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/core/src/gossiper.rs b/core/src/gossiper.rs
@@ -119,16 +119,16 @@ impl TransactionGossiper {
                         tx,
                         err: crate::queue::Error::InBlockchain,
                     }) => {
-                        iroha_logger::debug!(tx_payload_hash = %tx.as_ref().hash(), "Transaction already in blockchain, ignoring...")
+                        iroha_logger::debug!(tx = %tx.as_ref().hash(), "Transaction already in blockchain, ignoring...")
                     }
                     Err(crate::queue::Failure {
                         tx,
                         err: crate::queue::Error::IsInQueue,
                     }) => {
-                        iroha_logger::trace!(tx_payload_hash = %tx.as_ref().hash(), "Transaction already in the queue, ignoring...")
+                        iroha_logger::trace!(tx = %tx.as_ref().hash(), "Transaction already in the queue, ignoring...")
                     }
                     Err(crate::queue::Failure { tx, err }) => {
-                        iroha_logger::error!(?err, tx_payload_hash = %tx.as_ref().hash(), "Failed to enqueue transaction.")
+                        iroha_logger::error!(?err, tx = %tx.as_ref().hash(), "Failed to enqueue transaction.")
                     }
                 },
                 Err(err) => iroha_logger::error!(%err, "Transaction rejected"),

diff --git a/core/src/queue.rs b/core/src/queue.rs
@@ -177,7 +177,7 @@ impl Queue {
     /// # Errors
     /// See [`enum@Error`]
     pub fn push(&self, tx: AcceptedTransaction, state_view: &StateView) -> Result<(), Failure> {
-        trace!(?tx, "Pushing to the queue");
+        trace!(tx=%tx.as_ref().hash(), "Pushing to the queue");
         if let Err(err) = self.check_tx(&tx, state_view) {
             return Err(Failure { tx, err });
         }

diff --git a/core/src/sumeragi/main_loop.rs b/core/src/sumeragi/main_loop.rs
@@ -1024,9 +1024,9 @@ pub(crate) fn run(
             .retain(|tx| {
                 let expired = sumeragi.queue.is_expired(tx);
                 if expired {
-                    debug!(?tx, "Transaction expired")
+                    debug!(tx=%tx.as_ref().hash(), "Transaction expired")
                 }
-                expired
+                !expired
             });
 
         sumeragi.queue.get_transactions_for_block(

diff --git a/core/src/tx.rs b/core/src/tx.rs
@@ -229,7 +229,7 @@ impl TransactionExecutor {
             ));
         }
 
-        debug!("Validating transaction: {:?}", tx);
+        debug!(tx=%tx.as_ref().hash(), "Validating transaction");
         Self::validate_with_runtime_executor(tx.clone(), state_transaction)?;
 
         if let (authority, Executable::Wasm(bytes)) = tx.into() {