Skip to content

Simplify gossip tests #4547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StephenButtolph merged 8 commits into from
Nov 25, 2025
+171 −266
Merged

Simplify gossip tests #4547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
681ecae
Remove unused NoOpGossiper
StephenButtolph Nov 25, 2025
8caaeb3
Unexport TestGossiper as gossipFunc and move it to tests
StephenButtolph Nov 25, 2025
9ff90ab
Unexport FullSet as fullSet and move it to tests
StephenButtolph Nov 25, 2025
a3ad4b3
Rename testMarshaller as marshaller and move it to tests
StephenButtolph Nov 25, 2025
dd76bab
Rename testTx as tx, move it to tests, and simplify the usage
StephenButtolph Nov 25, 2025
15b0a1f
Remove unused Gossip from fullSet
StephenButtolph Nov 25, 2025
678d806
Rename receiver
StephenButtolph Nov 25, 2025
cb88dd5
fix tests
StephenButtolph Nov 25, 2025
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
50 changes: 24 additions & 26 deletions network/p2p/gossip/bloom_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import (
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/testutil"
"github.com/stretchr/testify/require"

"github.com/ava-labs/avalanchego/ids"
)

func TestBloomFilterRefresh(t *testing.T) {
Expand All @@ -21,24 +19,24 @@ func TestBloomFilterRefresh(t *testing.T) {
targetFalsePositiveProbability float64
resetFalsePositiveProbability float64
resetCount uint64
add []*testTx
expected []*testTx
add []tx
expected []tx
}{
{
name: "no refresh",
minTargetElements: 1,
targetFalsePositiveProbability: 0.01,
resetFalsePositiveProbability: 1,
resetCount: 0, // maxCount = 9223372036854775807
add: []*testTx{
{id: ids.ID{0}},
{id: ids.ID{1}},
{id: ids.ID{2}},
add: []tx{
{0},
{1},
{2},
},
expected: []*testTx{
{id: ids.ID{0}},
{id: ids.ID{1}},
{id: ids.ID{2}},
expected: []tx{
{0},
{1},
{2},
},
},
{
Expand All @@ -47,13 +45,13 @@ func TestBloomFilterRefresh(t *testing.T) {
targetFalsePositiveProbability: 0.01,
resetFalsePositiveProbability: 0.0000000000000001, // maxCount = 1
resetCount: 1,
add: []*testTx{
{id: ids.ID{0}},
{id: ids.ID{1}},
{id: ids.ID{2}},
add: []tx{
{0},
{1},
{2},
},
expected: []*testTx{
{id: ids.ID{2}},
expected: []tx{
{2},
},
},
{
Expand All @@ -62,15 +60,15 @@ func TestBloomFilterRefresh(t *testing.T) {
targetFalsePositiveProbability: 0.01,
resetFalsePositiveProbability: 0.0000000000000001, // maxCount = 1
resetCount: 2,
add: []*testTx{
{id: ids.ID{0}},
{id: ids.ID{1}},
{id: ids.ID{2}},
{id: ids.ID{3}},
{id: ids.ID{4}},
add: []tx{
{0},
{1},
{2},
{3},
{4},
},
expected: []*testTx{
{id: ids.ID{4}},
expected: []tx{
{4},
},
},
}
Expand Down
40 changes: 1 addition & 39 deletions network/p2p/gossip/gossip.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/network/p2p"
"github.com/ava-labs/avalanchego/snow/engine/common"
"github.com/ava-labs/avalanchego/utils/bloom"
"github.com/ava-labs/avalanchego/utils/buffer"
"github.com/ava-labs/avalanchego/utils/logging"
"github.com/ava-labs/avalanchego/utils/set"
Expand All @@ -40,10 +39,7 @@ const (

var (
_ Gossiper = (*ValidatorGossiper)(nil)
_ Gossiper = (*PullGossiper[*testTx])(nil)
_ Gossiper = (*NoOpGossiper)(nil)

_ Set[*testTx] = (*FullSet[*testTx])(nil)
_ Gossiper = (*PullGossiper[Gossipable])(nil)

ioTypeLabels = []string{ioLabel, typeLabel}
sentPushLabels = prometheus.Labels{
Expand Down Expand Up @@ -597,37 +593,3 @@ func Every(ctx context.Context, log logging.Logger, gossiper Gossiper, frequency
}
}
}

type NoOpGossiper struct{}

func (NoOpGossiper) Gossip(context.Context) error {
return nil
}

type TestGossiper struct {
GossipF func(ctx context.Context) error
}

func (t *TestGossiper) Gossip(ctx context.Context) error {
return t.GossipF(ctx)
}

type FullSet[T Gossipable] struct{}

func (FullSet[_]) Gossip(context.Context) error {
return nil
}

func (FullSet[T]) Add(T) error {
return nil
}

func (FullSet[T]) Has(ids.ID) bool {
return true
}

func (FullSet[T]) Iterate(func(gossipable T) bool) {}

func (FullSet[_]) GetFilter() ([]byte, []byte) {
return bloom.FullFilter.Marshal(), ids.Empty[:]
}
Loading