diff --git a/benches/benches/benchmarks/overall.rs b/benches/benches/benchmarks/overall.rs index 70324e8dbd..74bf84b953 100644 --- a/benches/benches/benchmarks/overall.rs +++ b/benches/benches/benchmarks/overall.rs @@ -6,8 +6,7 @@ use ckb_chain_spec::consensus::{ConsensusBuilder, ProposalWindow}; use ckb_dao_utils::genesis_dao_data; use ckb_jsonrpc_types::JsonBytes; use ckb_network::{Flags, NetworkController, NetworkService, NetworkState}; -use ckb_shared::Shared; -use ckb_shared::SharedBuilder; +use ckb_shared::{Shared, SharedBuilder}; use ckb_store::ChainStore; use ckb_types::{ bytes::Bytes, diff --git a/benches/benches/benchmarks/util.rs b/benches/benches/benchmarks/util.rs index 5ede86be56..8c21dddc3b 100644 --- a/benches/benches/benchmarks/util.rs +++ b/benches/benches/benchmarks/util.rs @@ -3,8 +3,7 @@ use ckb_chain_spec::consensus::{ConsensusBuilder, ProposalWindow}; use ckb_crypto::secp::Privkey; use ckb_dao::DaoCalculator; use ckb_dao_utils::genesis_dao_data; -use ckb_shared::SharedBuilder; -use ckb_shared::{Shared, Snapshot}; +use ckb_shared::{Shared, SharedBuilder, Snapshot}; use ckb_store::ChainStore; use ckb_system_scripts::BUNDLED_CELL; use ckb_test_chain_utils::always_success_cell; diff --git a/chain/src/tests/block_assembler.rs b/chain/src/tests/block_assembler.rs index 76bfc984fe..6f5c5e2193 100644 --- a/chain/src/tests/block_assembler.rs +++ b/chain/src/tests/block_assembler.rs @@ -4,9 +4,7 @@ use ckb_app_config::BlockAssemblerConfig; use ckb_chain_spec::consensus::Consensus; use ckb_dao_utils::genesis_dao_data; use ckb_jsonrpc_types::ScriptHashType; -use ckb_shared::Shared; -use ckb_shared::SharedBuilder; -use ckb_shared::Snapshot; +use ckb_shared::{Shared, SharedBuilder, Snapshot}; use ckb_store::ChainStore; use ckb_tx_pool::{block_assembler::CandidateUncles, PlugTarget, TxEntry}; use ckb_types::{ diff --git a/chain/src/tests/util.rs b/chain/src/tests/util.rs index b7fcb5e1e3..d3f1e7da65 100644 --- a/chain/src/tests/util.rs +++ b/chain/src/tests/util.rs @@ -6,8 +6,7 @@ use ckb_dao::DaoCalculator; use ckb_dao_utils::genesis_dao_data; use ckb_jsonrpc_types::ScriptHashType; use ckb_network::{Flags, NetworkController, NetworkService, NetworkState}; -use ckb_shared::shared::Shared; -use ckb_shared::SharedBuilder; +use ckb_shared::{Shared, SharedBuilder}; use ckb_store::ChainStore; pub use ckb_test_chain_utils::MockStore; use ckb_test_chain_utils::{ diff --git a/ckb-bin/src/subcommand/replay.rs b/ckb-bin/src/subcommand/replay.rs index 7ae7958d5f..ea84479cf0 100644 --- a/ckb-bin/src/subcommand/replay.rs +++ b/ckb-bin/src/subcommand/replay.rs @@ -3,8 +3,7 @@ use ckb_async_runtime::Handle; use ckb_chain::chain::ChainService; use ckb_chain_iter::ChainIterator; use ckb_instrument::{ProgressBar, ProgressStyle}; -use ckb_shared::Shared; -use ckb_shared::SharedBuilder; +use ckb_shared::{Shared, SharedBuilder}; use ckb_store::ChainStore; use ckb_verification_traits::Switch; use std::sync::Arc; diff --git a/ckb-bin/src/subcommand/stats.rs b/ckb-bin/src/subcommand/stats.rs index 94342758a5..e0edc73fc1 100644 --- a/ckb-bin/src/subcommand/stats.rs +++ b/ckb-bin/src/subcommand/stats.rs @@ -1,7 +1,6 @@ use ckb_app_config::{ExitCode, StatsArgs}; use ckb_async_runtime::Handle; -use ckb_shared::Shared; -use ckb_shared::SharedBuilder; +use ckb_shared::{Shared, SharedBuilder}; use ckb_store::ChainStore; use ckb_types::{ core::{BlockNumber, ScriptHashType}, diff --git a/rpc/src/tests/mod.rs b/rpc/src/tests/mod.rs index b56f513c75..8551cd706a 100644 --- a/rpc/src/tests/mod.rs +++ b/rpc/src/tests/mod.rs @@ -6,8 +6,7 @@ use ckb_dao::DaoCalculator; use ckb_jsonrpc_types::ScriptHashType; use ckb_network::{Flags, NetworkService, NetworkState}; use ckb_reward_calculator::RewardCalculator; -use ckb_shared::SharedBuilder; -use ckb_shared::{Shared, Snapshot}; +use ckb_shared::{Shared, SharedBuilder, Snapshot}; use ckb_store::ChainStore; use ckb_test_chain_utils::{always_success_cell, always_success_cellbase}; use ckb_types::{ diff --git a/sync/src/relayer/tests/helper.rs b/sync/src/relayer/tests/helper.rs index 643373a8e5..0531c302a6 100644 --- a/sync/src/relayer/tests/helper.rs +++ b/sync/src/relayer/tests/helper.rs @@ -7,8 +7,7 @@ use ckb_network::{ NetworkController, NetworkService, NetworkState, Peer, PeerIndex, ProtocolId, SupportProtocols, TargetSession, }; -use ckb_shared::Shared; -use ckb_shared::SharedBuilder; +use ckb_shared::{Shared, SharedBuilder}; use ckb_store::ChainStore; use ckb_systemtime::{self, unix_time_as_millis}; use ckb_test_chain_utils::always_success_cell; diff --git a/sync/src/tests/synchronizer/basic_sync.rs b/sync/src/tests/synchronizer/basic_sync.rs index b5bc2e1562..9c5c1977b6 100644 --- a/sync/src/tests/synchronizer/basic_sync.rs +++ b/sync/src/tests/synchronizer/basic_sync.rs @@ -11,8 +11,7 @@ use ckb_dao::DaoCalculator; use ckb_dao_utils::genesis_dao_data; use ckb_network::SupportProtocols; use ckb_reward_calculator::RewardCalculator; -use ckb_shared::Shared; -use ckb_shared::SharedBuilder; +use ckb_shared::{Shared, SharedBuilder}; use ckb_store::ChainStore; use ckb_systemtime::{self, unix_time_as_millis}; use ckb_test_chain_utils::always_success_cell; diff --git a/sync/src/tests/synchronizer/functions.rs b/sync/src/tests/synchronizer/functions.rs index a66399e9b7..8b71178d0c 100644 --- a/sync/src/tests/synchronizer/functions.rs +++ b/sync/src/tests/synchronizer/functions.rs @@ -8,8 +8,7 @@ use ckb_network::{ SessionType, TargetSession, }; use ckb_reward_calculator::RewardCalculator; -use ckb_shared::SharedBuilder; -use ckb_shared::{Shared, Snapshot}; +use ckb_shared::{Shared, SharedBuilder, Snapshot}; use ckb_store::ChainStore; use ckb_systemtime::unix_time_as_millis; use ckb_types::{ diff --git a/sync/src/tests/util.rs b/sync/src/tests/util.rs index dfb1d488e8..0ccf5ba2e8 100644 --- a/sync/src/tests/util.rs +++ b/sync/src/tests/util.rs @@ -2,8 +2,7 @@ use crate::SyncShared; use ckb_chain::chain::{ChainController, ChainService}; use ckb_dao::DaoCalculator; use ckb_reward_calculator::RewardCalculator; -use ckb_shared::SharedBuilder; -use ckb_shared::{Shared, Snapshot}; +use ckb_shared::{Shared, SharedBuilder, Snapshot}; use ckb_store::ChainStore; use ckb_test_chain_utils::{always_success_cellbase, always_success_consensus}; use ckb_types::prelude::*; diff --git a/util/light-client-protocol-server/src/tests/utils/chain.rs b/util/light-client-protocol-server/src/tests/utils/chain.rs index d8e2a6ee8b..177d4c9bee 100644 --- a/util/light-client-protocol-server/src/tests/utils/chain.rs +++ b/util/light-client-protocol-server/src/tests/utils/chain.rs @@ -9,8 +9,7 @@ use ckb_chain_spec::consensus::{build_genesis_epoch_ext, ConsensusBuilder}; use ckb_dao_utils::genesis_dao_data; use ckb_jsonrpc_types::ScriptHashType; use ckb_network::{Flags, NetworkController, NetworkService, NetworkState}; -use ckb_shared::Shared; -use ckb_shared::SharedBuilder; +use ckb_shared::{Shared, SharedBuilder}; use ckb_systemtime::unix_time_as_millis; use ckb_test_chain_utils::always_success_cell; use ckb_tx_pool::TxPoolController; diff --git a/verification/contextual/src/tests/contextual_block_verifier.rs b/verification/contextual/src/tests/contextual_block_verifier.rs index 83741c755c..a53b1146ba 100644 --- a/verification/contextual/src/tests/contextual_block_verifier.rs +++ b/verification/contextual/src/tests/contextual_block_verifier.rs @@ -3,8 +3,7 @@ use crate::contextual_block_verifier::{RewardVerifier, VerifyContext}; use ckb_chain::chain::{ChainController, ChainService}; use ckb_chain_spec::consensus::{Consensus, ConsensusBuilder}; use ckb_error::assert_error_eq; -use ckb_shared::Shared; -use ckb_shared::SharedBuilder; +use ckb_shared::{Shared, SharedBuilder}; use ckb_store::{ChainDB, ChainStore}; use ckb_test_chain_utils::always_success_cell; use ckb_types::{ diff --git a/verification/contextual/src/tests/uncle_verifier.rs b/verification/contextual/src/tests/uncle_verifier.rs index 0d471f52ec..af12732084 100644 --- a/verification/contextual/src/tests/uncle_verifier.rs +++ b/verification/contextual/src/tests/uncle_verifier.rs @@ -5,8 +5,7 @@ use crate::uncles_verifier::UnclesVerifier; use ckb_chain::chain::{ChainController, ChainService}; use ckb_chain_spec::consensus::Consensus; use ckb_error::assert_error_eq; -use ckb_shared::Shared; -use ckb_shared::SharedBuilder; +use ckb_shared::{Shared, SharedBuilder}; use ckb_store::{ChainDB, ChainStore}; use ckb_types::{ core::{