WIP

Author: infrmtcs

.github/workflows/juno-test.yml

@@ -18,6 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, ubuntu-arm64-4-core]
+        iteration: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
     runs-on: ${{ matrix.os }}
     env:
       VM_DEBUG: true

consensus/integtest/integ_test.go

@@ -2,15 +2,18 @@ package integtest
 
 import (
 	"fmt"
+	goitre "iter"
 	"maps"
 	"slices"
 	gosync "sync"
 	"testing"
+	"time"
 
 	"github.com/NethermindEth/juno/blockchain"
 	"github.com/NethermindEth/juno/consensus"
 	"github.com/NethermindEth/juno/consensus/driver"
 	"github.com/NethermindEth/juno/consensus/starknet"
+	"github.com/NethermindEth/juno/consensus/types"
 	"github.com/NethermindEth/juno/core"
 	"github.com/NethermindEth/juno/core/felt"
 	"github.com/NethermindEth/juno/db/memory"
@@ -28,8 +31,8 @@ import (
 
 const (
 	commitBufferSize = 1024
-	maxLag           = 10
 	hostAddress      = "/ip4/0.0.0.0/tcp/0"
+	maxRoundWait     = types.Round(5)
 )
 
 var (
@@ -169,6 +172,26 @@ func writeBlock(
 	}
 }
 
+func commitStream(t *testing.T, nodeCount int, commits chan commit) goitre.Seq[commit] {
+	timeoutFn := consensus.MockTimeoutFn(nodeCount)
+	var maxCommitWait time.Duration
+	for round := range maxRoundWait {
+		maxCommitWait += timeoutFn(types.StepPropose, round) + timeoutFn(types.StepPrevote, round) + timeoutFn(types.StepPrecommit, round)
+	}
+	return func(yield func(commit) bool) {
+		for {
+			select {
+			case commit := <-commits:
+				if !yield(commit) {
+					return
+				}
+			case <-time.After(maxCommitWait):
+				require.FailNow(t, "timed out waiting for commit")
+			}
+		}
+	}
+}
+
 func assertCommits(t *testing.T, commits chan commit, cfg testConfig, logger *utils.ZapLogger) {
 	t.Helper()
 
@@ -182,22 +205,23 @@ func assertCommits(t *testing.T, commits chan commit, cfg testConfig, logger *ut
 	commitCount := make(map[uint64]int)
 
 	nextHeight := uint64(1)
-	for commit := range commits {
+	for commit := range commitStream(t, cfg.nodeCount, commits) {
 		blockNumber := commit.committedBlock.Block.Number
 		blockHash := commit.committedBlock.Block.Hash
-		// Ignore commits after the target height
-		if blockNumber > cfg.targetHeight {
-			continue
-		}
 
 		require.Falsef(
 			t,
-			blockNumber > nextHeight+maxLag,
+			blockNumber > nextHeight+cfg.targetHeight,
 			"finished height %d is too far behind committed height %d",
 			nextHeight,
 			blockNumber,
 		)
 
+		// Ignore commits after the target height
+		if blockNumber > cfg.targetHeight {
+			continue
+		}
+
 		// Ignore faulty nodes
 		if commit.nodeIndex >= honestNodeCount {
 			continue
@@ -218,12 +242,12 @@ func assertCommits(t *testing.T, commits chan commit, cfg testConfig, logger *ut
 		commitCount[blockNumber]++
 
 		// If all honest nodes committed at this height, increment the finished counter
-		for commitCount[nextHeight] == honestNodeCount && nextHeight < cfg.targetHeight {
+		for commitCount[nextHeight] == honestNodeCount && nextHeight <= cfg.targetHeight {
 			logger.Infow("all honest nodes committed", "height", nextHeight)
 			nextHeight++
 		}
 
-		if nextHeight == cfg.targetHeight {
+		if nextHeight > cfg.targetHeight {
 			break
 		}
 	}

consensus/mock.go

@@ -31,7 +31,7 @@ func InitMockServices(hiSeed, loSeed uint64, nodeIndex, nodeCount int) MockServi
 		PrivateKey:  mockKey(nodeIndex),
 		NodeAddress: mockNodeAddress(nodeIndex),
 		Validators:  newMockValidators(hiSeed, loSeed, nodeCount),
-		TimeoutFn:   mockTimeoutFn(nodeCount),
+		TimeoutFn:   MockTimeoutFn(nodeCount),
 	}
 }
 
@@ -61,7 +61,7 @@ func mockNodeAddress(i int) starknet.Address {
 	return starknet.Address(felt.FromUint64(uint64(i)))
 }
 
-func mockTimeoutFn(nodeCount int) func(types.Step, types.Round) time.Duration {
+func MockTimeoutFn(nodeCount int) func(types.Step, types.Round) time.Duration {
 	return func(step types.Step, round types.Round) time.Duration {
 		// Total number of messages are N^2, so the load is roughly proportional to O(N^2)
 		// Every round increases the timeout by timeoutRoundFactor. It also guarantees that the timeout will be at least timeoutRoundFactor