Destruct TransactionView to get witness_hash

nervosnetwork · Oct 15, 2024 · 0d38341 · 0d38341
1 parent c6f3bf6
commit 0d38341
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/tx-pool/src/process.rs b/tx-pool/src/process.rs
@@ -696,7 +696,6 @@ impl TxPoolService {
         declared_cycles: Option<Cycle>,
         command_rx: Option<&mut watch::Receiver<ChunkCommand>>,
     ) -> Option<(Result<Completed, Reject>, Arc<Snapshot>)> {
-        let wtx_hash = tx.witness_hash();
         let instant = Instant::now();
         let is_sync_process = command_rx.is_none();
 
@@ -752,6 +751,7 @@ impl TxPoolService {
         if verify_cache.is_none() {
             // update cache
             let txs_verify_cache = Arc::clone(&self.txs_verify_cache);
+            let wtx_hash = tx.destruct_wtx_hash();
             tokio::spawn(async move {
                 let mut guard = txs_verify_cache.write().await;
                 guard.put(wtx_hash, verified);

diff --git a/util/types/src/core/views.rs b/util/types/src/core/views.rs
@@ -298,6 +298,15 @@ macro_rules! define_inner_getter {
 }
 
 impl TransactionView {
+    /// Destruct TransactionView to get wtx_hash
+    pub fn destruct_wtx_hash(self) -> packed::Byte32 {
+        let TransactionView {
+            witness_hash: wtx_hash,
+            ..
+        } = self;
+        wtx_hash
+    }
+
     define_data_getter!(Transaction);
     define_cache_getter!(hash, Byte32);
     define_cache_getter!(witness_hash, Byte32);