From a84713543dad8d34239406cd0e44b55649ac9f3a Mon Sep 17 00:00:00 2001
From: jjy <jjyruby@gmail.com>
Date: Tue, 1 Nov 2022 22:11:06 +0800
Subject: [PATCH] chore: fix cargo clippy warning

---
 .../benches/benches/benchmarks/dummy_state.rs | 56 -------------------
 crates/benches/benches/benchmarks/mod.rs      |  1 -
 crates/benches/benches/benchmarks/smt.rs      | 13 ++---
 crates/benches/benches/benchmarks/sudt.rs     | 30 +++++++---
 crates/store/src/tests/state_db.rs            |  2 +-
 crates/tests/src/testing_tool/chain.rs        |  2 +-
 crates/tests/src/tests/meta_contract_args.rs  |  2 +-
 .../src/tests/polyjuice_sender_recover.rs     |  2 +-
 .../tests/rpc_server/execute_l2transaction.rs | 12 ++--
 .../block_max_cycles_limit.rs                 |  2 +-
 .../rpc_server/execute_raw_l2transaction.rs   |  8 +--
 .../block_max_cycles_limit.rs                 |  4 +-
 .../tests/rpc_server/submit_l2transaction.rs  | 16 +++---
 13 files changed, 54 insertions(+), 96 deletions(-)
 delete mode 100644 crates/benches/benches/benchmarks/dummy_state.rs

diff --git a/crates/benches/benches/benchmarks/dummy_state.rs b/crates/benches/benches/benchmarks/dummy_state.rs
deleted file mode 100644
index 902bb9ee2..000000000
--- a/crates/benches/benches/benchmarks/dummy_state.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-use gw_common::{
-    error::Error,
-    smt::{default_store::DefaultStore, H256, SMT},
-    state::State,
-};
-use gw_traits::CodeStore;
-use gw_types::{bytes::Bytes, packed::Script};
-use std::collections::HashMap;
-
-#[derive(Default)]
-pub struct DummyState {
-    tree: SMT<DefaultStore<H256>>,
-    account_count: u32,
-    scripts: HashMap<H256, Script>,
-    codes: HashMap<H256, Bytes>,
-}
-
-impl State for DummyState {
-    fn get_raw(&self, key: &H256) -> Result<H256, Error> {
-        let v = self.tree.get(key)?;
-        Ok(v)
-    }
-    fn update_raw(&mut self, key: H256, value: H256) -> Result<(), Error> {
-        self.tree.update(key, value)?;
-        Ok(())
-    }
-    fn finalise(&mut self) -> Result<(), Error> {
-        Err(Error::Store)
-    }
-    fn calculate_root(&self) -> Result<H256, Error> {
-        let root = *self.tree.root();
-        Ok(root)
-    }
-    fn get_account_count(&self) -> Result<u32, Error> {
-        Ok(self.account_count)
-    }
-    fn set_account_count(&mut self, count: u32) -> Result<(), Error> {
-        self.account_count = count;
-        Ok(())
-    }
-}
-
-impl CodeStore for DummyState {
-    fn insert_script(&mut self, script_hash: H256, script: Script) {
-        self.scripts.insert(script_hash, script);
-    }
-    fn get_script(&self, script_hash: &H256) -> Option<Script> {
-        self.scripts.get(script_hash).cloned()
-    }
-    fn insert_data(&mut self, data_hash: H256, code: Bytes) {
-        self.codes.insert(data_hash, code);
-    }
-    fn get_data(&self, script_hash: &H256) -> Option<Bytes> {
-        self.codes.get(script_hash).cloned()
-    }
-}
diff --git a/crates/benches/benches/benchmarks/mod.rs b/crates/benches/benches/benchmarks/mod.rs
index 8b1adca01..4d0e03bcc 100644
--- a/crates/benches/benches/benchmarks/mod.rs
+++ b/crates/benches/benches/benchmarks/mod.rs
@@ -1,4 +1,3 @@
-mod dummy_state;
 pub mod fee_queue;
 pub mod init_db;
 pub mod smt;
diff --git a/crates/benches/benches/benchmarks/smt.rs b/crates/benches/benches/benchmarks/smt.rs
index 32059c697..d55e54c48 100644
--- a/crates/benches/benches/benchmarks/smt.rs
+++ b/crates/benches/benches/benchmarks/smt.rs
@@ -1,5 +1,3 @@
-use std::sync::Arc;
-
 use criterion::{criterion_group, BenchmarkId, Criterion, Throughput};
 use gw_common::{
     blake2b::new_blake2b,
@@ -23,6 +21,7 @@ use gw_store::{
     state::{
         history::history_state::{HistoryState, RWConfig},
         state_db::StateDB,
+        traits::JournalDB,
         MemStateDB,
     },
     traits::chain_store::ChainStore,
@@ -257,11 +256,10 @@ impl BenchExecutionEnvironment {
                 .args(args.as_bytes().pack())
                 .build();
 
-            let run_result = self
-                .generator
+            self.generator
                 .execute_transaction(
                     &self.chain,
-                    &state,
+                    &mut state,
                     &block_info,
                     &raw_tx,
                     L2TX_MAX_CYCLES,
@@ -269,7 +267,7 @@ impl BenchExecutionEnvironment {
                 )
                 .unwrap();
 
-            state.apply_run_result(&run_result.write).unwrap();
+            state.finalise().unwrap();
 
             from_id += 1;
             if from_id > end_account_id {
@@ -336,6 +334,7 @@ impl BenchExecutionEnvironment {
         };
 
         Self::generate_accounts(&mut state, accounts + 1); // Plus block producer
+        state.finalise().unwrap();
 
         let (genesis, global_state) = {
             let prev_state_checkpoint: [u8; 32] =
@@ -346,7 +345,7 @@ impl BenchExecutionEnvironment {
 
             // calculate post state
             let post_account = {
-                let root = state.finalise_root().unwrap();
+                let root = state.calculate_root().unwrap();
                 let count = state.get_account_count().unwrap();
                 AccountMerkleState::new_builder()
                     .merkle_root(root.pack())
diff --git a/crates/benches/benches/benchmarks/sudt.rs b/crates/benches/benches/benchmarks/sudt.rs
index a8f3b3877..2ca6a0a66 100644
--- a/crates/benches/benches/benchmarks/sudt.rs
+++ b/crates/benches/benches/benchmarks/sudt.rs
@@ -1,13 +1,23 @@
-use super::dummy_state::DummyState;
 use criterion::*;
 use gw_common::{
-    builtins::ETH_REGISTRY_ACCOUNT_ID, registry_address::RegistryAddress, state::State, H256,
+    builtins::ETH_REGISTRY_ACCOUNT_ID, registry_address::RegistryAddress, smt::SMT, state::State,
+    H256,
 };
 use gw_config::{BackendConfig, BackendSwitchConfig};
 use gw_generator::{
     account_lock_manage::AccountLockManage, backend_manage::BackendManage,
     constants::L2TX_MAX_CYCLES, error::TransactionError, traits::StateExt, Generator,
 };
+use gw_store::{
+    smt::smt_store::SMTStateStore,
+    snapshot::StoreSnapshot,
+    state::{
+        overlay::{mem_state::MemStateTree, mem_store::MemStore},
+        traits::JournalDB,
+        MemStateDB,
+    },
+    Store,
+};
 use gw_traits::{ChainView, CodeStore};
 use gw_types::{
     bytes::Bytes,
@@ -62,6 +72,12 @@ impl ChainView for DummyChainStore {
     }
 }
 
+fn new_state(store: StoreSnapshot) -> MemStateDB {
+    let smt = SMT::new(H256::zero(), SMTStateStore::new(MemStore::new(store)));
+    let inner = MemStateTree::new(smt, 0);
+    MemStateDB::new(inner)
+}
+
 fn new_block_info(block_producer: &RegistryAddress, number: u64, timestamp: u64) -> BlockInfo {
     BlockInfo::new_builder()
         .block_producer(Bytes::from(block_producer.to_bytes()).pack())
@@ -70,7 +86,7 @@ fn new_block_info(block_producer: &RegistryAddress, number: u64, timestamp: u64)
         .build()
 }
 
-fn run_contract_get_result<S: State + CodeStore>(
+fn run_contract_get_result<S: State + CodeStore + JournalDB>(
     rollup_config: &RollupConfig,
     tree: &mut S,
     from_id: u32,
@@ -104,12 +120,11 @@ fn run_contract_get_result<S: State + CodeStore>(
         L2TX_MAX_CYCLES,
         None,
     )?;
-    tree.apply_run_result(&run_result.write)
-        .expect("update state");
+    tree.finalise()?;
     Ok(run_result)
 }
 
-fn run_contract<S: State + CodeStore>(
+fn run_contract<S: State + CodeStore + JournalDB>(
     rollup_config: &RollupConfig,
     tree: &mut S,
     from_id: u32,
@@ -128,7 +143,8 @@ pub fn bench(c: &mut Criterion) {
     group.bench_function("sudt", move |b| {
         b.iter_batched(
             || {
-                let mut tree = DummyState::default();
+                let db = Store::open_tmp().unwrap();
+                let mut tree = new_state(db.get_snapshot());
 
                 let always_success_lock_hash = [255u8; 32];
                 let rollup_config = RollupConfig::new_builder()
diff --git a/crates/store/src/tests/state_db.rs b/crates/store/src/tests/state_db.rs
index f1680d560..35c71f8d4 100644
--- a/crates/store/src/tests/state_db.rs
+++ b/crates/store/src/tests/state_db.rs
@@ -132,7 +132,7 @@ fn test_state_with_version() {
         state
             .update_raw(H256::from_u32(5), H256::from_u32(25))
             .unwrap();
-        commit_block(&db, build_block(&mut state, 2, prev_txs_state_checkpoint));
+        commit_block(db, build_block(&mut state, 2, prev_txs_state_checkpoint));
         db.set_last_confirmed_block_number_hash(
             &NumberHash::new_builder()
                 .number(2.pack())
diff --git a/crates/tests/src/testing_tool/chain.rs b/crates/tests/src/testing_tool/chain.rs
index 0dc09c2d5..1a50278cd 100644
--- a/crates/tests/src/testing_tool/chain.rs
+++ b/crates/tests/src/testing_tool/chain.rs
@@ -642,7 +642,7 @@ pub async fn construct_block_with_timestamp(
         reverted_block_root,
         block_param,
     };
-    produce_block(&db, generator, param).map(|mut r| {
+    produce_block(db, generator, param).map(|mut r| {
         r.remaining_capacity = remaining_capacity;
         r
     })
diff --git a/crates/tests/src/tests/meta_contract_args.rs b/crates/tests/src/tests/meta_contract_args.rs
index 2902a60db..8a7722b7e 100644
--- a/crates/tests/src/tests/meta_contract_args.rs
+++ b/crates/tests/src/tests/meta_contract_args.rs
@@ -73,7 +73,7 @@ async fn test_backward_compatibility() {
         .signature(sign.pack())
         .build();
 
-    mem_pool_state.store_state_db(state.into());
+    mem_pool_state.store_state_db(state);
     {
         let mut mem_pool = chain.mem_pool().await;
         mem_pool.push_transaction(create_user_tx).unwrap();
diff --git a/crates/tests/src/tests/polyjuice_sender_recover.rs b/crates/tests/src/tests/polyjuice_sender_recover.rs
index 5456cc9e8..44b71c48b 100644
--- a/crates/tests/src/tests/polyjuice_sender_recover.rs
+++ b/crates/tests/src/tests/polyjuice_sender_recover.rs
@@ -87,7 +87,7 @@ async fn test_eth_account_creator() {
         .build_batch_create_tx(&state, recovered_account_scripts)
         .unwrap();
 
-    mem_pool_state.store_state_db(state.into());
+    mem_pool_state.store_state_db(state);
     {
         let mut mem_pool = chain.mem_pool().await;
         mem_pool.push_transaction(batch_create_tx).unwrap();
diff --git a/crates/tests/src/tests/rpc_server/execute_l2transaction.rs b/crates/tests/src/tests/rpc_server/execute_l2transaction.rs
index 4d51cb668..799219884 100644
--- a/crates/tests/src/tests/rpc_server/execute_l2transaction.rs
+++ b/crates/tests/src/tests/rpc_server/execute_l2transaction.rs
@@ -58,7 +58,7 @@ async fn test_polyjuice_erc20_tx() {
         .build();
     let deploy_tx = test_wallet.sign_polyjuice_tx(&state, raw_tx).unwrap();
 
-    mem_pool_state.store_state_db(state.into());
+    mem_pool_state.store_state_db(state);
     let run_result = rpc_server.execute_l2transaction(&deploy_tx).await.unwrap();
 
     let logs = run_result.logs.into_iter().map(Into::into);
@@ -111,7 +111,7 @@ async fn test_polyjuice_tx_from_id_zero() {
     let deploy_tx = deployer_wallet.sign_polyjuice_tx(&state, raw_tx).unwrap();
     let deploy_tx_hash: H256 = deploy_tx.hash().into();
 
-    mem_pool_state.store_state_db(state.into());
+    mem_pool_state.store_state_db(state);
     {
         let mut mem_pool = chain.mem_pool().await;
         mem_pool.push_transaction(deploy_tx).unwrap();
@@ -159,7 +159,7 @@ async fn test_polyjuice_tx_from_id_zero() {
         .build();
     let balance_tx = test_wallet.sign_polyjuice_tx(&state, raw_tx).unwrap();
 
-    mem_pool_state.store_state_db(state.into());
+    mem_pool_state.store_state_db(state);
     let run_result = rpc_server.execute_l2transaction(&balance_tx).await.unwrap();
 
     assert_eq!(
@@ -209,7 +209,7 @@ async fn test_invalid_polyjuice_tx_from_id_zero() {
         .unwrap();
     let deploy_tx_hash: H256 = deploy_tx.hash().into();
 
-    mem_pool_state.store_state_db(state.into());
+    mem_pool_state.store_state_db(state);
     {
         let mut mem_pool = chain.mem_pool().await;
         mem_pool.push_transaction(deploy_tx).unwrap();
@@ -300,7 +300,7 @@ async fn test_invalid_polyjuice_tx_from_id_zero() {
 
     let balance = 100u32.into();
     test_wallet.mint_ckb_sudt(&mut state, balance).unwrap();
-    mem_pool_state.store_state_db(state.into());
+    mem_pool_state.store_state_db(state);
 
     let err = rpc_server
         .execute_l2transaction(&balance_tx)
@@ -316,7 +316,7 @@ async fn test_invalid_polyjuice_tx_from_id_zero() {
     state
         .mapping_registry_address_to_script_hash(test_wallet.reg_address().to_owned(), H256::one())
         .unwrap();
-    mem_pool_state.store_state_db(state.into());
+    mem_pool_state.store_state_db(state);
 
     let err = rpc_server
         .execute_l2transaction(&balance_tx)
diff --git a/crates/tests/src/tests/rpc_server/execute_l2transaction/block_max_cycles_limit.rs b/crates/tests/src/tests/rpc_server/execute_l2transaction/block_max_cycles_limit.rs
index 6a11b70c7..2f4624947 100644
--- a/crates/tests/src/tests/rpc_server/execute_l2transaction/block_max_cycles_limit.rs
+++ b/crates/tests/src/tests/rpc_server/execute_l2transaction/block_max_cycles_limit.rs
@@ -120,7 +120,7 @@ async fn test_block_max_cycles_limit() {
         .build();
     let deploy_tx = test_wallet.sign_polyjuice_tx(&state, raw_tx).unwrap();
 
-    mem_pool_state.store_state_db(state.into());
+    mem_pool_state.store_state_db(state);
     let err = rpc_server
         .execute_l2transaction(&deploy_tx)
         .await
diff --git a/crates/tests/src/tests/rpc_server/execute_raw_l2transaction.rs b/crates/tests/src/tests/rpc_server/execute_raw_l2transaction.rs
index 5dbaf6a8f..a399e24dd 100644
--- a/crates/tests/src/tests/rpc_server/execute_raw_l2transaction.rs
+++ b/crates/tests/src/tests/rpc_server/execute_raw_l2transaction.rs
@@ -65,7 +65,7 @@ async fn test_polyjuice_erc20_tx() {
         .build();
 
     let reg_addr_bytes = test_wallet.reg_address().to_bytes().into();
-    mem_pool_state.store_state_db(state.into());
+    mem_pool_state.store_state_db(state);
 
     let run_result = rpc_server
         .execute_raw_l2transaction(&raw_tx, None, Some(reg_addr_bytes))
@@ -122,7 +122,7 @@ async fn test_polyjuice_tx_from_id_zero() {
     let deploy_tx = deployer_wallet.sign_polyjuice_tx(&state, raw_tx).unwrap();
     let deploy_tx_hash: H256 = deploy_tx.hash().into();
 
-    mem_pool_state.store_state_db(state.into());
+    mem_pool_state.store_state_db(state);
     {
         let mut mem_pool = chain.mem_pool().await;
         mem_pool.push_transaction(deploy_tx).unwrap();
@@ -162,7 +162,7 @@ async fn test_polyjuice_tx_from_id_zero() {
         .mint_sudt(&mut state, CKB_SUDT_ACCOUNT_ID, test_balance)
         .unwrap();
 
-    mem_pool_state.store_state_db(state.into());
+    mem_pool_state.store_state_db(state);
     let state = mem_pool_state.load_state_db();
 
     let erc20_contract_account_id = system_log.contract_account_id(&state).unwrap();
@@ -486,7 +486,7 @@ async fn test_invalid_registry_address() {
     let deploy_tx = deployer_wallet.sign_polyjuice_tx(&state, raw_tx).unwrap();
     let deploy_tx_hash: H256 = deploy_tx.hash().into();
 
-    mem_pool_state.store_state_db(state.into());
+    mem_pool_state.store_state_db(state);
     {
         let mut mem_pool = chain.mem_pool().await;
         mem_pool.push_transaction(deploy_tx).unwrap();
diff --git a/crates/tests/src/tests/rpc_server/execute_raw_l2transaction/block_max_cycles_limit.rs b/crates/tests/src/tests/rpc_server/execute_raw_l2transaction/block_max_cycles_limit.rs
index a2cab475f..2d7744b82 100644
--- a/crates/tests/src/tests/rpc_server/execute_raw_l2transaction/block_max_cycles_limit.rs
+++ b/crates/tests/src/tests/rpc_server/execute_raw_l2transaction/block_max_cycles_limit.rs
@@ -70,7 +70,7 @@ async fn test_block_max_cycles_limit() {
         .build();
     let reg_addr_bytes = test_wallet.reg_address().to_bytes().into();
 
-    mem_pool_state.store_state_db(state.into());
+    mem_pool_state.store_state_db(state);
     let run_result = rpc_server
         .execute_raw_l2transaction(&raw_tx, None, Some(reg_addr_bytes))
         .await
@@ -123,7 +123,7 @@ async fn test_block_max_cycles_limit() {
         .build();
     let reg_addr_bytes = test_wallet.reg_address().to_bytes().into();
 
-    mem_pool_state.store_state_db(state.into());
+    mem_pool_state.store_state_db(state);
     let err = rpc_server
         .execute_raw_l2transaction(&raw_tx, None, Some(reg_addr_bytes))
         .await
diff --git a/crates/tests/src/tests/rpc_server/submit_l2transaction.rs b/crates/tests/src/tests/rpc_server/submit_l2transaction.rs
index ec294d766..a5ec9081a 100644
--- a/crates/tests/src/tests/rpc_server/submit_l2transaction.rs
+++ b/crates/tests/src/tests/rpc_server/submit_l2transaction.rs
@@ -52,7 +52,7 @@ async fn test_polyjuice_erc20_tx() {
         .build();
     let deploy_tx = creator_wallet.sign_polyjuice_tx(&state, raw_tx).unwrap();
 
-    mem_pool_state.store_state_db(state.into());
+    mem_pool_state.store_state_db(state);
     let deploy_tx_hash = rpc_server
         .submit_l2transaction(&deploy_tx)
         .await
@@ -141,7 +141,7 @@ async fn test_in_queue_query_with_signature_hash() {
     };
     let deploy_tx = test_wallet.sign_polyjuice_tx(&state, raw_tx).unwrap();
 
-    mem_pool_state.store_state_db(state.into());
+    mem_pool_state.store_state_db(state);
     let signature_hash = {
         let mut hasher = new_blake2b();
         let sig: Bytes = deploy_tx.signature().unpack();
@@ -209,7 +209,7 @@ async fn test_polyjuice_tx_from_id_zero() {
     };
     let deploy_tx = test_wallet.sign_polyjuice_tx(&state, raw_tx).unwrap();
 
-    mem_pool_state.store_state_db(state.into());
+    mem_pool_state.store_state_db(state);
     rpc_server.submit_l2transaction(&deploy_tx).await.unwrap();
     wait_tx_committed(&chain, &deploy_tx_hash, Duration::from_secs(30))
         .await
@@ -271,7 +271,7 @@ async fn test_polyjuice_tx_from_id_zero() {
         raw.hash().into()
     };
     let deploy_tx = test_wallet.sign_polyjuice_tx(&state, raw_tx).unwrap();
-    mem_pool_state.store_state_db(state.into());
+    mem_pool_state.store_state_db(state);
 
     rpc_server.submit_l2transaction(&deploy_tx).await.unwrap();
     wait_tx_committed(&chain, &deploy_tx_hash, Duration::from_secs(30))
@@ -341,7 +341,7 @@ async fn test_invalid_polyjuice_tx_from_id_zero() {
         .sign_polyjuice_tx(&state, raw_tx.clone())
         .unwrap();
 
-    mem_pool_state.store_state_db(state.into());
+    mem_pool_state.store_state_db(state);
     let err = rpc_server_no_creator
         .submit_l2transaction(&deploy_tx)
         .await
@@ -427,7 +427,7 @@ async fn test_invalid_polyjuice_tx_from_id_zero() {
     let insufficient_balance_deploy_tx = test_wallet
         .sign_polyjuice_tx(&state, raw_tx.clone())
         .unwrap();
-    mem_pool_state.store_state_db(state.into());
+    mem_pool_state.store_state_db(state);
 
     rpc_server
         .submit_l2transaction(&insufficient_balance_deploy_tx)
@@ -445,7 +445,7 @@ async fn test_invalid_polyjuice_tx_from_id_zero() {
         .unwrap();
 
     let different_script_deploy_tx = test_wallet.sign_polyjuice_tx(&state, raw_tx).unwrap();
-    mem_pool_state.store_state_db(state.into());
+    mem_pool_state.store_state_db(state);
 
     rpc_server
         .submit_l2transaction(&different_script_deploy_tx)
@@ -471,7 +471,7 @@ async fn test_invalid_polyjuice_tx_from_id_zero() {
         .build();
     let bad_deploy_tx = test_wallet.sign_polyjuice_tx(&state, raw_tx).unwrap();
 
-    mem_pool_state.store_state_db(state.into());
+    mem_pool_state.store_state_db(state);
     let err = rpc_server
         .submit_l2transaction(&bad_deploy_tx)
         .await