Skip to content

Commit c8fc93b

Browse files
committed
minor fix - linter
1 parent 5db1af6 commit c8fc93b

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

signal/peer/peer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ func (registry *Registry) RegisterPool(peer *Peer) error {
140140
log.Tracef("peer [%s] is already registered [new streamID %d, previous StreamID %d]. Will override stream.",
141141
peer.Id, peer.StreamID, pp.StreamID)
142142
if swapped := registry.Peers.CompareAndSwap(peer.Id, pp, peer); !swapped {
143-
registry.RegisterPool(peer)
143+
return registry.RegisterPool(peer)
144144
}
145145
pp.Cancel()
146146
}

signal/peer/peer_test.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func TestRegistry_MultipleRegister_Concurrency(t *testing.T) {
130130
defer wg.Done()
131131

132132
peer := NewPeerPool(peerID, nil, cancel)
133-
registry.RegisterPool(peer)
133+
_ = registry.RegisterPool(peer)
134134
ids <- peer.StreamID
135135
}(i)
136136
}
@@ -145,6 +145,8 @@ func TestRegistry_MultipleRegister_Concurrency(t *testing.T) {
145145
peer, ok := registry.Get(peerID)
146146
require.True(t, ok, "expected peer to be registered")
147147
require.Equal(t, maxId, peer.StreamID, "expected the highest StreamID to be registered")
148+
149+
cancel()
148150
}
149151

150152
func Benchmark_MultipleRegister_Concurrency(b *testing.B) {
@@ -183,12 +185,13 @@ func Benchmark_MultipleRegister_Concurrency(b *testing.B) {
183185
defer wg.Done()
184186

185187
peer := NewPeerPool(peerID, nil, cancel)
186-
registry.RegisterPool(peer)
188+
_ = registry.RegisterPool(peer)
187189
}(i)
188190
}
189191
wg.Wait()
190192
}
191193
})
194+
cancel()
192195
}
193196

194197
func TestRegistry_MultipleDeregister_Concurrency(t *testing.T) {
@@ -210,7 +213,7 @@ func TestRegistry_MultipleDeregister_Concurrency(t *testing.T) {
210213
defer wg.Done()
211214

212215
peer := NewPeerPool(peerID, nil, cancel)
213-
registry.RegisterPool(peer)
216+
_ = registry.RegisterPool(peer)
214217
ids <- peer.StreamID
215218
registry.DeregisterPool(peer)
216219
}(i)
@@ -225,6 +228,7 @@ func TestRegistry_MultipleDeregister_Concurrency(t *testing.T) {
225228

226229
_, ok := registry.Get(peerID)
227230
require.False(t, ok, "expected peer to be deregistered")
231+
cancel()
228232
}
229233

230234
func Benchmark_MultipleDeregister_Concurrency(b *testing.B) {
@@ -265,7 +269,7 @@ func Benchmark_MultipleDeregister_Concurrency(b *testing.B) {
265269
defer wg.Done()
266270

267271
peer := NewPeerPool(peerID, nil, cancel)
268-
registry.RegisterPool(peer)
272+
_ = registry.RegisterPool(peer)
269273
time.Sleep(time.Nanosecond)
270274
registry.DeregisterPool(peer)
271275
}(i)

signal/server/signal_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"google.golang.org/grpc/status"
1818

1919
log "github.com/sirupsen/logrus"
20+
"github.com/stretchr/testify/require"
2021

2122
"github.com/netbirdio/netbird/signal/peer"
2223
"github.com/netbirdio/netbird/signal/proto"
@@ -116,7 +117,8 @@ func BenchmarkConnectStream(b *testing.B) {
116117
}()
117118

118119
b.StartTimer()
119-
fn(mockStream)
120+
err := fn(mockStream)
121+
require.NoError(b, err, "ConnectStream should not return an error")
120122
}
121123
b.Run("old", func(b *testing.B) {
122124
for i := 0; i < b.N; i++ {

0 commit comments

Comments
 (0)