Revert "fixed master (#6465)"

This reverts commit 899538ae25.
This commit is contained in:
Robert Habermeier
2017-09-05 17:54:05 +02:00
parent 7e3c081007
commit ad39446e87
41 changed files with 1268 additions and 264 deletions

View File

@@ -34,7 +34,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};
@@ -237,8 +237,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) {