Skip to content

Commit cc37fe7

Browse files
authored
fix: blocklist (#4871)
1 parent c75fa3f commit cc37fe7

File tree

2 files changed

+29
-0
lines changed

2 files changed

+29
-0
lines changed

pkg/p2p/libp2p/connections_test.go

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,34 @@ func TestBlocklisting(t *testing.T) {
599599
expectPeers(t, s2)
600600
}
601601

602+
func TestReverseBlocklist(t *testing.T) {
603+
t.Parallel()
604+
605+
s1, overlay1 := newService(t, 1, libp2pServiceOpts{libp2pOpts: libp2p.Options{
606+
FullNode: true,
607+
}})
608+
s2, overlay2 := newService(t, 1, libp2pServiceOpts{libp2pOpts: libp2p.Options{
609+
FullNode: true,
610+
}})
611+
612+
s1Addr := serviceUnderlayAddress(t, s1)
613+
614+
_, err := s2.Connect(context.Background(), s1Addr)
615+
if err != nil {
616+
t.Fatal(err)
617+
}
618+
619+
expectPeers(t, s1, overlay2)
620+
expectPeersEventually(t, s2, overlay1)
621+
622+
if err := s1.Blocklist(overlay2, 0, testBlocklistMsg); err != nil {
623+
t.Fatal(err)
624+
}
625+
626+
expectPeers(t, s1)
627+
expectPeersEventually(t, s2)
628+
}
629+
602630
func TestBlocklistedPeers(t *testing.T) {
603631
t.Parallel()
604632
s1, overlay1 := newService(t, 1, libp2pServiceOpts{libp2pOpts: libp2p.Options{

pkg/p2p/libp2p/libp2p.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,7 @@ func (s *Service) handleIncoming(stream network.Stream) {
542542
}
543543

544544
peerUserAgent := appendSpace(s.peerUserAgent(s.ctx, peerID))
545+
s.networkStatus.Store(int32(p2p.NetworkStatusAvailable))
545546

546547
loggerV1.Debug("stream handler: successfully connected to peer (inbound)", "addresses", i.BzzAddress.ShortString(), "light", i.LightString(), "user_agent", peerUserAgent)
547548
s.logger.Debug("stream handler: successfully connected to peer (inbound)", "address", i.BzzAddress.Overlay, "light", i.LightString(), "user_agent", peerUserAgent)

0 commit comments

Comments
 (0)