grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ethcore]: reduce re-exports (#11059)

Browse Source 
* [ethcore]: reduce re-exports

Last piece of refactoring to close #10130 after work done by @dvdplm et. al

After this PR, we have the following re-exports from other crates in `non-testbuilds`:
- evm::VMType (client)
- ethcore_miner::local_accounts::LocalAccounts (miner)
- ethcore_miner::pool::PendingOrdering (miner)

I think the miner re-exports make sense (closely tied to the module) and `VMType` (related to module but not closely)

* fix(grumbles): remove re-export `VerifierType`
This commit is contained in:
Niklas Adolfsson
2019-09-16 17:12:21 +02:00
committed by Andronik Ordian
parent bceb1d5691
commit 0051c26acf
14 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ethcore/src/client/client.rs
View File

@@ -45,12 +45,11 @@ use blockchain::{
BlockNumberKey,
BlockProvider,
BlockReceipts,
CacheSize as BlockChainCacheSize,
ExtrasInsert,
TransactionAddress,
TreeRoute
};
// re-export
pub use blockchain::CacheSize as BlockChainCacheSize;
use call_contract::{CallContract, RegistryInfo};
use client::{
bad_blocks, BlockProducer, BroadcastProposalBlock, Call,
@@ -93,7 +92,7 @@ use machine::{
executive::{contract_address, Executive, TransactOptions},
transaction_ext::Transaction,
};
use miner::{Miner, MinerService};
use miner::{Miner, MinerService, PendingOrdering};
use snapshot::{self, SnapshotClient, SnapshotWriter};
use spec::Spec;
use state_db::StateDB;
@@ -2124,7 +2123,7 @@ impl BlockChainClient for Client {
).as_u64() as usize
)
};
self.importer.miner.ready_transactions(self, max_len, ::miner::PendingOrdering::Priority)
self.importer.miner.ready_transactions(self, max_len, PendingOrdering::Priority)
}
fn signing_chain_id(&self) -> Option<u64> {

7
ethcore/src/client/config.rs
View File

@@ -16,14 +16,13 @@
use std::str::FromStr;
use verification::{VerifierType, QueueConfig};
use blockchain::Config as BlockChainConfig;
use journaldb;
use snapshot::SnapshotConfiguration;
use trace::Config as TraceConfig;
use types::client_types::Mode;
use verification::{VerifierType, QueueConfig};
pub use std::time::Duration;
pub use blockchain::Config as BlockChainConfig;
pub use trace::Config as TraceConfig;
pub use evm::VMType;
/// Client state db compaction profile

15
ethcore/src/client/mod.rs
View File

@@ -20,22 +20,21 @@ mod ancient_import;
mod bad_blocks;
mod client;
mod config;
mod traits;
#[cfg(any(test, feature = "test-helpers"))]
mod evm_test_client;
#[cfg(any(test, feature = "test-helpers"))]
mod test_client;
pub use self::client::Client;
pub use self::config::{ClientConfig, DatabaseCompactionProfile, BlockChainConfig, VMType};
#[cfg(any(test, feature = "test-helpers"))]
pub use self::evm_test_client::{EvmTestClient, EvmTestError, TransactErr, TransactSuccess};
#[cfg(any(test, feature = "test-helpers"))]
pub use self::test_client::{TestBlockChainClient, EachBlockWith, TestState};
pub use self::config::{ClientConfig, DatabaseCompactionProfile, VMType};
pub use self::traits::{
ReopenBlock, PrepareOpenBlock, ImportSealedBlock, BroadcastProposalBlock,
Call, EngineInfo, BlockProducer, SealedBlockImporter,
};
pub use verification::VerifierType;
mod traits;
#[cfg(any(test, feature = "test-helpers"))]
pub use self::evm_test_client::{EvmTestClient, EvmTestError, TransactErr, TransactSuccess};
#[cfg(any(test, feature = "test-helpers"))]
pub use self::test_client::{TestBlockChainClient, EachBlockWith, TestState};