fix: address review feedback on mixed benchmark test

- fail test on waitForMetricTarget timeout instead of silently continuing
- bump default NumSpammers from 2 to 4 to satisfy mixed workload minimum
- replace time.Sleep with metric polling for contract deployment readiness
- add panic guard to distributeSpammers for total < 4
- add table-driven unit tests for distributeSpammers

Author: chatton

test/e2e/benchmark/config.go

@@ -41,7 +41,7 @@ func newBenchConfig(serviceName string) benchConfig {
 		SlotDuration:    envOrDefault("BENCH_SLOT_DURATION", "250ms"),
 		GasLimit:        envOrDefault("BENCH_GAS_LIMIT", ""),
 		ScrapeInterval:  envOrDefault("BENCH_SCRAPE_INTERVAL", "1s"),
-		NumSpammers:     envInt("BENCH_NUM_SPAMMERS", 2),
+		NumSpammers:     envInt("BENCH_NUM_SPAMMERS", 4),
 		CountPerSpammer: envInt("BENCH_COUNT_PER_SPAMMER", 5000),
 		Throughput:      envInt("BENCH_THROUGHPUT", 200),
 		WarmupTxs:       envInt("BENCH_WARMUP_TXS", 200),

test/e2e/benchmark/distribute_spammers_test.go

@@ -0,0 +1,78 @@
+//go:build evm
+
+package benchmark
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestDistributeSpammers(t *testing.T) {
+	tests := []struct {
+		name     string
+		total    int
+		pcts     [4]int
+		expected [4]int
+	}{
+		{
+			name:     "minimum total equals types",
+			total:    4,
+			pcts:     [4]int{40, 30, 20, 10},
+			expected: [4]int{1, 1, 1, 1},
+		},
+		{
+			name:     "equal percentages",
+			total:    8,
+			pcts:     [4]int{25, 25, 25, 25},
+			expected: [4]int{2, 2, 2, 2},
+		},
+		{
+			name:     "default mix 8 spammers",
+			total:    8,
+			pcts:     [4]int{40, 30, 20, 10},
+			expected: [4]int{3, 2, 2, 1},
+		},
+		{
+			name:     "large total distributes proportionally",
+			total:    104,
+			pcts:     [4]int{40, 30, 20, 10},
+			expected: [4]int{41, 31, 21, 11},
+		},
+		{
+			name:     "sum of counts equals total",
+			total:    7,
+			pcts:     [4]int{40, 30, 20, 10},
+			expected: [4]int{2, 2, 2, 1},
+		},
+		{
+			name:     "5 spammers with uneven split",
+			total:    5,
+			pcts:     [4]int{40, 30, 20, 10},
+			expected: [4]int{2, 1, 1, 1},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := distributeSpammers(tt.total, tt.pcts)
+			require.Equal(t, tt.expected, result)
+
+			sum := result[0] + result[1] + result[2] + result[3]
+			require.Equal(t, tt.total, sum, "sum of distributed spammers must equal total")
+
+			for i, c := range result {
+				require.GreaterOrEqual(t, c, 1, "type %d must have at least 1 spammer", i)
+			}
+		})
+	}
+}
+
+func TestDistributeSpammersPanicsOnLowTotal(t *testing.T) {
+	require.Panics(t, func() {
+		distributeSpammers(3, [4]int{40, 30, 20, 10})
+	})
+	require.Panics(t, func() {
+		distributeSpammers(0, [4]int{25, 25, 25, 25})
+	})
+}

test/e2e/benchmark/helpers.go

@@ -471,11 +471,9 @@ func waitForMetricTarget(t testing.TB, name string, poll func() (float64, error)
 		}
 		select {
 		case <-ctx.Done():
-			t.Logf("metric %s: context cancelled (target %.0f)", name, target)
-			return
+			t.Fatalf("metric %s: context cancelled (target %.0f)", name, target)
 		case <-timer.C:
-			t.Logf("metric %s did not reach target %.0f within %v", name, target, timeout)
-			return
+			t.Fatalf("metric %s did not reach target %.0f within %v", name, target, timeout)
 		case <-ticker.C:
 		}
 	}

test/e2e/benchmark/mixed_workload_test.go

@@ -150,8 +150,6 @@ func (s *SpamoorSuite) TestMixedWorkload() {
 		}
 	}
 
-	// allow time for contract deployments (uniswap, gasburner, storage)
-	time.Sleep(5 * time.Second)
 	requireSpammersRunning(t, e.spamoorAPI, spammerIDs)
 
 	pollSentTotal := func() (float64, error) {
@@ -161,6 +159,9 @@ func (s *SpamoorSuite) TestMixedWorkload() {
 		}
 		return sumCounter(metrics["spamoor_transactions_sent_total"]), nil
 	}
+
+	// wait for at least one tx per spammer to confirm contract deployments are done
+	waitForMetricTarget(t, "spamoor_transactions_sent_total (deploy)", pollSentTotal, float64(len(spammerIDs)), cfg.WaitTimeout)
 	waitForMetricTarget(t, "spamoor_transactions_sent_total (warmup)", pollSentTotal, float64(cfg.WarmupTxs), cfg.WaitTimeout)
 
 	e.traces.resetStartTime()
@@ -209,12 +210,15 @@ func (s *SpamoorSuite) TestMixedWorkload() {
 // proportionally to pcts using the largest-remainder method. Each type
 // gets at least 1 spammer. total must be >= 4.
 func distributeSpammers(total int, pcts [4]int) [4]int {
+	if total < 4 {
+		panic(fmt.Sprintf("distributeSpammers: total must be >= 4, got %d", total))
+	}
 	var counts [4]int
 	for i := range counts {
 		counts[i] = 1
 	}
 	remaining := total - 4
-	if remaining <= 0 {
+	if remaining == 0 {
 		return counts
 	}