Skip to content

Commit a9ecba9

Browse files
committed
fix: minor staticcheck fixes
1 parent fa09332 commit a9ecba9

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

impl/events.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func (m *manager) OnChannelOpened(chid datatransfer.ChannelID) error {
3838
// back a pause to the transport if the data limit is exceeded
3939
func (m *manager) OnDataReceived(chid datatransfer.ChannelID, link ipld.Link, size uint64, index int64, unique bool) error {
4040
ctx, _ := m.spansIndex.SpanForChannel(context.TODO(), chid)
41-
ctx, span := otel.Tracer("data-transfer").Start(ctx, "dataReceived", trace.WithAttributes(
41+
_, span := otel.Tracer("data-transfer").Start(ctx, "dataReceived", trace.WithAttributes(
4242
attribute.String("channelID", chid.String()),
4343
attribute.String("link", link.String()),
4444
attribute.Int64("index", index),
@@ -69,7 +69,7 @@ func (m *manager) OnDataQueued(chid datatransfer.ChannelID, link ipld.Link, size
6969
// machine.
7070

7171
ctx, _ := m.spansIndex.SpanForChannel(context.TODO(), chid)
72-
ctx, span := otel.Tracer("data-transfer").Start(ctx, "dataQueued", trace.WithAttributes(
72+
_, span := otel.Tracer("data-transfer").Start(ctx, "dataQueued", trace.WithAttributes(
7373
attribute.String("channelID", chid.String()),
7474
attribute.String("link", link.String()),
7575
attribute.Int64("size", int64(size)),
@@ -91,7 +91,7 @@ func (m *manager) OnDataQueued(chid datatransfer.ChannelID, link ipld.Link, size
9191
func (m *manager) OnDataSent(chid datatransfer.ChannelID, link ipld.Link, size uint64, index int64, unique bool) error {
9292

9393
ctx, _ := m.spansIndex.SpanForChannel(context.TODO(), chid)
94-
ctx, span := otel.Tracer("data-transfer").Start(ctx, "dataSent", trace.WithAttributes(
94+
_, span := otel.Tracer("data-transfer").Start(ctx, "dataSent", trace.WithAttributes(
9595
attribute.String("channelID", chid.String()),
9696
attribute.String("link", link.String()),
9797
attribute.Int64("size", int64(size)),

impl/impl.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ func (m *manager) OpenPushDataChannel(ctx context.Context, requestTo peer.ID, vo
198198
m.dataTransferNetwork.Protect(requestTo, chid.String())
199199
monitoredChan := m.channelMonitor.AddPushChannel(chid)
200200
if err := m.dataTransferNetwork.SendMessage(ctx, requestTo, req); err != nil {
201-
err = fmt.Errorf("Unable to send request: %w", err)
201+
err = fmt.Errorf("unable to send request: %w", err)
202202
span.RecordError(err)
203203
span.SetStatus(codes.Error, err.Error())
204204
_ = m.channels.Error(chid, err)
@@ -239,7 +239,7 @@ func (m *manager) OpenPullDataChannel(ctx context.Context, requestTo peer.ID, vo
239239
m.dataTransferNetwork.Protect(requestTo, chid.String())
240240
monitoredChan := m.channelMonitor.AddPullChannel(chid)
241241
if err := m.transport.OpenChannel(ctx, requestTo, chid, cidlink.Link{Cid: baseCid}, selector, nil, req); err != nil {
242-
err = fmt.Errorf("Unable to send request: %w", err)
242+
err = fmt.Errorf("unable to send request: %w", err)
243243
span.RecordError(err)
244244
span.SetStatus(codes.Error, err.Error())
245245
_ = m.channels.Error(chid, err)
@@ -278,7 +278,7 @@ func (m *manager) SendVoucher(ctx context.Context, channelID datatransfer.Channe
278278
return err
279279
}
280280
if err := m.dataTransferNetwork.SendMessage(ctx, chst.OtherPeer(), updateRequest); err != nil {
281-
err = fmt.Errorf("Unable to send request: %w", err)
281+
err = fmt.Errorf("unable to send request: %w", err)
282282
_ = m.OnRequestDisconnected(channelID, err)
283283
span.RecordError(err)
284284
span.SetStatus(codes.Error, err.Error())
@@ -317,7 +317,7 @@ func (m *manager) SendVoucherResult(ctx context.Context, channelID datatransfer.
317317
return err
318318
}
319319
if err := m.dataTransferNetwork.SendMessage(ctx, chst.OtherPeer(), updateResponse); err != nil {
320-
err = fmt.Errorf("Unable to send request: %w", err)
320+
err = fmt.Errorf("unable to send request: %w", err)
321321
_ = m.OnRequestDisconnected(channelID, err)
322322
span.RecordError(err)
323323
span.SetStatus(codes.Error, err.Error())
@@ -540,7 +540,7 @@ func (m *manager) PauseDataTransferChannel(ctx context.Context, chid datatransfe
540540
}
541541

542542
if err := m.dataTransferNetwork.SendMessage(ctx, chid.OtherParty(m.peerID), m.pauseMessage(chid)); err != nil {
543-
err = fmt.Errorf("Unable to send pause message: %w", err)
543+
err = fmt.Errorf("unable to send pause message: %w", err)
544544
_ = m.OnRequestDisconnected(chid, err)
545545
return err
546546
}

impl/integration_test.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ const loremFile = "lorem.txt"
4949
const loremFileTransferBytes = 20439
5050

5151
const loremLargeFile = "lorem_large.txt"
52-
const loremLargeFileTransferBytes = 217452
52+
53+
// const loremLargeFileTransferBytes = 217452
5354

5455
// nil means use the default protocols
5556
// tests data transfer for the following protocol combinations:
@@ -1921,6 +1922,7 @@ func TestRespondingToPullGraphsyncRequests(t *testing.T) {
19211922
request, err := message.NewRequest(id, false, true, &voucher, testutil.GenerateCids(1)[0], gsData.AllSelector)
19221923
require.NoError(t, err)
19231924
nd, err := request.ToIPLD()
1925+
require.NoError(t, err)
19241926
gsRequest := gsmsg.NewRequest(graphsync.NewRequestID(), link.(cidlink.Link).Cid, gsData.AllSelector, graphsync.Priority(rand.Int31()), graphsync.ExtensionData{
19251927
Name: extension.ExtensionDataTransfer1_1,
19261928
Data: nd,

0 commit comments

Comments
 (0)