Skip to content

Commit 26cbf73

Browse files
JorropoJorropo
committed
all: run perfsprint
1 parent ba5ba1a commit 26cbf73

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+161
-142
lines changed

‎bitswap/bitswap_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package bitswap_test
33
import (
44
"bytes"
55
"context"
6+
"errors"
67
"fmt"
78
"os"
89
"sync"
@@ -432,10 +433,10 @@ func TestBasicBitswap(t *testing.T) {
432433
// peer should no longer keep second peer's want
433434
if err = tu.WaitFor(ctx, func() error {
434435
if len(instances[2].Exchange.WantlistForPeer(instances[1].Peer)) != 0 {
435-
return fmt.Errorf("should have no items in other peers wantlist")
436+
return errors.New("should have no items in other peers wantlist")
436437
}
437438
if len(instances[1].Exchange.GetWantlist()) != 0 {
438-
return fmt.Errorf("shouldnt have anything in wantlist")
439+
return errors.New("shouldnt have anything in wantlist")
439440
}
440441
return nil
441442
}); err != nil {

‎bitswap/client/bitswap_with_sessions_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package client_test
22

33
import (
44
"context"
5+
"errors"
56
"fmt"
67
"testing"
78
"time"
@@ -489,7 +490,7 @@ func TestWantlistClearsOnCancel(t *testing.T) {
489490

490491
if err := tu.WaitFor(ctx, func() error {
491492
if len(a.Exchange.GetWantlist()) > 0 {
492-
return fmt.Errorf("expected empty wantlist")
493+
return errors.New("expected empty wantlist")
493494
}
494495
return nil
495496
}); err != nil {

‎bitswap/client/internal/messagequeue/donthavetimeoutmgr_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package messagequeue
22

33
import (
44
"context"
5-
"fmt"
5+
"errors"
66
"sync"
77
"testing"
88
"time"
@@ -342,7 +342,7 @@ func TestDontHaveTimeoutMgrUsesDefaultTimeoutIfPingError(t *testing.T) {
342342
tr := timeoutRecorder{}
343343
clock := clock.NewMock()
344344
pinged := make(chan struct{})
345-
pc := &mockPeerConn{latency: latency, clock: clock, pinged: pinged, err: fmt.Errorf("ping error")}
345+
pc := &mockPeerConn{latency: latency, clock: clock, pinged: pinged, err: errors.New("ping error")}
346346
timeoutsTriggered := make(chan struct{})
347347

348348
dhtm := newDontHaveTimeoutMgrWithParams(pc, tr.onTimeout,

‎bitswap/client/internal/messagequeue/messagequeue_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package messagequeue
22

33
import (
44
"context"
5-
"fmt"
5+
"errors"
66
"math"
77
"math/rand"
88
"sync"
@@ -40,7 +40,7 @@ func (fmn *fakeMessageNetwork) NewMessageSender(context.Context, peer.ID, *bsnet
4040
func (fms *fakeMessageNetwork) Self() peer.ID { return "" }
4141
func (fms *fakeMessageNetwork) Latency(peer.ID) time.Duration { return 0 }
4242
func (fms *fakeMessageNetwork) Ping(context.Context, peer.ID) ping.Result {
43-
return ping.Result{Error: fmt.Errorf("ping error")}
43+
return ping.Result{Error: errors.New("ping error")}
4444
}
4545

4646
type fakeDontHaveTimeoutMgr struct {

‎bitswap/client/internal/providerquerymanager/providerquerymanager.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ func (rpm *receivedProviderMessage) handle(pqm *ProviderQueryManager) {
355355
}
356356

357357
func (fpqm *finishedProviderQueryMessage) debugMessage() string {
358-
return fmt.Sprintf("Finished Provider Query on cid: %s", fpqm.k.String())
358+
return "Finished Provider Query on cid: " + fpqm.k.String()
359359
}
360360

361361
func (fpqm *finishedProviderQueryMessage) handle(pqm *ProviderQueryManager) {
@@ -372,7 +372,7 @@ func (fpqm *finishedProviderQueryMessage) handle(pqm *ProviderQueryManager) {
372372
}
373373

374374
func (npqm *newProvideQueryMessage) debugMessage() string {
375-
return fmt.Sprintf("New Provider Query on cid: %s", npqm.k.String())
375+
return "New Provider Query on cid: " + npqm.k.String()
376376
}
377377

378378
func (npqm *newProvideQueryMessage) handle(pqm *ProviderQueryManager) {
@@ -407,7 +407,7 @@ func (npqm *newProvideQueryMessage) handle(pqm *ProviderQueryManager) {
407407
}
408408

409409
func (crm *cancelRequestMessage) debugMessage() string {
410-
return fmt.Sprintf("Cancel provider query on cid: %s", crm.k.String())
410+
return "Cancel provider query on cid: " + crm.k.String()
411411
}
412412

413413
func (crm *cancelRequestMessage) handle(pqm *ProviderQueryManager) {

‎bitswap/client/internal/sessionmanager/sessionmanager_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package sessionmanager
22

33
import (
44
"context"
5-
"fmt"
5+
"strconv"
66
"sync"
77
"testing"
88
"time"
@@ -122,7 +122,7 @@ func TestReceiveFrom(t *testing.T) {
122122
pm := &fakePeerManager{}
123123
sm := New(ctx, sessionFactory, sim, peerManagerFactory, bpm, pm, notif, "")
124124

125-
p := peer.ID(fmt.Sprint(123))
125+
p := peer.ID(strconv.Itoa(123))
126126
block := blocks.NewBlock([]byte("block"))
127127

128128
firstSession := sm.NewSession(ctx, time.Second, delay.Fixed(time.Minute)).(*fakeSession)
@@ -169,7 +169,7 @@ func TestReceiveBlocksWhenManagerShutdown(t *testing.T) {
169169
pm := &fakePeerManager{}
170170
sm := New(ctx, sessionFactory, sim, peerManagerFactory, bpm, pm, notif, "")
171171

172-
p := peer.ID(fmt.Sprint(123))
172+
p := peer.ID(strconv.Itoa(123))
173173
block := blocks.NewBlock([]byte("block"))
174174

175175
firstSession := sm.NewSession(ctx, time.Second, delay.Fixed(time.Minute)).(*fakeSession)
@@ -203,7 +203,7 @@ func TestReceiveBlocksWhenSessionContextCancelled(t *testing.T) {
203203
pm := &fakePeerManager{}
204204
sm := New(ctx, sessionFactory, sim, peerManagerFactory, bpm, pm, notif, "")
205205

206-
p := peer.ID(fmt.Sprint(123))
206+
p := peer.ID(strconv.Itoa(123))
207207
block := blocks.NewBlock([]byte("block"))
208208

209209
firstSession := sm.NewSession(ctx, time.Second, delay.Fixed(time.Minute)).(*fakeSession)
@@ -239,7 +239,7 @@ func TestShutdown(t *testing.T) {
239239
pm := &fakePeerManager{}
240240
sm := New(ctx, sessionFactory, sim, peerManagerFactory, bpm, pm, notif, "")
241241

242-
p := peer.ID(fmt.Sprint(123))
242+
p := peer.ID(strconv.Itoa(123))
243243
block := blocks.NewBlock([]byte("block"))
244244
cids := []cid.Cid{block.Cid()}
245245
firstSession := sm.NewSession(ctx, time.Second, delay.Fixed(time.Minute)).(*fakeSession)

‎bitswap/client/internal/tracing.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ package internal
22

33
import (
44
"context"
5-
"fmt"
65

76
"go.opentelemetry.io/otel"
87
"go.opentelemetry.io/otel/trace"
98
)
109

1110
func StartSpan(ctx context.Context, name string, opts ...trace.SpanStartOption) (context.Context, trace.Span) {
12-
return otel.Tracer("go-bitswap").Start(ctx, fmt.Sprintf("Bitswap.%s", name), opts...)
11+
return otel.Tracer("go-bitswap").Start(ctx, "Bitswap."+name, opts...)
1312
}

‎bitswap/internal/testutil/testutil.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package testutil
22

33
import (
44
"crypto/rand"
5-
"fmt"
5+
"strconv"
66

77
"github.com/ipfs/boxo/bitswap/client/wantlist"
88
bsmsg "github.com/ipfs/boxo/bitswap/message"
@@ -62,7 +62,7 @@ func GeneratePeers(n int) []peer.ID {
6262
peerIds := make([]peer.ID, 0, n)
6363
for i := 0; i < n; i++ {
6464
peerSeq++
65-
p := peer.ID(fmt.Sprint(peerSeq))
65+
p := peer.ID(strconv.Itoa(peerSeq))
6666
peerIds = append(peerIds, p)
6767
}
6868
return peerIds

‎bitswap/internal/tracing.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ package internal
22

33
import (
44
"context"
5-
"fmt"
65

76
"go.opentelemetry.io/otel"
87
"go.opentelemetry.io/otel/trace"
98
)
109

1110
func StartSpan(ctx context.Context, name string, opts ...trace.SpanStartOption) (context.Context, trace.Span) {
12-
return otel.Tracer("go-bitswap").Start(ctx, fmt.Sprintf("Bitswap.%s", name), opts...)
11+
return otel.Tracer("go-bitswap").Start(ctx, "Bitswap."+name, opts...)
1312
}

‎bitswap/network/ipfs_impl_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package network_test
22

33
import (
44
"context"
5+
"errors"
56
"fmt"
67
"sync"
78
"testing"
@@ -69,7 +70,7 @@ func (r *receiver) PeerDisconnected(p peer.ID) {
6970
r.connectionEvent <- false
7071
}
7172

72-
var errMockNetErr = fmt.Errorf("network err")
73+
var errMockNetErr = errors.New("network err")
7374

7475
type ErrStream struct {
7576
network.Stream

0 commit comments

Comments
 (0)