From 91099f62c90122f320be44958df2f3f29cbee8ae Mon Sep 17 00:00:00 2001
From: keorn <pczaban@gmail.com>
Date: Fri, 2 Dec 2016 13:37:49 +0000
Subject: [PATCH] add more gossip if step is stuck

---
 ethcore/src/engines/tendermint/transition.rs   | 18 +++++++++++-------
 .../src/engines/tendermint/vote_collector.rs   |  5 +++++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ethcore/src/engines/tendermint/transition.rs b/ethcore/src/engines/tendermint/transition.rs
index a494cfc0f..1ca230b3e 100644
--- a/ethcore/src/engines/tendermint/transition.rs
+++ b/ethcore/src/engines/tendermint/transition.rs
@@ -78,38 +78,42 @@ impl IoHandler<Step> for TransitionHandler {
 					Step::Propose => {
 						trace!(target: "poa", "timeout: Propose timeout.");
 						set_timeout(io, engine.our_params.timeouts.prevote);
-						Step::Prevote
+						Some(Step::Prevote)
 					},
 					Step::Prevote if engine.has_enough_any_votes() => {
 						trace!(target: "poa", "timeout: Prevote timeout.");
 						set_timeout(io, engine.our_params.timeouts.precommit);
-						Step::Precommit
+						Some(Step::Precommit)
 					},
 					Step::Prevote => {
 						trace!(target: "poa", "timeout: Prevote timeout without enough votes.");
 						set_timeout(io, engine.our_params.timeouts.prevote);
-						Step::Prevote
+						engine.broadcast_old_messages();
+						None
 					},
 					Step::Precommit if engine.has_enough_any_votes() => {
 						trace!(target: "poa", "timeout: Precommit timeout.");
 						set_timeout(io, engine.our_params.timeouts.propose);
 						engine.increment_round(1);
-						Step::Propose
+						Some(Step::Propose)
 					},
 					Step::Precommit => {
 						trace!(target: "poa", "timeout: Precommit timeout without enough votes.");
 						set_timeout(io, engine.our_params.timeouts.precommit);
-						Step::Precommit
+						engine.broadcast_old_messages();
+						None
 					},
 					Step::Commit => {
 						trace!(target: "poa", "timeout: Commit timeout.");
 						set_timeout(io, engine.our_params.timeouts.propose);
 						engine.reset_round();
-						Step::Propose
+						Some(Step::Propose)
 					},
 				};
 
-				engine.to_step(next_step)
+				if let Some(s) = next_step {
+					engine.to_step(s)
+				}
 			}
 		}
 	}
diff --git a/ethcore/src/engines/tendermint/vote_collector.rs b/ethcore/src/engines/tendermint/vote_collector.rs
index 93052a44a..8bb271a35 100644
--- a/ethcore/src/engines/tendermint/vote_collector.rs
+++ b/ethcore/src/engines/tendermint/vote_collector.rs
@@ -126,6 +126,11 @@ impl VoteCollector {
 		}
 		n
 	}
+
+	pub fn get_older_than(&self, message: &ConsensusMessage) -> Vec<Bytes> {
+		let guard = self.votes.read();
+		guard.keys().take_while(|m| *m <= message).map(|m| ::rlp::encode(m).to_vec()).collect()
+	}
 }
 
 #[cfg(test)]