Exclude txs (#2357)

Signed-off-by: Danil <[email protected]>
oknert3p · Mar 23, 2023 · b31a15c · b31a15c
1 parent 718ff20
commit b31a15c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/core/lib/storage/src/chain/mempool/mod.rs b/core/lib/storage/src/chain/mempool/mod.rs
@@ -44,7 +44,10 @@ impl<'a, 'c> MempoolSchema<'a, 'c> {
     ) -> QueryResult<VecDeque<SignedTxVariant>> {
         let start = Instant::now();
         // Load the transactions from mempool along with corresponding batch IDs.
-        let excluded_txs: Vec<String> = executed_txs.iter().map(|tx| tx.to_string()).collect();
+        let excluded_txs: Vec<String> = executed_txs
+            .iter()
+            .map(|tx| tx.to_string_without_prefix())
+            .collect();
         let txs: Vec<MempoolTx> = sqlx::query_as!(
             MempoolTx,
             "SELECT * FROM mempool_txs WHERE reverted = false AND tx_hash NOT IN (

diff --git a/core/lib/storage/src/tests/chain/mempool.rs b/core/lib/storage/src/tests/chain/mempool.rs
@@ -163,6 +163,18 @@ async fn store_load(mut storage: StorageProcessor<'_>) -> QueryResult<()> {
         );
     }
 
+    let hashes: Vec<_> = txs
+        .iter()
+        .take(txs.len() / 2)
+        .map(|tx| tx.tx.hash())
+        .collect();
+
+    let txs_from_db = MempoolSchema(&mut storage)
+        .load_txs(&hashes)
+        .await
+        .expect("Can't load txs");
+    assert_eq!(txs_from_db.len(), txs.len() / 2);
+
     Ok(())
 }
 

diff --git a/core/lib/types/src/tx/primitives/tx_hash.rs b/core/lib/types/src/tx/primitives/tx_hash.rs
@@ -36,6 +36,10 @@ impl TxHash {
         let bytes: Vec<u8> = tx_hashes.iter().flat_map(AsRef::as_ref).cloned().collect();
         TxHash::from_slice(&sha256(&bytes)).unwrap()
     }
+
+    pub fn to_string_without_prefix(&self) -> String {
+        hex::encode(self.data)
+    }
 }
 
 impl AsRef<[u8]> for TxHash {