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

have parity create the PersonalClient properly

Browse Source
This commit is contained in:
Robert Habermeier 2016-05-26 20:18:14 +02:00
parent 194ca19720
commit ba600ac06a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
parity/dapps.rs
View File

@ -22,7 +22,7 @@ use ethsync::EthSync;
use ethminer::{Miner, ExternalMiner}; use ethminer::{Miner, ExternalMiner};
use util::RotatingLogger; use util::RotatingLogger;
use util::panics::PanicHandler; use util::panics::PanicHandler;
use util::keys::store::{AccountService}; use util::keys::store::AccountService;
use util::network_settings::NetworkSettings; use util::network_settings::NetworkSettings;
use die::*; use die::*;
@ -100,7 +100,7 @@ pub fn setup_dapps_server(
server.add_delegate(NetClient::new(&deps.sync).to_delegate()); server.add_delegate(NetClient::new(&deps.sync).to_delegate());
server.add_delegate(EthClient::new(&deps.client, &deps.sync, &deps.secret_store, &deps.miner, &deps.external_miner).to_delegate()); server.add_delegate(EthClient::new(&deps.client, &deps.sync, &deps.secret_store, &deps.miner, &deps.external_miner).to_delegate());
server.add_delegate(EthFilterClient::new(&deps.client, &deps.miner).to_delegate()); server.add_delegate(EthFilterClient::new(&deps.client, &deps.miner).to_delegate());
server.add_delegate(PersonalClient::new(&deps.secret_store).to_delegate()); server.add_delegate(PersonalClient::new(&deps.secret_store, &deps.client, &deps.miner).to_delegate());
server.add_delegate(EthcoreClient::new(&deps.miner, deps.logger.clone(), deps.settings.clone()).to_delegate()); server.add_delegate(EthcoreClient::new(&deps.miner, deps.logger.clone(), deps.settings.clone()).to_delegate());
let start_result = match auth { let start_result = match auth {

4
parity/rpc.rs
View File

@ -24,7 +24,7 @@ use ethsync::EthSync;
use ethminer::{Miner, ExternalMiner}; use ethminer::{Miner, ExternalMiner};
use util::RotatingLogger; use util::RotatingLogger;
use util::panics::PanicHandler; use util::panics::PanicHandler;
use util::keys::store::{AccountService}; use util::keys::store::AccountService;
use util::network_settings::NetworkSettings; use util::network_settings::NetworkSettings;
use die::*; use die::*;
use jsonipc; use jsonipc;
@ -106,7 +106,7 @@ fn setup_rpc_server(apis: Vec<&str>, deps: &Arc<Dependencies>) -> Server {
}, },
"personal" => { "personal" => {
modules.insert("personal".to_owned(), "1.0".to_owned()); modules.insert("personal".to_owned(), "1.0".to_owned());
server.add_delegate(PersonalClient::new(&deps.secret_store).to_delegate()) server.add_delegate(PersonalClient::new(&deps.secret_store, &deps.client, &deps.miner).to_delegate())
}, },
"ethcore" => { "ethcore" => {
modules.insert("ethcore".to_owned(), "1.0".to_owned()); modules.insert("ethcore".to_owned(), "1.0".to_owned());