[ethcore cleanup]: various unrelated fixes from #11493 (#11507)

* [cleanup]: various unrelated fixes from `#11493`

* [revert]: too verbose logging `seal`

* fix nit: don't mix from() and into()
This commit is contained in:
Niklas Adolfsson
2020-02-25 15:32:13 +01:00
committed by GitHub
parent ad56eb48b5
commit cd7018007e
12 changed files with 153 additions and 146 deletions

View File

@@ -75,7 +75,7 @@ fn verify_external(header: &Header, validators: &dyn ValidatorSet) -> Result<(),
}
match validators.contains(header.parent_hash(), &signer) {
false => Err(BlockError::InvalidSeal.into()),
false => Err(Error::Block(BlockError::InvalidSeal)),
true => Ok(())
}
}
@@ -91,7 +91,7 @@ impl BasicAuthority {
/// Create a new instance of BasicAuthority engine
pub fn new(our_params: BasicAuthorityParams, machine: Machine) -> Self {
BasicAuthority {
machine: machine,
machine,
signer: RwLock::new(None),
validators: new_validator_set(our_params.validators),
}