From 5e07ac92b4f424bc90ba57a578833e0bb411e4ee Mon Sep 17 00:00:00 2001 From: Black Swan <3999712+blacks1ne@users.noreply.github.com> Date: Fri, 7 Nov 2025 07:13:39 +0200 Subject: [PATCH] Trivial code cleanup aiming to reduce Go compiler warnings (#451) * simplify range traversal * simplify channel read for single select case * delete rand.Seed() deprecated in Go 1.20 and no-op as of Go 1.24 * simplify range traversal * simplify channel read for single select case * remove redundant type from array * simplify range traversal * simplify channel read for single select case --- go-libp2p-blossomsub/backoff.go | 1 - go-libp2p-blossomsub/blossomsub_test.go | 31 ++++++++----------- .../subscription_filter_test.go | 16 +++++----- 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/go-libp2p-blossomsub/backoff.go b/go-libp2p-blossomsub/backoff.go index 1b32a24..87e8cb7 100644 --- a/go-libp2p-blossomsub/backoff.go +++ b/go-libp2p-blossomsub/backoff.go @@ -43,7 +43,6 @@ func newBackoff(ctx context.Context, sizeThreshold int, cleanupInterval time.Dur info: make(map[peer.ID]*backoffHistory), } - rand.Seed(time.Now().UnixNano()) // used for jitter go b.cleanupLoop(ctx) return b diff --git a/go-libp2p-blossomsub/blossomsub_test.go b/go-libp2p-blossomsub/blossomsub_test.go index 35c3c3a..e9e2865 100644 --- a/go-libp2p-blossomsub/blossomsub_test.go +++ b/go-libp2p-blossomsub/blossomsub_test.go @@ -3469,12 +3469,10 @@ func TestBloomRouting(t *testing.T) { } go func() { - for _ = range sub { - select { - case err := <-errch: - if err != nil { - errs = append(errs, err) - } + for range sub { + err := <-errch + if err != nil { + errs = append(errs, err) } } g.Done() @@ -3573,13 +3571,12 @@ func TestBloomPropagationOverSubTreeTopology(t *testing.T) { var msg *struct{} = nil go func() { - for i := 0; i < len(subs); i++ { - select { - case m := <-msgch: - msg = &m - cancel() - } + for range subs { + m := <-msgch + msg = &m + cancel() } + }() g.Wait() if msg == nil { @@ -3796,12 +3793,10 @@ func assertReceivedBitmaskSubgroup(t *testing.T, ctx context.Context, subs [][]* var msg *struct{} = nil go func() { - for i := 0; i < len(subs); i++ { - select { - case m := <-msgch: - msg = &m - cancel() - } + for range subs { + m := <-msgch + msg = &m + cancel() } }() g.Wait() diff --git a/go-libp2p-blossomsub/subscription_filter_test.go b/go-libp2p-blossomsub/subscription_filter_test.go index 6b139b7..5829af3 100644 --- a/go-libp2p-blossomsub/subscription_filter_test.go +++ b/go-libp2p-blossomsub/subscription_filter_test.go @@ -32,15 +32,15 @@ func TestBasicSubscriptionFilter(t *testing.T) { bitmask3 := []byte{0x00, 0x00, 0x02, 0x00} yes := true subs := []*pb.RPC_SubOpts{ - &pb.RPC_SubOpts{ + { Bitmask: bitmask1, Subscribe: yes, }, - &pb.RPC_SubOpts{ + { Bitmask: bitmask2, Subscribe: yes, }, - &pb.RPC_SubOpts{ + { Bitmask: bitmask3, Subscribe: yes, }, @@ -88,24 +88,24 @@ func TestSubscriptionFilterDeduplication(t *testing.T) { yes := true no := false subs := []*pb.RPC_SubOpts{ - &pb.RPC_SubOpts{ + { Bitmask: bitmask1, Subscribe: yes, }, - &pb.RPC_SubOpts{ + { Bitmask: bitmask1, Subscribe: yes, }, - &pb.RPC_SubOpts{ + { Bitmask: bitmask2, Subscribe: yes, }, - &pb.RPC_SubOpts{ + { Bitmask: bitmask2, Subscribe: no, }, - &pb.RPC_SubOpts{ + { Bitmask: bitmask3, Subscribe: yes, },