Skip to content

Commit

Permalink
Merge ckb_shared related import statements into one line
Browse files Browse the repository at this point in the history
  • Loading branch information
eval-exec committed Nov 20, 2023
1 parent 1c06193 commit 480f1b1
Show file tree
Hide file tree
Showing 14 changed files with 14 additions and 29 deletions.
3 changes: 1 addition & 2 deletions benches/benches/benchmarks/overall.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions benches/benches/benchmarks/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 1 addition & 3 deletions chain/src/tests/block_assembler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::{
Expand Down
3 changes: 1 addition & 2 deletions chain/src/tests/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::{
Expand Down
3 changes: 1 addition & 2 deletions ckb-bin/src/subcommand/replay.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions ckb-bin/src/subcommand/stats.rs
Original file line number Diff line number Diff line change
@@ -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},
Expand Down
3 changes: 1 addition & 2 deletions rpc/src/tests/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::{
Expand Down
3 changes: 1 addition & 2 deletions sync/src/relayer/tests/helper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions sync/src/tests/synchronizer/basic_sync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions sync/src/tests/synchronizer/functions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::{
Expand Down
3 changes: 1 addition & 2 deletions sync/src/tests/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::*;
Expand Down
3 changes: 1 addition & 2 deletions util/light-client-protocol-server/src/tests/utils/chain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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::{
Expand Down
3 changes: 1 addition & 2 deletions verification/contextual/src/tests/uncle_verifier.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::{
Expand Down

0 comments on commit 480f1b1

Please sign in to comment.