remove printf

Author: samliok

epoch.go

@@ -135,8 +135,8 @@ func (e *Epoch) HandleMessage(msg *Message, from NodeID) error {
 		return e.handleEmptyVoteMessage(msg.EmptyVoteMessage, from)
 	case msg.Notarization != nil:
 		return e.handleNotarizationMessage(msg.Notarization, from)
-	//case msg.EmptyNotarization != nil:
-	//	return e.handleEmptyNotarizationMessage(msg.EmptyNotarization, from)
+	// case msg.EmptyNotarization != nil:
+	// 	return e.handleEmptyNotarizationMessage(msg.EmptyNotarization, from)
 	case msg.Finalization != nil:
 		return e.handleFinalizationMessage(msg.Finalization, from)
 	case msg.FinalizationCertificate != nil:
@@ -1561,6 +1561,7 @@ func (e *Epoch) triggerProposalWaitTimeExpired(round uint64) {
 	}
 	e.Logger.Debug("Persisted empty vote to WAL",
 		zap.Uint64("round", round),
+		zap.Uint64("round from metadata", e.metadata().Round),
 		zap.Int("size", len(emptyVoteRecord)))
 
 	emptyVotes := e.getOrCreateEmptyVoteSetForRound(round)
@@ -1583,7 +1584,6 @@ func (e *Epoch) monitorProgress(round uint64) {
 	proposalWaitTimeExpired := func() {
 		e.lock.Lock()
 		defer e.lock.Unlock()
-
 		e.triggerProposalWaitTimeExpired(round)
 	}
 

epoch_multinode_test.go

@@ -13,6 +13,7 @@ import (
 	"simplex/wal"
 	"sync"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 )
@@ -102,6 +103,7 @@ func defaultTestNodeEpochConfig(t *testing.T, nodeID NodeID, net *inMemNetwork,
 		BlockDeserializer:   &blockDeserializer{},
 		QCDeserializer:      &testQCDeserializer{t: t},
 		ReplicationEnabled:  replicationEnabled,
+		StartTime:           time.Now(),
 	}
 	return conf
 }
@@ -278,20 +280,20 @@ func (c *testComm) Broadcast(msg *Message) {
 }
 
 type inMemNetwork struct {
-	t         *testing.T
-	nodes     []NodeID
-	instances []*testNode
-	lock 	sync.Mutex
+	t            *testing.T
+	nodes        []NodeID
+	instances    []*testNode
+	lock         sync.Mutex
 	disconnected map[string]struct{}
 }
 
 // newInMemNetwork creates an in-memory network. Node IDs must be provided before
 // adding instances, as nodes require prior knowledge of all participants.
 func newInMemNetwork(t *testing.T, nodes []NodeID) *inMemNetwork {
 	net := &inMemNetwork{
-		t:         t,
-		nodes:     nodes,
-		instances: make([]*testNode, 0),
+		t:            t,
+		nodes:        nodes,
+		instances:    make([]*testNode, 0),
 		disconnected: make(map[string]struct{}),
 	}
 	return net
@@ -353,7 +355,7 @@ func newTestControlledBlockBuilder(t *testing.T) *testControlledBlockBuilder {
 	return &testControlledBlockBuilder{
 		t:                t,
 		control:          make(chan struct{}, 1),
-		testBlockBuilder: testBlockBuilder{out: make(chan *testBlock, 1)},
+		testBlockBuilder: testBlockBuilder{out: make(chan *testBlock, 1), blockShouldBeBuilt: make(chan struct{}, 1)},
 	}
 }
 
@@ -366,7 +368,6 @@ func (t *testControlledBlockBuilder) triggerNewBlock() {
 }
 
 func (t *testControlledBlockBuilder) BuildBlock(ctx context.Context, metadata ProtocolMetadata) (Block, bool) {
-	require.Equal(t.t, metadata.Seq, metadata.Round)
 	<-t.control
 	return t.testBlockBuilder.BuildBlock(ctx, metadata)
 }

epoch_test.go

@@ -734,6 +734,7 @@ func (t *testBlockBuilder) IncomingBlock(ctx context.Context) {
 	case <-t.blockShouldBeBuilt:
 	case <-ctx.Done():
 	}
+
 }
 
 type testBlock struct {

replication_test.go

@@ -9,6 +9,7 @@ import (
 	"simplex"
 	"simplex/testutil"
 	"simplex/wal"
+	"time"
 
 	"testing"
 
@@ -181,17 +182,22 @@ func TestReplicationAfterNodeDisconnects(t *testing.T) {
 	net := newInMemNetwork(t, nodes)
 	startDisconnect := uint64(5)
 	endDisconnect := uint64(18)
-
-	normalNode1 := newSimplexNode(t, nodes[0], net, bb, true)
-	normalNode2 := newSimplexNode(t, nodes[1], net, bb, true)
-	normalNode3 := newSimplexNode(t, nodes[2], net, bb, true)
-	laggingNode := newSimplexNode(t, nodes[3], net, bb, true)
+	normalNode1 := newSimplexNode(t, nodes[0], net, bb, false)
+	normalNode2 := newSimplexNode(t, nodes[1], net, bb, false)
+	normalNode3 := newSimplexNode(t, nodes[2], net, bb, false)
+	laggingNode := newSimplexNode(t, nodes[3], net, bb, false)
 
 	require.Equal(t, uint64(0), normalNode1.storage.Height())
 	require.Equal(t, uint64(0), normalNode2.storage.Height())
 	require.Equal(t, uint64(0), normalNode3.storage.Height())
 	require.Equal(t, uint64(0), laggingNode.storage.Height())
 
+	epochTimes := make([]time.Time, 0, 4)
+	for _, n := range net.instances {
+		epochTimes = append(epochTimes, n.e.StartTime)
+		n.start()
+	}
+
 	bb.triggerNewBlock()
 
 	net.startInstances()
@@ -212,13 +218,17 @@ func TestReplicationAfterNodeDisconnects(t *testing.T) {
 	// lagging node disconnects
 	net.Disconnect(nodes[3])
 
+	missedSeqs := uint64(0)
 	// normal nodes continue to make progress
 	for i := startDisconnect; i < endDisconnect; i++ {
-		if bytes.Equal(simplex.LeaderForRound(nodes, i), nodes[3]) {
-			// TODO: build empty block
-		}
-		for _, n := range net.instances[:3] {
-			n.storage.waitForBlockCommit(i)
+		emptyRound := bytes.Equal(simplex.LeaderForRound(nodes, i), nodes[3])
+		if emptyRound {
+			advanceWithoutLeader(t, net, bb, epochTimes)
+			missedSeqs++
+		} else {
+			for _, n := range net.instances[:3] {
+				n.storage.waitForBlockCommit(i - missedSeqs)
+			}
 		}
 		bb.triggerNewBlock()
 	}
@@ -239,6 +249,17 @@ func TestReplicationAfterNodeDisconnects(t *testing.T) {
 	require.Equal(t, endDisconnect+1, normalNode3.storage.Height())
 }
 
+func advanceWithoutLeader(t *testing.T, net *inMemNetwork, bb *testControlledBlockBuilder, epochTimes []time.Time) {
+	for range net.instances {
+		bb.blockShouldBeBuilt <- struct{}{}
+	}
+
+	for i, n := range net.instances[:3] {
+		// advance the round without a leader
+		waitForBlockProposerTimeout(t, n.e, epochTimes[i])
+	}
+}
+
 func createBlocks(t *testing.T, nodes []simplex.NodeID, bb simplex.BlockBuilder, seqCount uint64) []simplex.FinalizedBlock {
 	logger := testutil.MakeLogger(t, int(0))
 	ctx := context.Background()