fix: no default values when unexpected errors occurred

axonweb3 · Aug 3, 2023 · d4bf768 · d4bf768
1 parent 8f3eded
commit d4bf768
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 23 deletions.
diff --git a/core/consensus/src/engine.rs b/core/consensus/src/engine.rs
@@ -73,7 +73,9 @@ impl<Adapter: ConsensusAdapter + 'static> Engine<Proposal> for ConsensusEngine<A
         let txs_root = if !txs.hashes.is_empty() {
             TrieMerkle::from_iter(txs.hashes.iter().enumerate())
                 .root_hash()
-                .unwrap_or_default()
+                .unwrap_or_else(|err| {
+                    panic!("failed to calculate trie root hash for transactions since {err}")
+                })
         } else {
             RLP_NULL
         };
@@ -540,9 +542,15 @@ impl<Adapter: ConsensusAdapter + 'static> ConsensusEngine<Adapter> {
         proposal: &Proposal,
         signed_txs: &[SignedTransaction],
     ) -> ProtocolResult<()> {
-        let txs_root = TrieMerkle::from_iter(proposal.tx_hashes.iter().enumerate())
-            .root_hash()
-            .unwrap_or(RLP_NULL);
+        let txs_root = if proposal.tx_hashes.is_empty() {
+            RLP_NULL
+        } else {
+            TrieMerkle::from_iter(proposal.tx_hashes.iter().enumerate())
+                .root_hash()
+                .unwrap_or_else(|err| {
+                    panic!("failed to calculate trie root hash for proposals since {err}")
+                })
+        };
 
         let stxs_hash = Hasher::digest(rlp::encode_list(signed_txs));
 

diff --git a/core/executor/src/adapter/mod.rs b/core/executor/src/adapter/mod.rs
@@ -149,7 +149,7 @@ where
     fn exists(&self, address: H160) -> bool {
         self.trie
             .contains(&Bytes::from(address.as_bytes().to_vec()))
-            .unwrap_or_default()
+            .unwrap_or(false)
     }
 
     fn basic(&self, address: H160) -> Basic {

diff --git a/core/executor/src/lib.rs b/core/executor/src/lib.rs
@@ -186,13 +186,18 @@ impl Executor for AxonExecutor {
 
         // self.update_system_contract_roots_for_external_module();
 
+        // TODO When fixes receipt_root, set to RLP_NULL when empty
+        let receipt_root = TrieMerkle::from_iter(hashes.iter().enumerate())
+            .root_hash()
+            .unwrap_or_else(|err| {
+                panic!("failed to calculate trie root hash for receipts since {err}")
+            });
+
         ExecResp {
-            state_root:   new_state_root,
-            receipt_root: TrieMerkle::from_iter(hashes.iter().enumerate())
-                .root_hash()
-                .unwrap_or_default(),
-            gas_used:     gas,
-            tx_resp:      res,
+            state_root: new_state_root,
+            receipt_root,
+            gas_used: gas,
+            tx_resp: res,
         }
     }
 
@@ -372,13 +377,17 @@ impl AxonExecutor {
         // commit changes by all txs included in this block only once
         let new_state_root = adapter.commit();
 
+        let receipt_root = TrieMerkle::from_iter(hashes.iter().enumerate())
+            .root_hash()
+            .unwrap_or_else(|err| {
+                panic!("failed to calculate trie root hash for receipts since {err}")
+            });
+
         ExecResp {
-            state_root:   new_state_root,
-            receipt_root: TrieMerkle::from_iter(hashes.iter().enumerate())
-                .root_hash()
-                .unwrap_or_default(),
-            gas_used:     gas,
-            tx_resp:      res,
+            state_root: new_state_root,
+            receipt_root,
+            gas_used: gas,
+            tx_resp: res,
         }
     }
 }

diff --git a/core/executor/src/precompiles/get_cell.rs b/core/executor/src/precompiles/get_cell.rs
@@ -42,7 +42,7 @@ impl PrecompileContract for GetCell {
                 cell_data:       c.cell_data.into(),
                 is_consumed:     c.consumed_number.is_some(),
                 created_number:  c.created_number,
-                consumed_number: c.consumed_number.unwrap_or_default(),
+                consumed_number: c.consumed_number.unwrap_or(0),
             })
             .unwrap_or_default();
 

diff --git a/protocol/src/types/interoperation.rs b/protocol/src/types/interoperation.rs
@@ -180,11 +180,7 @@ impl From<&CellWithData> for CellMeta {
 
 impl CellWithData {
     pub fn capacity(&self) -> u64 {
-        let capacity = self
-            .type_script
-            .as_ref()
-            .map(|s| s.len())
-            .unwrap_or_default()
+        let capacity = self.type_script.as_ref().map(|s| s.len()).unwrap_or(0)
             + self.lock_script.len()
             + self.data.len()
             + CAPACITY_BYTES_LEN;