Move some helper function for building blocks/txs from ckb-chain to ckb-test-chain-utils

Cargo.toml

@@ -73,8 +73,8 @@ members = [
     "store",
     "util/indexer",
     "util/chain-iter",
-    "util/test-chain-utils",
     "util/dao",
+    "util/test-chain-utils",
     "util/reward-calculator",
     "util/snapshot",
     "util/migrate",

chain/Cargo.toml

@@ -20,7 +20,6 @@ ckb-verification-contextual = { path = "../verification/contextual", version = "
 ckb-verification-traits = { path = "../verification/traits", version = "= 0.114.0-pre" }
 ckb-systemtime = { path = "../util/systemtime", version = "= 0.114.0-pre" }
 ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.114.0-pre" }
-ckb-dao = { path = "../util/dao", version = "= 0.114.0-pre" }
 ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.114.0-pre" }
 ckb-error = { path = "../error", version = "= 0.114.0-pre" }
 ckb-app-config = { path = "../util/app-config", version = "= 0.114.0-pre" }

chain/src/tests/basic.rs

@@ -1,14 +1,14 @@
 use crate::chain::ChainController;
-use crate::tests::util::{
-    create_always_success_tx, create_cellbase, create_multi_outputs_transaction,
-    create_transaction, create_transaction_with_out_point, dao_data, start_chain, MockChain,
-    MockStore,
-};
+use crate::tests::util::start_chain;
 use ckb_chain_spec::consensus::{Consensus, ConsensusBuilder};
 use ckb_dao_utils::genesis_dao_data;
 use ckb_error::assert_error_eq;
 use ckb_shared::shared::Shared;
 use ckb_store::ChainStore;
+use ckb_test_chain_utils::{
+    create_always_success_tx, create_cellbase, create_multi_outputs_transaction,
+    create_transaction, create_transaction_with_out_point, dao_data, MockChain, MockStore,
+};
 use ckb_types::core::error::OutPointError;
 use ckb_types::prelude::*;
 use ckb_types::{

chain/src/tests/cell.rs

@@ -1,9 +1,11 @@
-use crate::tests::util::{calculate_reward, create_always_success_tx, start_chain, MockStore};
+use crate::tests::util::start_chain;
 use ckb_chain_spec::consensus::{Consensus, ConsensusBuilder};
 use ckb_dao_utils::genesis_dao_data;
 use ckb_shared::shared::Shared;
 use ckb_store::{attach_block_cell, detach_block_cell, ChainStore};
-use ckb_test_chain_utils::always_success_cell;
+use ckb_test_chain_utils::{
+    always_success_cell, calculate_reward, create_always_success_tx, MockStore,
+};
 use ckb_types::prelude::*;
 use ckb_types::{
     bytes::Bytes,

chain/src/tests/delay_verify.rs

@@ -1,9 +1,10 @@
-use crate::tests::util::{
-    create_cellbase, create_multi_outputs_transaction, create_transaction,
-    create_transaction_with_out_point, dao_data, start_chain, MockChain, MockStore,
-};
+use crate::tests::util::start_chain;
 use ckb_error::assert_error_eq;
 use ckb_store::ChainStore;
+use ckb_test_chain_utils::{
+    create_cellbase, create_multi_outputs_transaction, create_transaction,
+    create_transaction_with_out_point, dao_data, MockChain, MockStore,
+};
 use ckb_types::core::error::OutPointError;
 use ckb_types::prelude::*;
 use ckb_types::{core::BlockBuilder, packed::OutPoint};

chain/src/tests/dep_cell.rs

@@ -1,7 +1,9 @@
-use crate::tests::util::{create_always_success_out_point, create_always_success_tx, start_chain};
+use crate::tests::util::start_chain;
 use ckb_chain_spec::consensus::ConsensusBuilder;
 use ckb_dao_utils::genesis_dao_data;
-use ckb_test_chain_utils::always_success_cell;
+use ckb_test_chain_utils::{
+    always_success_cell, create_always_success_out_point, create_always_success_tx,
+};
 use ckb_types::prelude::*;
 use ckb_types::{
     bytes::Bytes,

chain/src/tests/find_fork.rs

@@ -1,9 +1,9 @@
 use crate::chain::{ChainService, ForkChanges};
-use crate::tests::util::{MockChain, MockStore};
 use ckb_chain_spec::consensus::{Consensus, ProposalWindow};
 use ckb_shared::SharedBuilder;
 use ckb_store::ChainStore;
 use ckb_systemtime::unix_time_as_millis;
+use ckb_test_chain_utils::{MockChain, MockStore};
 use ckb_types::{
     core::{BlockBuilder, BlockExt, BlockView},
     packed,

chain/src/tests/load_code_with_snapshot.rs

@@ -1,4 +1,5 @@
-use crate::tests::util::{start_chain, start_chain_with_tx_pool_config};
+use crate::tests::util::start_chain;
+use crate::tests::util::start_chain_with_tx_pool_config;
 use ckb_app_config::TxPoolConfig;
 use ckb_chain_spec::consensus::ConsensusBuilder;
 use ckb_dao_utils::genesis_dao_data;

chain/src/tests/load_input_cell_data.rs

@@ -1,9 +1,10 @@
-use crate::tests::util::{
-    create_load_input_one_byte_cell_tx, create_load_input_one_byte_out_point, start_chain,
-};
+use crate::tests::util::start_chain;
 use ckb_chain_spec::consensus::ConsensusBuilder;
 use ckb_dao_utils::genesis_dao_data;
-use ckb_test_chain_utils::load_input_one_byte_cell;
+use ckb_test_chain_utils::{
+    create_load_input_one_byte_cell_tx, create_load_input_one_byte_out_point,
+    load_input_one_byte_cell,
+};
 use ckb_types::prelude::*;
 use ckb_types::{
     bytes::Bytes,

chain/src/tests/load_input_data_hash_cell.rs

@@ -1,9 +1,10 @@
-use crate::tests::util::{
-    create_load_input_data_hash_cell_out_point, create_load_input_data_hash_cell_tx, start_chain,
-};
+use crate::tests::util::start_chain;
 use ckb_chain_spec::consensus::ConsensusBuilder;
 use ckb_dao_utils::genesis_dao_data;
-use ckb_test_chain_utils::load_input_data_hash_cell;
+use ckb_test_chain_utils::{
+    create_load_input_data_hash_cell_out_point, create_load_input_data_hash_cell_tx,
+    load_input_data_hash_cell,
+};
 use ckb_types::prelude::*;
 use ckb_types::{
     bytes::Bytes,

chain/src/tests/non_contextual_block_txs_verify.rs

@@ -1,12 +1,13 @@
-use crate::tests::util::{
-    calculate_reward, create_always_success_out_point, create_always_success_tx, start_chain,
-    MockStore,
-};
+use crate::tests::util::start_chain;
 use ckb_chain_spec::consensus::{Consensus, ConsensusBuilder};
 use ckb_dao_utils::genesis_dao_data;
 use ckb_shared::shared::Shared;
 use ckb_store::ChainStore;
 use ckb_test_chain_utils::always_success_cell;
+use ckb_test_chain_utils::MockStore;
+use ckb_test_chain_utils::{
+    calculate_reward, create_always_success_out_point, create_always_success_tx,
+};
 use ckb_types::prelude::*;
 use ckb_types::{
     bytes::Bytes,

chain/src/tests/reward.rs

@@ -1,13 +1,13 @@
-use crate::tests::util::{
-    calculate_reward, create_always_success_out_point, create_always_success_tx, dao_data,
-    start_chain, MockStore,
-};
+use crate::tests::util::start_chain;
 use ckb_chain_spec::consensus::{Consensus, ConsensusBuilder};
 use ckb_dao_utils::genesis_dao_data;
 use ckb_reward_calculator::RewardCalculator;
 use ckb_shared::shared::Shared;
 use ckb_store::ChainStore;
-use ckb_test_chain_utils::always_success_cell;
+use ckb_test_chain_utils::{
+    always_success_cell, calculate_reward, create_always_success_out_point,
+    create_always_success_tx, dao_data, MockStore,
+};
 use ckb_types::prelude::*;
 use ckb_types::{
     bytes::Bytes,

chain/src/tests/truncate.rs

@@ -1,8 +1,8 @@
 use crate::chain::ChainService;
-use crate::tests::util::{MockChain, MockStore};
 use ckb_chain_spec::consensus::Consensus;
 use ckb_shared::SharedBuilder;
 use ckb_store::ChainStore;
+use ckb_test_chain_utils::{MockChain, MockStore};
 use ckb_verification_traits::Switch;
 use std::sync::Arc;
 

chain/src/tests/uncle.rs

@@ -1,8 +1,8 @@
 use crate::chain::ChainService;
-use crate::tests::util::{MockChain, MockStore};
 use ckb_chain_spec::consensus::Consensus;
 use ckb_shared::SharedBuilder;
 use ckb_store::ChainStore;
+use ckb_test_chain_utils::{MockChain, MockStore};
 use ckb_verification_traits::Switch;
 use std::sync::Arc;