Chore: Small refactor.

velas · Jan 12, 2022 · d157e35 · d157e35
1 parent 6f00b30
commit d157e35
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 43 deletions.
diff --git a/core/src/evm_rpc_impl/mod.rs b/core/src/evm_rpc_impl/mod.rs
@@ -36,7 +36,10 @@ impl StateRootWithBank {
         meta: &JsonRpcRequestProcessor,
         address: H160,
     ) -> Result<Option<AccountState>, Error> {
-        assert!(self.state_root.is_some());
+        ensure!(
+            self.state_root.is_some(),
+            BlockNotFound { block: self.block }
+        );
 
         let root = *self.state_root.as_ref().unwrap();
         if let Some(bank) = &self.bank {
@@ -57,7 +60,11 @@ impl StateRootWithBank {
         address: H160,
         idx: H256,
     ) -> Result<Option<H256>, Error> {
-        assert!(self.state_root.is_some());
+        ensure!(
+            self.state_root.is_some(),
+            BlockNotFound { block: self.block }
+        );
+
         let root = *self.state_root.as_ref().unwrap();
         if let Some(bank) = &self.bank {
             let evm = bank.evm_state.read().unwrap();
@@ -283,12 +290,6 @@ impl BasicERPC for BasicErpcImpl {
         block: Option<BlockId>,
     ) -> Result<Hex<U256>, Error> {
         let state = block_to_state_root(block, &meta);
-        ensure!(
-            state.state_root.is_some(),
-            BlockNotFound {
-                block: block.unwrap_or_default()
-            }
-        );
 
         let account = state
             .get_account_state_at(&meta, address.0)?
@@ -304,12 +305,7 @@ impl BasicERPC for BasicErpcImpl {
         block: Option<BlockId>,
     ) -> Result<Hex<H256>, Error> {
         let state = block_to_state_root(block, &meta);
-        ensure!(
-            state.state_root.is_some(),
-            BlockNotFound {
-                block: block.unwrap_or_default()
-            }
-        );
+
         let storage = state
             .get_storage_at(&meta, address.0, data.0)?
             .unwrap_or_default();
@@ -323,12 +319,7 @@ impl BasicERPC for BasicErpcImpl {
         block: Option<BlockId>,
     ) -> Result<Hex<U256>, Error> {
         let state = block_to_state_root(block, &meta);
-        ensure!(
-            state.state_root.is_some(),
-            BlockNotFound {
-                block: block.unwrap_or_default()
-            }
-        );
+
         let account = state
             .get_account_state_at(&meta, address.0)?
             .unwrap_or_default();
@@ -342,12 +333,7 @@ impl BasicERPC for BasicErpcImpl {
         block: Option<BlockId>,
     ) -> Result<Bytes, Error> {
         let state = block_to_state_root(block, &meta);
-        ensure!(
-            state.state_root.is_some(),
-            BlockNotFound {
-                block: block.unwrap_or_default()
-            }
-        );
+
         let account = state
             .get_account_state_at(&meta, address.0)?
             .unwrap_or_default();
@@ -485,12 +471,6 @@ impl BasicERPC for BasicErpcImpl {
             .map_err(|e| into_native_error(e, false))?;
         let saved_state = block_to_state_root(block, &meta);
 
-        if saved_state.state_root.is_none() {
-            return Err(Error::BlockNotFound {
-                block: block.unwrap_or_default(),
-            });
-        }
-
         let result = call(meta, tx, saved_state, meta_keys)?;
         Ok(Bytes(result.exit_data))
     }
@@ -523,11 +503,7 @@ impl BasicERPC for BasicErpcImpl {
         block: Option<BlockId>,
     ) -> Result<Vec<evm_rpc::trace::TraceResultsWithTransactionHash>, Error> {
         let saved_state = block_to_state_root(block, &meta);
-        if saved_state.state_root.is_none() {
-            return Err(Error::BlockNotFound {
-                block: block.unwrap_or_default(),
-            });
-        }
+
         let mut txs = Vec::new();
         let mut txs_meta = Vec::new();
 
@@ -640,11 +616,6 @@ impl BasicERPC for BasicErpcImpl {
             .collect::<Result<Vec<_>, _>>()
             .map_err(|e| into_native_error(e, false))?;
         let saved_state = block_to_state_root(block, &meta);
-        if saved_state.state_root.is_none() {
-            return Err(Error::BlockNotFound {
-                block: block.unwrap_or_default(),
-            });
-        }
         let result = call(meta, tx, saved_state, meta_keys)?;
         Ok(Hex(result.used_gas.into()))
     }

diff --git a/core/src/evm_services/state_recorder.rs b/core/src/evm_services/state_recorder.rs
@@ -45,7 +45,7 @@ impl EvmStateRecorderService {
         storage: &Storage,
         evm_records_receiver: &EvmStateRecorderReceiver,
     ) -> Result<(), RecvTimeoutError> {
-        // TODO2: merge snapshot to archive after load
+        // TODO: use changed nodes as state_updates, instead of changed accounts (to avoid recalculation of hashes)
 
         let (state_root, state_updates) =
             evm_records_receiver.recv_timeout(Duration::from_secs(1))?;