From 59b601ffbf1cee8a2368707172ee9eaf7fc2ff67 Mon Sep 17 00:00:00 2001 From: samliok Date: Thu, 13 Aug 2026 19:09:18 -0400 Subject: [PATCH] Export TestControlledBlockBuilder from testutil --- testutil/controlled.go | 14 +++++++------- testutil/node.go | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testutil/controlled.go b/testutil/controlled.go index 0dc76182..56d5b5d9 100644 --- a/testutil/controlled.go +++ b/testutil/controlled.go @@ -91,7 +91,7 @@ func (n *ControlledInMemoryNetwork) AdvanceWithoutLeader(round uint64, laggingNo type ControlledNode struct { *BasicNode - bb *testControlledBlockBuilder + bb *TestControlledBlockBuilder WAL *TestWAL Storage *InMemStorage } @@ -185,9 +185,9 @@ func (t *ControlledNode) TickUntilRoundAdvanced(round uint64, tick time.Duration } } -// testControlledBlockBuilder is a BlockBuilder that only builds a block when +// TestControlledBlockBuilder is a BlockBuilder that only builds a block when // a control signal is received. -type testControlledBlockBuilder struct { +type TestControlledBlockBuilder struct { t *testing.T control chan struct{} TestBlockBuilder @@ -195,22 +195,22 @@ type testControlledBlockBuilder struct { // NewTestControlledBlockBuilder returns a BlockBuilder that only builds a block // when triggerNewBlock is called. -func NewTestControlledBlockBuilder(t *testing.T) *testControlledBlockBuilder { - return &testControlledBlockBuilder{ +func NewTestControlledBlockBuilder(t *testing.T) *TestControlledBlockBuilder { + return &TestControlledBlockBuilder{ t: t, control: make(chan struct{}, 1), TestBlockBuilder: *NewTestBlockBuilder(), } } -func (t *testControlledBlockBuilder) TriggerNewBlock() { +func (t *TestControlledBlockBuilder) TriggerNewBlock() { select { case t.control <- struct{}{}: default: } } -func (t *testControlledBlockBuilder) BuildBlock(ctx context.Context, metadata common.ProtocolMetadata, blacklist common.Blacklist) (common.VerifiedBlock, bool) { +func (t *TestControlledBlockBuilder) BuildBlock(ctx context.Context, metadata common.ProtocolMetadata, blacklist common.Blacklist) (common.VerifiedBlock, bool) { select { case <-t.control: case <-ctx.Done(): diff --git a/testutil/node.go b/testutil/node.go index f5951bb7..fa5f8fdb 100644 --- a/testutil/node.go +++ b/testutil/node.go @@ -242,7 +242,7 @@ type TestNodeConfig struct { Comm common.Communication SigAggregatorCreator common.SignatureAggregatorCreator ReplicationEnabled bool - BlockBuilder *testControlledBlockBuilder + BlockBuilder *TestControlledBlockBuilder // Long Running Tests MaxRoundWindow uint64