Clear upons upon round, not block

coordinator/tributary/tendermint/src/lib.rs

@@ -306,6 +306,14 @@ impl<N: Network + 'static> TendermintMachine<N> {
 
  // Start a new round. Returns true if we were the proposer
  fn round(&mut self, round: RoundNumber, time: Option<CanonicalInstant>) -> bool {
+ // Clear upons
+ self.upons = Upons {
+ upon_prevotes: false,
+ upon_successful_current_round_prevotes: false,
+ upon_negative_current_round_prevotes: false,
+ upon_precommits: false,
+ };
+
  let proposer = self.weights.proposer(self.block.number, round);
  let res = if let Some(data) = self.block.new_round(round, proposer, time) {
  self.broadcast(data);
@@ -364,14 +372,6 @@ impl<N: Network + 'static> TendermintMachine<N> {
  proposal,
  );
 
- // Clear upons
- self.upons = Upons {
- upon_prevotes: false,
- upon_successful_current_round_prevotes: false,
- upon_negative_current_round_prevotes: false,
- upon_precommits: false,
- };
-
  // Start the first round
  self.round(RoundNumber(0), Some(round_end));
  }