fix: Expired transaction event appears after commit (#5396)

* fix: remove extra expired reporting

Signed-off-by: Lohachov Mykhailo <lohachov@soramitsu.co.jp>

* test: add test for expired tx

Signed-off-by: Lohachov Mykhailo <lohachov@soramitsu.co.jp>

* chore(deps): bump coverallsapp/github-action from 2.3.4 to 2.3.6 (#5292)

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.3.4 to 2.3.6.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](coverallsapp/github-action@v2.3.4...v2.3.6)

---
updated-dependencies:
- dependency-name: coverallsapp/github-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: remove deleted workflow

Signed-off-by: Lohachov Mykhailo <lohachov@soramitsu.co.jp>

* fix: block interface changes

Signed-off-by: Lohachov Mykhailo <lohachov@soramitsu.co.jp>

---------

Signed-off-by: Lohachov Mykhailo <lohachov@soramitsu.co.jp>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Author: aoyako

crates/iroha_core/src/queue.rs

@@ -79,7 +79,7 @@ pub struct Failure {
 }
 
 /// Will remove transaction from the queue on drop.
-/// See [`Queue::remove_stale_transaction`] for details.
+/// See [`Queue::remove_transaction`] for details.
 pub struct TransactionGuard {
     tx: AcceptedTransaction,
     queue: Arc<Queue>,
@@ -95,7 +95,7 @@ impl Deref for TransactionGuard {
 
 impl Drop for TransactionGuard {
     fn drop(&mut self) {
-        self.queue.remove_stale_transaction(&self.tx);
+        self.queue.remove_transaction(&self.tx);
     }
 }
 
@@ -172,10 +172,10 @@ impl Queue {
     }
 
     fn check_tx(&self, tx: &AcceptedTransaction, state_view: &StateView) -> Result<(), Error> {
-        if self.is_expired(tx) {
-            Err(Error::Expired)
-        } else if tx.is_in_blockchain(state_view) {
+        if tx.is_in_blockchain(state_view) {
             Err(Error::InBlockchain)
+        } else if self.is_expired(tx) {
+            Err(Error::Expired)
         } else {
             Ok(())
         }
@@ -351,19 +351,10 @@ impl Queue {
     /// 3. When transaction is removed from [`Sumeragi::transaction_cache`]
     ///    (either because it was expired, or because transaction is commited to blockchain),
     ///    we should remove transaction from [`Queue::accepted_tx`].
-    fn remove_stale_transaction(&self, tx: &AcceptedTransaction) {
+    fn remove_transaction(&self, tx: &AcceptedTransaction) {
         let removed = self.txs.remove(&tx.as_ref().hash());
         if removed.is_some() {
             self.decrease_per_user_tx_count(tx.as_ref().authority());
-
-            if self.is_expired(tx) {
-                let event = TransactionEvent {
-                    hash: tx.as_ref().hash(),
-                    block_height: None,
-                    status: TransactionStatus::Expired,
-                };
-                let _ = self.events_sender.send(event.into());
-            }
         }
     }
 
@@ -587,6 +578,49 @@ pub mod tests {
         assert_eq!(queue.txs.len(), 0);
     }
 
+    #[test]
+    async fn push_expired_tx_already_in_blockchain() {
+        let chain_id = ChainId::from("00000000-0000-0000-0000-000000000000");
+
+        let (alice_id, alice_keypair) = gen_account_in("wonderland");
+
+        let kura = Kura::blank_kura_for_testing();
+        let query_handle = LiveQueryStore::start_test();
+        let state = State::new(world_with_test_domains(), kura, query_handle);
+        let (max_clock_drift, tx_limits) = {
+            let state_view = state.world.view();
+            let params = state_view.parameters();
+            (params.sumeragi().max_clock_drift(), params.transaction)
+        };
+        let (time_handle, time_source) = TimeSource::new_mock(Duration::default());
+
+        let mut tx =
+            TransactionBuilder::new_with_time_source(chain_id.clone(), alice_id, &time_source);
+        tx.set_ttl(Duration::from_millis(100));
+        let tx = tx.sign(alice_keypair.private_key());
+        let tx = AcceptedTransaction::accept(tx, &chain_id, max_clock_drift, tx_limits)
+            .expect("Failed to accept Transaction.");
+
+        let block_header = ValidBlock::new_dummy(&KeyPair::random().into_parts().1)
+            .as_ref()
+            .header();
+        let mut state_block = state.block(block_header);
+        state_block
+            .transactions
+            .insert_block_with_single_tx(tx.as_ref().hash(), nonzero!(1_usize));
+        state_block.commit();
+        let queue = Queue::test(config_factory(), &time_source);
+        time_handle.advance(Duration::from_secs(100));
+        assert!(matches!(
+            queue.push(tx, state.view()),
+            Err(Failure {
+                err: Error::InBlockchain,
+                ..
+            })
+        ));
+        assert_eq!(queue.txs.len(), 0);
+    }
+
     #[test]
     async fn get_tx_drop_if_in_blockchain() {
         let max_txs_in_block = nonzero!(2_usize);