refactor: modernize code (#1105)

- apply go fix modernizers from Go 1.26
- require go1.25 or later
- go1.26 is required to run sharness tests

Author: gammazero

.github/workflows/gateway-sharness.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.24.x
+          go-version: 1.26.x
       - name: Checkout boxo
         uses: actions/checkout@v3
         with:

bitswap/benchmarks_test.go

@@ -161,7 +161,7 @@ func BenchmarkFetchFromOldBitswap(b *testing.B) {
 				instances = append(instances, inst)
 			}
 			// Create old nodes (just seeds)
-			for i := 0; i < oldSeedCount; i++ {
+			for range oldSeedCount {
 				inst := oldNodeGenerator.Next()
 				instances = append(instances, inst)
 			}
@@ -631,7 +631,7 @@ func unixfsFileFetchLarge(b *testing.B, bs *bitswap.Bitswap, ks []cid.Cid) {
 func printResults(rs []runStats) {
 	nameOrder := make([]string, 0)
 	names := make(map[string]struct{})
-	for i := 0; i < len(rs); i++ {
+	for i := range rs {
 		if _, ok := names[rs[i].Name]; !ok {
 			nameOrder = append(nameOrder, rs[i].Name)
 			names[rs[i].Name] = struct{}{}
@@ -646,7 +646,7 @@ func printResults(rs []runStats) {
 		dups := 0.0
 		blks := 0.0
 		elpd := 0.0
-		for i := 0; i < len(rs); i++ {
+		for i := range rs {
 			if rs[i].Name == name {
 				count++
 				sent += float64(rs[i].MsgSent)

bitswap/bitswap_test.go

@@ -521,8 +521,7 @@ func TestDoubleGet(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	ctx2, cancel2 := context.WithCancel(context.Background())
-	defer cancel2()
+	ctx2 := t.Context()
 
 	blkch2, err := instances[1].Exchange.GetBlocks(ctx2, []cid.Cid{blocks[0].Cid()})
 	if err != nil {

bitswap/client/bitswap_with_sessions_test.go

@@ -48,8 +48,7 @@ func addBlock(t *testing.T, ctx context.Context, inst testinstance.Instance, blk
 }
 
 func TestBasicSessions(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
+	ctx := t.Context()
 
 	vnet := getVirtualNetwork()
 	router := mockrouting.NewServer()
@@ -133,8 +132,7 @@ func TestCustomProviderQueryManager(t *testing.T) {
 	}
 	defer pqm.Close()
 
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
+	ctx := t.Context()
 
 	bs := bitswap.New(ctx, a.Adapter, pqm, a.Blockstore,
 		bitswap.WithClientOption(client.WithDefaultProviderQueryManager(false)),
@@ -173,8 +171,7 @@ func TestCustomProviderQueryManager(t *testing.T) {
 }
 
 func TestSessionBetweenPeers(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
+	ctx := t.Context()
 
 	vnet := tn.VirtualNetwork(delay.Fixed(time.Millisecond))
 	router := mockrouting.NewServer()
@@ -212,7 +209,7 @@ func TestSessionBetweenPeers(t *testing.T) {
 	cids = cids[1:]
 
 	// Fetch blocks with the session, 10 at a time
-	for i := 0; i < 10; i++ {
+	for i := range 10 {
 		ch, err := ses.GetBlocks(ctx, cids[i*10:(i+1)*10])
 		if err != nil {
 			t.Fatal(err)
@@ -242,8 +239,7 @@ func TestSessionBetweenPeers(t *testing.T) {
 }
 
 func TestSessionSplitFetch(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
+	ctx := t.Context()
 
 	vnet := getVirtualNetwork()
 	router := mockrouting.NewServer()
@@ -254,7 +250,7 @@ func TestSessionSplitFetch(t *testing.T) {
 
 	// Add 10 distinct blocks to each of 10 peers
 	blks := random.BlocksOfSize(100, blockSize)
-	for i := 0; i < 10; i++ {
+	for i := range 10 {
 		if err := inst[i].Blockstore.PutMany(ctx, blks[i*10:(i+1)*10]); err != nil {
 			t.Fatal(err)
 		}
@@ -269,7 +265,7 @@ func TestSessionSplitFetch(t *testing.T) {
 	ses := inst[10].Exchange.NewSession(ctx).(*session.Session)
 	ses.SetBaseTickDelay(time.Millisecond * 10)
 
-	for i := 0; i < 10; i++ {
+	for i := range 10 {
 		ch, err := ses.GetBlocks(ctx, cids[i*10:(i+1)*10])
 		if err != nil {
 			t.Fatal(err)
@@ -371,7 +367,7 @@ func TestFetchAfterDisconnect(t *testing.T) {
 
 	// Should get first 5 blocks
 	var got []blocks.Block
-	for i := 0; i < 5; i++ {
+	for range 5 {
 		b := <-ch
 		got = append(got, b)
 	}
@@ -397,7 +393,7 @@ func TestFetchAfterDisconnect(t *testing.T) {
 	// Peer B should call FindProviders() and find Peer A
 
 	// Should get last 5 blocks
-	for i := 0; i < 5; i++ {
+	for range 5 {
 		select {
 		case b := <-ch:
 			got = append(got, b)
@@ -411,8 +407,7 @@ func TestFetchAfterDisconnect(t *testing.T) {
 }
 
 func TestInterestCacheOverflow(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
+	ctx := t.Context()
 
 	vnet := getVirtualNetwork()
 	router := mockrouting.NewServer()
@@ -461,8 +456,7 @@ func TestInterestCacheOverflow(t *testing.T) {
 }
 
 func TestPutAfterSessionCacheEvict(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
+	ctx := t.Context()
 
 	vnet := getVirtualNetwork()
 	router := mockrouting.NewServer()
@@ -499,8 +493,7 @@ func TestPutAfterSessionCacheEvict(t *testing.T) {
 }
 
 func TestMultipleSessions(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
+	ctx := t.Context()
 
 	vnet := getVirtualNetwork()
 	router := mockrouting.NewServer()
@@ -597,8 +590,7 @@ func TestDontHaveTimeoutConfig(t *testing.T) {
 	}
 	defer pqm.Close()
 
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
+	ctx := t.Context()
 
 	bs := bitswap.New(ctx, a.Adapter, pqm, a.Blockstore,
 		bitswap.WithClientOption(client.WithDontHaveTimeoutConfig(cfg)))

bitswap/client/internal/messagequeue/messagequeue_test.go

@@ -857,7 +857,7 @@ func BenchmarkMessageQueue(b *testing.B) {
 
 	// Create a handful of message queues to start with
 	var qs []*MessageQueue
-	for i := 0; i < 5; i++ {
+	for range 5 {
 		qs = append(qs, createQueue())
 	}
 

bitswap/client/internal/peermanager/peermanager_test.go

@@ -354,7 +354,7 @@ func BenchmarkPeerManager(b *testing.B) {
 
 	// Create a bunch of connections
 	connected := 0
-	for i := 0; i < len(peers); i++ {
+	for i := range peers {
 		peerManager.Connected(peers[i])
 		connected++
 	}

bitswap/client/internal/session/cidqueue.go

@@ -50,7 +50,7 @@ func (cq *cidQueue) len() int {
 func (cq *cidQueue) gc() {
 	if cq.elems.Len() > cq.eset.Len() {
 		n := cq.elems.Len()
-		for i := 0; i < n; i++ {
+		for range n {
 			c := cq.elems.PopFront()
 			if cq.eset.Has(c) {
 				cq.elems.PushBack(c)

bitswap/client/internal/session/peerresponsetracker_test.go

@@ -30,7 +30,7 @@ func TestPeerResponseTrackerProbabilityUnknownPeers(t *testing.T) {
 
 	choices := []int{0, 0, 0, 0}
 	count := 1000
-	for i := 0; i < count; i++ {
+	for range count {
 		p := prt.choose(peers)
 		if p == peers[0] {
 			choices[0]++
@@ -61,7 +61,7 @@ func TestPeerResponseTrackerProbabilityOneKnownOneUnknownPeer(t *testing.T) {
 
 	chooseFirst := 0
 	chooseSecond := 0
-	for i := 0; i < 1000; i++ {
+	for range 1000 {
 		p := prt.choose(peers)
 		if p == peers[0] {
 			chooseFirst++
@@ -95,7 +95,7 @@ func TestPeerResponseTrackerProbabilityProportional(t *testing.T) {
 		choices = append(choices, 0)
 	}
 
-	for i := 0; i < count; i++ {
+	for range count {
 		p := prt.choose(peers)
 		if p == peers[0] {
 			choices[0]++

bitswap/client/internal/session/sessionwants_test.go

@@ -125,7 +125,7 @@ func TestPrepareBroadcast(t *testing.T) {
 	sw.GetNextWants()
 
 	// Broadcast should contain wants in order
-	for i := 0; i < 10; i++ {
+	for range 10 {
 		ws := sw.PrepareBroadcast()
 		if len(ws) != 3 {
 			t.Fatal("should broadcast all live wants")
@@ -155,7 +155,7 @@ func TestPrepareBroadcast(t *testing.T) {
 
 	// Broadcast should contain wants in order
 	cids = cids[1:]
-	for i := 0; i < 10; i++ {
+	for range 10 {
 		ws := sw.PrepareBroadcast()
 		if len(ws) != 3 {
 			t.Fatal("should broadcast live wants up to limit", len(ws), len(cids))

bitswap/client/internal/session/sessionwantsender_test.go

@@ -1,6 +1,7 @@
 package session
 
 import (
+	"maps"
 	"sync"
 	"testing"
 	"time"
@@ -102,9 +103,7 @@ func (pm *mockPeerManager) waitNextWants() map[peer.ID]*sentWants {
 	defer pm.lk.Unlock()
 
 	nw := make(map[peer.ID]*sentWants, len(pm.peerSends))
-	for p, sentWants := range pm.peerSends {
-		nw[p] = sentWants
-	}
+	maps.Copy(nw, pm.peerSends)
 	return nw
 }