Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions testutil/controlled.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func (n *ControlledInMemoryNetwork) AdvanceWithoutLeader(round uint64, laggingNo

type ControlledNode struct {
*BasicNode
bb *testControlledBlockBuilder
bb *TestControlledBlockBuilder
WAL *TestWAL
Storage *InMemStorage
}
Expand Down Expand Up @@ -185,32 +185,32 @@ 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
}

// 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():
Expand Down
2 changes: 1 addition & 1 deletion testutil/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ type TestNodeConfig struct {
Comm common.Communication
SigAggregatorCreator common.SignatureAggregatorCreator
ReplicationEnabled bool
BlockBuilder *testControlledBlockBuilder
BlockBuilder *TestControlledBlockBuilder

// Long Running Tests
MaxRoundWindow uint64
Expand Down
Loading