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

Revert "dont keep account provider in miner"

Browse Source 
This reverts commit 11ccacd6d0.
This commit is contained in:
keorn
2016-11-22 16:05:27 +00:00
parent 32bcd08b94
commit 340d377930
6 changed files with 94 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
parity/run.rs
View File

@@ -203,8 +203,14 @@ pub fn execute(cmd: RunCmd, logger: Arc<RotatingLogger>) -> Result<(), String> {
sync_config.fork_block = spec.fork_block();
sync_config.warp_sync = cmd.warp_sync;
// prepare account provider
let account_provider = Arc::new(try!(prepare_account_provider(&cmd.dirs, cmd.acc_conf)));
// let the Engine access the accounts
spec.engine.register_account_provider(account_provider);
// create miner
let miner = Miner::new(cmd.miner_options, cmd.gas_pricer.into(), &spec);
let miner = Miner::new(cmd.miner_options, cmd.gas_pricer.into(), &spec, Some(account_provider.clone()));
miner.set_author(cmd.miner_extras.author);
miner.set_gas_floor_target(cmd.miner_extras.gas_floor_target);
miner.set_gas_ceil_target(cmd.miner_extras.gas_ceil_target);
@@ -238,9 +244,6 @@ pub fn execute(cmd: RunCmd, logger: Arc<RotatingLogger>) -> Result<(), String> {
// create supervisor
let mut hypervisor = modules::hypervisor(&cmd.dirs.ipc_path());
// prepare account provider
let account_provider = Arc::new(try!(prepare_account_provider(&cmd.dirs, cmd.acc_conf)));
// create client service.
let service = try!(ClientService::start(
client_config,