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

Merge branch 'master' into fo-6418-dont-export-bigint

Browse Source
This commit is contained in:
Fredrik Harrysson
2017-09-05 10:48:54 +02:00
committed by GitHub
parent d1930ac708 2df61d0a8c
commit dccdedc001
45 changed files with 1615 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ethcore/src/engines/basic_authority.rs
View File

@@ -33,7 +33,7 @@ use error::{BlockError, Error};
use evm::Schedule;
use ethjson;
use header::{Header, BlockNumber};
use client::Client;
use client::EngineClient;
use semantic_version::SemanticVersion;
use super::signer::EngineSigner;
use super::validator_set::{ValidatorSet, SimpleList, new_validator_set};
@@ -236,8 +236,8 @@ impl Engine for BasicAuthority {
}
}
fn register_client(&self, client: Weak<Client>) {
self.validators.register_contract(client);
fn register_client(&self, client: Weak<EngineClient>) {
self.validators.register_client(client);
}
fn set_signer(&self, ap: Arc<AccountProvider>, address: Address, password: String) {