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

dont rebroadcast propose

Browse Source
This commit is contained in:
keorn 2016-12-07 16:42:58 +01:00
parent aa9caac750
commit 347634ac6c
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,6 +52,15 @@ pub enum Step {
Commit Commit
} }
impl Step {
pub fn is_pre(self) -> bool {
match self {
Step::Prevote | Step::Precommit => true,
_ => false,
}
}
}
pub type Height = usize; pub type Height = usize;
pub type Round = usize; pub type Round = usize;
pub type BlockHash = H256; pub type BlockHash = H256;

7
ethcore/src/engines/tendermint/vote_collector.rs
View File

@ -125,7 +125,12 @@ impl VoteCollector {
pub fn get_up_to(&self, height: Height) -> Vec<Bytes> { pub fn get_up_to(&self, height: Height) -> Vec<Bytes> {
let guard = self.votes.read(); let guard = self.votes.read();
guard.keys().take_while(|m| m.height <= height).map(|m| ::rlp::encode(m).to_vec()).collect() guard
.keys()
.filter(|m| m.step.is_pre())
.take_while(|m| m.height <= height)
.map(|m| ::rlp::encode(m).to_vec())
.collect()
} }
} }

8
ethcore/src/miner/miner.rs
View File

@ -480,9 +480,11 @@ impl Miner {
/// Uses Engine to seal the block internally and then imports it to chain. /// Uses Engine to seal the block internally and then imports it to chain.
fn seal_and_import_block_internally(&self, chain: &MiningBlockChainClient, block: ClosedBlock) -> bool { fn seal_and_import_block_internally(&self, chain: &MiningBlockChainClient, block: ClosedBlock) -> bool {
let mut sealing_work = self.sealing_work.lock(); {
sealing_work.queue.push(block.clone()); let mut sealing_work = self.sealing_work.lock();
sealing_work.queue.use_last_ref(); sealing_work.queue.push(block.clone());
sealing_work.queue.use_last_ref();
}
if !block.transactions().is_empty() || self.forced_sealing() { if !block.transactions().is_empty() || self.forced_sealing() {
if let Ok(sealed) = self.seal_block_internally(block) { if let Ok(sealed) = self.seal_block_internally(block) {
if chain.import_sealed_block(sealed).is_ok() { if chain.import_sealed_block(sealed).is_ok() {