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

Merge branch 'master' into util_error_chain

Browse Source
This commit is contained in:
debris
2017-09-05 14:58:35 +02:00
parent 0a71ee95af 899538ae25
commit 14d00a7f72
92 changed files with 2464 additions and 2652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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