wait to enter round (#250)

Author: samliok

epoch_multinode_test.go

@@ -658,6 +658,11 @@ func (n *inMemNetwork) triggerLeaderBlockBuilder(round uint64) *testBlock {
 		if n.IsDisconnected(leader) {
 			instance.e.Logger.Info("triggering block build on disconnected leader", zap.Stringer("leader", leader))
 		}
+
+		// wait for the node to enter the round we expect it to propose a block for
+		// otherwise we may trigger a build block too early
+		waitToEnterRound(n.t, instance.e, round)
+
 		instance.bb.triggerNewBlock()
 		return <-instance.bb.out
 	}

replication_test.go

@@ -931,7 +931,7 @@ func waitToEnterRound(t *testing.T, e *simplex.Epoch, round uint64) {
 		case <-time.After(time.Millisecond * 10):
 			continue
 		case <-timeout.C:
-			require.Fail(t, "timed out waiting for event")
+			require.Fail(t, "timed out waiting to enter round", "current round %d, waiting for round %d", e.Metadata().Round, round)
 		}
 	}
 }