Skip to content

Commit 75b75a1

Browse files
committed
chore(lint): fix lint errors
1 parent a7d2b67 commit 75b75a1

File tree

5 files changed

+22
-20
lines changed

5 files changed

+22
-20
lines changed

loadbalancer/loadbalancer.go

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,10 @@ func (lb *LoadBalancer) handleForwarding(s network.Stream) {
164164

165165
// only accept outbound requests
166166
if request.Kind != messages.ForwardingOutbound {
167-
messages.WriteForwardingResponseError(s, ErrNoInboundRequests)
167+
err = messages.WriteForwardingResponseError(s, ErrNoInboundRequests)
168+
if err != nil {
169+
log.Warnf("writing forwarding response: %s", err)
170+
}
168171
return
169172
}
170173

@@ -223,24 +226,24 @@ func (lb *LoadBalancer) bridgeStreams(s1, s2 network.Stream) {
223226
defer wg.Done()
224227
_, err := io.Copy(s2, s1)
225228
if err != nil {
226-
s1.Reset()
229+
_ = s1.Reset()
227230
return
228231
}
229232
err = s2.CloseWrite()
230233
if err != nil {
231-
s1.Reset()
234+
_ = s1.Reset()
232235
}
233236
}()
234237
go func() {
235238
// pipe reads on s2 to writes on s1
236239
defer wg.Done()
237240
_, err := io.Copy(s1, s2)
238241
if err != nil {
239-
s2.Reset()
242+
_ = s2.Reset()
240243
}
241244
err = s1.CloseWrite()
242245
if err != nil {
243-
s2.Reset()
246+
_ = s2.Reset()
244247
}
245248
}()
246249
wg.Wait()
@@ -259,15 +262,15 @@ func (lb *LoadBalancer) handleIncoming(s network.Stream) {
259262
if !ok {
260263
// if none exists, return
261264
log.Warnf("received protocol request for protocol '%s' with no router peer", s.Protocol())
262-
s.Reset()
265+
_ = s.Reset()
263266
return
264267
}
265268

266269
// open a forwarding stream
267270
routedStream, err := lb.h.NewStream(lb.ctx, routedPeer, ForwardingProtocolID)
268271
if err != nil {
269272
log.Warnf("unable to open forwarding stream for protocol '%s' with peer %s", s.Protocol(), routedPeer)
270-
s.Reset()
273+
_ = s.Reset()
271274
return
272275
}
273276

@@ -276,8 +279,8 @@ func (lb *LoadBalancer) handleIncoming(s network.Stream) {
276279
err = messages.WriteInboundForwardingRequest(routedStream, s.Conn().RemotePeer(), s.Protocol())
277280
if err != nil {
278281
log.Warnf("writing forwarding request: %s", err)
279-
routedStream.Reset()
280-
s.Reset()
282+
_ = routedStream.Reset()
283+
_ = s.Reset()
281284
return
282285
}
283286

loadbalancer/loadbalancer_test.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@ func TestOutboundForwarding(t *testing.T) {
108108
if response.Code == messages.ResponseOk {
109109
_, err := s.Write([]byte("request"))
110110
require.NoError(t, err)
111-
s.CloseWrite()
111+
err = s.CloseWrite()
112+
require.NoError(t, err)
112113
streamResponse, err := io.ReadAll(s)
113114
require.NoError(t, err)
114115
require.Equal(t, "response", string(streamResponse))
@@ -196,7 +197,7 @@ func TestInboundForwarding(t *testing.T) {
196197
}, request)
197198
require.NoError(tn.t, err)
198199
if testCase.rejectResponse {
199-
s.Reset()
200+
_ = s.Reset()
200201
} else {
201202
userRequest, err := ioutil.ReadAll(s)
202203
require.NoError(t, err)
@@ -208,12 +209,13 @@ func TestInboundForwarding(t *testing.T) {
208209
tn.serviceNode.SetStreamHandler(ForwardingProtocolID, handler)
209210
}
210211
if !testCase.doNotConnect {
211-
tn.serviceNode.Connect(ctx, peer.AddrInfo{
212+
err = tn.serviceNode.Connect(ctx, peer.AddrInfo{
212213
ID: peers.loadBalancer.id,
213214
Addrs: []multiaddr.Multiaddr{
214215
peers.loadBalancer.multiAddr,
215216
},
216217
})
218+
require.NoError(t, err)
217219
}
218220
s, err := tn.publicNode.NewStream(tn.ctx, tn.loadBalancer.ID(), testCase.protocols...)
219221
if testCase.willErrorOpening {
@@ -223,7 +225,8 @@ func TestInboundForwarding(t *testing.T) {
223225
_, err := s.Write([]byte("request"))
224226

225227
require.NoError(t, err)
226-
s.CloseWrite()
228+
_ = s.CloseWrite()
229+
require.NoError(t, err)
227230
streamResponse, err := io.ReadAll(s)
228231
if testCase.willErrorReading {
229232
require.Error(t, err)
@@ -239,7 +242,6 @@ func TestInboundForwarding(t *testing.T) {
239242
}
240243
}
241244

242-
type forwardingRequestHandler func(*messages.ForwardingRequest, io.Writer) error
243245
type testNet struct {
244246
ctx context.Context
245247
t *testing.T

loadbalancer/messages/messages_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"errors"
77
"io"
88
"testing"
9-
"time"
109

1110
"github.com/filecoin-project/boost/loadbalancer/messages"
1211
"github.com/ipld/go-ipld-prime/codec/dagcbor"
@@ -48,8 +47,6 @@ func TestRoundtripForwardingResponse(t *testing.T) {
4847
func TestReadWriteFunctions(t *testing.T) {
4948
singleTestProtocol := protocol.ID("test/me")
5049
testProtocols := []protocol.ID{"applesauce/cheese", "big/face"}
51-
expiry := time.Now().Add(time.Hour)
52-
expiry = time.Unix(0, expiry.UnixNano())
5350
responseErr := errors.New("something went wrong")
5451
remote := peer.ID("something")
5552
_, pubKey, err := crypto.GenerateECDSAKeyPair(rand.Reader)

loadbalancer/servicenode.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,15 @@ func (wc *wrappedConn) RemotePeer() peer.ID {
8585
func (sn *ServiceNode) handleForwarding(s network.Stream) {
8686
// only accept requests from the load balancer
8787
if s.Conn().RemotePeer() != sn.balancer {
88-
s.Reset()
88+
_ = s.Reset()
8989
return
9090
}
9191

9292
// read the forwarding request
9393
request, err := messages.ReadForwardingRequest(s)
9494
if err != nil {
9595
log.Warnf("reading forwarding request: %s", err)
96-
s.Reset()
96+
_ = s.Reset()
9797
return
9898
}
9999

node/modules/retrieval.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func NewSetBitswapPeerIDFunc(r lotus_repo.LockedRepo, lb *loadbalancer.LoadBalan
119119
network.ProtocolBitswapOneOne,
120120
network.ProtocolBitswapOneZero,
121121
}
122-
lb.UpdatePeerConfig(peerConfig)
122+
err = lb.UpdatePeerConfig(peerConfig)
123123
return
124124
}, nil
125125
}

0 commit comments

Comments
 (0)