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

remove unused Engine::is_proposal (#10475)

Browse Source
This commit is contained in:
Marek Kotewicz 2019-03-14 13:40:59 +01:00 committed by Andrew Jones
parent c9db8ea21d
commit f875175325
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ethcore/src/client/client.rs
View File

@ -298,19 +298,11 @@ impl Importer {
match self.check_and_lock_block(&bytes, block, client) { match self.check_and_lock_block(&bytes, block, client) {
Ok((closed_block, pending)) => { Ok((closed_block, pending)) => {
if self.engine.is_proposal(&header) { imported_blocks.push(hash);
self.block_queue.mark_as_good(&[hash]); let transactions_len = closed_block.transactions().len();
proposed_blocks.push(bytes); let route = self.commit_block(closed_block, &header, encoded::Block::new(bytes), pending, client);
} else { import_results.push(route);
imported_blocks.push(hash); client.report.write().accrue_block(&header, transactions_len);
let transactions_len = closed_block.transactions().len();
let route = self.commit_block(closed_block, &header, encoded::Block::new(bytes), pending, client);
import_results.push(route);
client.report.write().accrue_block(&header, transactions_len);
}
}, },
Err(err) => { Err(err) => {
self.bad_blocks.report(bytes, format!("{:?}", err)); self.bad_blocks.report(bytes, format!("{:?}", err));

4
ethcore/src/engines/mod.rs
View File

@ -375,10 +375,6 @@ pub trait Engine<M: Machine>: Sync + Send {
/// updating consensus state and potentially issuing a new one. /// updating consensus state and potentially issuing a new one.
fn handle_message(&self, _message: &[u8]) -> Result<(), EngineError> { Err(EngineError::UnexpectedMessage) } fn handle_message(&self, _message: &[u8]) -> Result<(), EngineError> { Err(EngineError::UnexpectedMessage) }
/// Find out if the block is a proposal block and should not be inserted into the DB.
/// Takes a header of a fully verified block.
fn is_proposal(&self, _verified_header: &Header) -> bool { false }
/// Register a component which signs consensus messages. /// Register a component which signs consensus messages.
fn set_signer(&self, _signer: Box<EngineSigner>) {} fn set_signer(&self, _signer: Box<EngineSigner>) {}