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

simplify seal

Browse Source
This commit is contained in:
keorn 2016-09-30 12:22:46 +01:00
parent d59e9e816e
commit 8a51ae02aa
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ethcore/src/engines/tendermint/mod.rs
View File

@ -204,7 +204,7 @@ impl Engine for Tendermint {
fn name(&self) -> &str { "Tendermint" } fn name(&self) -> &str { "Tendermint" }
fn version(&self) -> SemanticVersion { SemanticVersion::new(1, 0, 0) } fn version(&self) -> SemanticVersion { SemanticVersion::new(1, 0, 0) }
/// Possibly signatures of all validators. /// Possibly signatures of all validators.
fn seal_fields(&self) -> usize { self.our_params.validator_n } fn seal_fields(&self) -> usize { 2 }
fn params(&self) -> &CommonParams { &self.params } fn params(&self) -> &CommonParams { &self.params }
fn builtins(&self) -> &BTreeMap<Address, Builtin> { &self.builtins } fn builtins(&self) -> &BTreeMap<Address, Builtin> { &self.builtins }
@ -260,12 +260,13 @@ impl Engine for Tendermint {
} }
fn verify_block_basic(&self, header: &Header, _block: Option<&[u8]>) -> Result<(), Error> { fn verify_block_basic(&self, header: &Header, _block: Option<&[u8]>) -> Result<(), Error> {
if header.seal().len() <= self.threshold() { let seal_length = header.seal().len();
Err(From::from(BlockError::InvalidSealArity( if seal_length == self.seal_fields() {
Mismatch { expected: self.threshold(), found: header.seal().len() }
)))
} else {
Ok(()) Ok(())
} else {
Err(From::from(BlockError::InvalidSealArity(
Mismatch { expected: self.seal_fields(), found: seal_length }
)))
} }
} }