6a9de9b11e
* Add client-traits crate Move the BlockInfo trait to new crate * New crate `machine` Contains code extracted from ethcore that defines `Machine`, `Externalities` and other execution related code. * Use new machine and client-traits crates in ethcore * Use new crates machine and client-traits instead of ethcore where appropriate * Fix tests * Don't re-export so many types from ethcore::client * Fixing more fallout from removing re-export * fix test * More fallout from not re-exporting types * Add some docs * cleanup * import the macro edition style * Tweak docs * Add missing import * remove unused ethabi_derive imports * Use latest ethabi-contract * Move many traits from ethcore/client/traits to client-traits crate Initial version of extracted Engine trait * Move snapshot related traits to the engine crate (eew) * Move a few snapshot related types to common_types Cleanup Executed as exported from machine crate * fix warning * Gradually introduce new engine crate: snapshot * ethcore typechecks with new engine crate * Sort out types outside ethcore * Add an EpochVerifier to ethash and use that in Engine.epoch_verifier() Cleanup * Document pub members * Sort out tests Sort out default impls for EpochVerifier * Add test-helpers feature and move EngineSigner impl to the right place * Sort out tests * Sort out tests and refactor verification types * Fix missing traits * More missing traits Fix Histogram * Fix tests and cleanup * cleanup * Put back needed logger import * Don't rexport common_types from ethcore/src/client Don't export ethcore::client::* * Remove files no longer used Use types from the engine crate Explicit exports from engine::engine * Get rid of itertools * Move a few more traits from ethcore to client-traits: BlockChainReset, ScheduleInfo, StateClient * Move ProvingBlockChainClient to client-traits * Don't re-export ForkChoice and Transition from ethcore * Address grumbles: sort imports, remove commented out code * Fix merge resolution error * merge failure
65 lines
1.9 KiB
Rust
65 lines
1.9 KiB
Rust
// Copyright 2015-2019 Parity Technologies (UK) Ltd.
|
|
// This file is part of Parity Ethereum.
|
|
|
|
// Parity Ethereum is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// Parity Ethereum is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Parity Ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
use std::sync::{Arc, mpsc};
|
|
|
|
use client_traits::BlockChainClient;
|
|
use sync::{self, SyncConfig, NetworkConfiguration, Params, ConnectionFilter};
|
|
use ethcore::snapshot::SnapshotService;
|
|
use light::Provider;
|
|
use parity_runtime::Executor;
|
|
|
|
pub use sync::{EthSync, SyncProvider, ManageNetwork, PrivateTxHandler};
|
|
pub use ethcore::client::ChainNotify;
|
|
use ethcore_logger::Config as LogConfig;
|
|
|
|
pub type SyncModules = (
|
|
Arc<SyncProvider>,
|
|
Arc<ManageNetwork>,
|
|
Arc<ChainNotify>,
|
|
mpsc::Sender<sync::PriorityTask>,
|
|
);
|
|
|
|
pub fn sync(
|
|
config: SyncConfig,
|
|
executor: Executor,
|
|
network_config: NetworkConfiguration,
|
|
chain: Arc<BlockChainClient>,
|
|
snapshot_service: Arc<SnapshotService>,
|
|
private_tx_handler: Option<Arc<PrivateTxHandler>>,
|
|
provider: Arc<Provider>,
|
|
_log_settings: &LogConfig,
|
|
connection_filter: Option<Arc<ConnectionFilter>>,
|
|
) -> Result<SyncModules, sync::Error> {
|
|
let eth_sync = EthSync::new(Params {
|
|
config,
|
|
executor,
|
|
chain,
|
|
provider,
|
|
snapshot_service,
|
|
private_tx_handler,
|
|
network_config,
|
|
},
|
|
connection_filter)?;
|
|
|
|
Ok((
|
|
eth_sync.clone() as Arc<SyncProvider>,
|
|
eth_sync.clone() as Arc<ManageNetwork>,
|
|
eth_sync.clone() as Arc<ChainNotify>,
|
|
eth_sync.priority_tasks()
|
|
))
|
|
}
|