refactor: apply go fix modernizers from Go 1.26 (#3463)

Co-authored-by: sukun <sukunrt@gmail.com>

Author: gammazero

.golangci.yml

@@ -6,6 +6,10 @@ run:
 issues:
   max-issues-per-linter: 0
   max-same-issues: 0
+  exclude-rules:
+    - path: _test\.go
+      linters:
+        - prealloc
 
 linters:
   enable:

config/config.go

@@ -74,7 +74,7 @@ type AutoNATConfig struct {
 
 type Security struct {
 	ID          protocol.ID
-	Constructor interface{}
+	Constructor any
 }
 
 // Config describes a set of settings for a libp2p node

core/discovery/options.go

@@ -11,7 +11,7 @@ type Options struct {
 	Limit int
 
 	// Other (implementation-specific) options
-	Other map[interface{}]interface{}
+	Other map[any]any
 }
 
 // Apply applies the given options to this DiscoveryOpts

core/event/bus.go

@@ -6,17 +6,17 @@ import (
 )
 
 // SubscriptionOpt represents a subscriber option. Use the options exposed by the implementation of choice.
-type SubscriptionOpt = func(interface{}) error
+type SubscriptionOpt = func(any) error
 
 // EmitterOpt represents an emitter option. Use the options exposed by the implementation of choice.
-type EmitterOpt = func(interface{}) error
+type EmitterOpt = func(any) error
 
 // CancelFunc closes a subscriber.
 type CancelFunc = func()
 
 // wildcardSubscriptionType is a virtual type to represent wildcard
 // subscriptions.
-type wildcardSubscriptionType interface{}
+type wildcardSubscriptionType any
 
 // WildcardSubscription is the type to subscribe to receive all events
 // emitted in the eventbus.
@@ -30,15 +30,15 @@ type Emitter interface {
 	// calls to Emit will block.
 	//
 	// Calling this function with wrong event type will cause a panic.
-	Emit(evt interface{}) error
+	Emit(evt any) error
 }
 
 // Subscription represents a subscription to one or multiple event types.
 type Subscription interface {
 	io.Closer
 
 	// Out returns the channel from which to consume events.
-	Out() <-chan interface{}
+	Out() <-chan any
 
 	// Name returns the name for the subscription
 	Name() string
@@ -79,7 +79,7 @@ type Bus interface {
 	//        [...]
 	//    }
 	//  }
-	Subscribe(eventType interface{}, opts ...SubscriptionOpt) (Subscription, error)
+	Subscribe(eventType any, opts ...SubscriptionOpt) (Subscription, error)
 
 	// Emitter creates a new event emitter.
 	//
@@ -89,7 +89,7 @@ type Bus interface {
 	//  em, err := eventbus.Emitter(new(EventT))
 	//  defer em.Close() // MUST call this after being done with the emitter
 	//  em.Emit(EventT{})
-	Emitter(eventType interface{}, opts ...EmitterOpt) (Emitter, error)
+	Emitter(eventType any, opts ...EmitterOpt) (Emitter, error)
 
 	// GetAllEventTypes returns all the event types that this bus knows about
 	// (having emitters and subscribers). It omits the WildcardSubscription.

core/internal/catch/catch.go

@@ -10,7 +10,7 @@ import (
 var panicWriter io.Writer = os.Stderr
 
 // HandlePanic handles and logs panics.
-func HandlePanic(rerr interface{}, err *error, where string) {
+func HandlePanic(rerr any, err *error, where string) {
 	if rerr != nil {
 		fmt.Fprintf(panicWriter, "caught panic: %s\n%s\n", rerr, debug.Stack())
 		*err = fmt.Errorf("panic in %s: %s", where, rerr)

core/metrics/bandwidth_test.go

@@ -35,15 +35,15 @@ func round(bwc *BandwidthCounter, b *testing.B) {
 	start := make(chan struct{})
 	var wg sync.WaitGroup
 	wg.Add(10000)
-	for i := 0; i < 1000; i++ {
+	for i := range 1000 {
 		p := peer.ID(fmt.Sprintf("peer-%d", i))
-		for j := 0; j < 10; j++ {
+		for j := range 10 {
 			proto := protocol.ID(fmt.Sprintf("bitswap-%d", j))
 			go func() {
 				defer wg.Done()
 				<-start
 
-				for i := 0; i < 1000; i++ {
+				for range 1000 {
 					bwc.LogSentMessage(100)
 					bwc.LogSentMessageStream(100, proto, p)
 					time.Sleep(1 * time.Millisecond)
@@ -60,10 +60,10 @@ func round(bwc *BandwidthCounter, b *testing.B) {
 
 func TestBandwidthCounter(t *testing.T) {
 	bwc := NewBandwidthCounter()
-	for i := 0; i < 40; i++ {
-		for i := 0; i < 100; i++ {
+	for range 40 {
+		for i := range 100 {
 			p := peer.ID(fmt.Sprintf("peer-%d", i))
-			for j := 0; j < 2; j++ {
+			for j := range 2 {
 				proto := protocol.ID(fmt.Sprintf("proto-%d", j))
 
 				// make sure the bandwidth counters are active
@@ -81,7 +81,7 @@ func TestBandwidthCounter(t *testing.T) {
 	assertProtocols := func(check func(Stats)) {
 		byProtocol := bwc.GetBandwidthByProtocol()
 		require.Len(t, byProtocol, 2, "expected 2 protocols")
-		for i := 0; i < 2; i++ {
+		for i := range 2 {
 			p := protocol.ID(fmt.Sprintf("proto-%d", i))
 			for _, stats := range [...]Stats{bwc.GetBandwidthForProtocol(p), byProtocol[p]} {
 				check(stats)
@@ -92,7 +92,7 @@ func TestBandwidthCounter(t *testing.T) {
 	assertPeers := func(check func(Stats)) {
 		byPeer := bwc.GetBandwidthByPeer()
 		require.Len(t, byPeer, 100, "expected 100 peers")
-		for i := 0; i < 100; i++ {
+		for i := range 100 {
 			p := peer.ID(fmt.Sprintf("peer-%d", i))
 			for _, stats := range [...]Stats{bwc.GetBandwidthForPeer(p), byPeer[p]} {
 				check(stats)

core/network/network.go

@@ -123,7 +123,7 @@ type Stats struct {
 	// relay.
 	Limited bool
 	// Extra stores additional metadata about this connection.
-	Extra map[interface{}]interface{}
+	Extra map[any]any
 }
 
 // StreamHandler is the type of function used to listen for

core/peer/addrinfo.go

@@ -118,8 +118,8 @@ func AddrInfoToP2pAddrs(pi *AddrInfo) ([]ma.Multiaddr, error) {
 	return addrs, nil
 }
 
-func (pi *AddrInfo) Loggable() map[string]interface{} {
-	return map[string]interface{}{
+func (pi *AddrInfo) Loggable() map[string]any {
+	return map[string]any{
 		"peerID": pi.ID.String(),
 		"addrs":  pi.Addrs,
 	}

core/peer/peer.go

@@ -42,8 +42,8 @@ const maxInlineKeyLength = 42
 type ID string
 
 // Loggable returns a pretty peer ID string in loggable JSON format.
-func (id ID) Loggable() map[string]interface{} {
-	return map[string]interface{}{
+func (id ID) Loggable() map[string]any {
+	return map[string]any{
 		"peerID": id.String(),
 	}
 }

core/peer/record_test.go

@@ -57,7 +57,7 @@ func TestSignedPeerRecordFromEnvelope(t *testing.T) {
 // low clock precision. This makes sure we never get a duplicate.
 func TestTimestampSeq(t *testing.T) {
 	var last uint64
-	for i := 0; i < 1000; i++ {
+	for range 1000 {
 		next := TimestampSeq()
 		if next <= last {
 			t.Errorf("non-increasing timestamp found: %d <= %d", next, last)