Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

autonat: fix closing of listeners in dialPolicy tests #2226

Merged
merged 1 commit into from
Apr 5, 2023
Merged

autonat: fix closing of listeners in dialPolicy tests #2226

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions p2p/host/autonat/dialpolicy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,31 +23,33 @@ func makeMA(a string) multiaddr.Multiaddr {
}

type mockT struct {
ctx context.Context
addr multiaddr.Multiaddr
ctx context.Context
cancel context.CancelFunc
addr multiaddr.Multiaddr
}

func (m *mockT) Dial(ctx context.Context, a multiaddr.Multiaddr, p peer.ID) (transport.CapableConn, error) {
return nil, nil
}
func (m *mockT) CanDial(_ multiaddr.Multiaddr) bool { return true }
func (m *mockT) Listen(a multiaddr.Multiaddr) (transport.Listener, error) {
return &mockL{m.ctx, m.addr}, nil
return &mockL{m.ctx, m.cancel, m.addr}, nil
}
func (m *mockT) Protocols() []int { return []int{multiaddr.P_IP4} }
func (m *mockT) Proxy() bool { return false }
func (m *mockT) String() string { return "mock-tcp-ipv4" }

type mockL struct {
ctx context.Context
addr multiaddr.Multiaddr
ctx context.Context
cancel context.CancelFunc
addr multiaddr.Multiaddr
}

func (l *mockL) Accept() (transport.CapableConn, error) {
<-l.ctx.Done()
return nil, errors.New("expected in mocked test")
}
func (l *mockL) Close() error { return nil }
func (l *mockL) Close() error { l.cancel(); return nil }
func (l *mockL) Addr() net.Addr { return nil }
func (l *mockL) Multiaddr() multiaddr.Multiaddr { return l.addr }

Expand All @@ -56,6 +58,7 @@ func TestSkipDial(t *testing.T) {
defer cancel()

s := swarmt.GenSwarm(t)
defer s.Close()
d := dialPolicy{host: blankhost.NewBlankHost(s)}
if d.skipDial(makeMA("/ip4/8.8.8.8")) != false {
t.Fatal("failed dialing a valid public addr")
Expand All @@ -69,7 +72,7 @@ func TestSkipDial(t *testing.T) {
t.Fatal("didn't skip dialing an internal addr")
}

s.AddTransport(&mockT{ctx, makeMA("/ip4/8.8.8.8")})
s.AddTransport(&mockT{ctx, cancel, makeMA("/ip4/8.8.8.8")})
err := s.AddListenAddr(makeMA("/ip4/8.8.8.8"))
if err != nil {
t.Fatal(err)
Expand All @@ -84,6 +87,8 @@ func TestSkipPeer(t *testing.T) {
defer cancel()

s := swarmt.GenSwarm(t)
defer s.Close()

d := dialPolicy{host: blankhost.NewBlankHost(s)}
if d.skipPeer([]multiaddr.Multiaddr{makeMA("/ip4/8.8.8.8")}) != false {
t.Fatal("failed dialing a valid public addr")
Expand All @@ -95,7 +100,7 @@ func TestSkipPeer(t *testing.T) {
t.Fatal("succeeded with no public addr")
}

s.AddTransport(&mockT{ctx, makeMA("/ip4/8.8.8.8")})
s.AddTransport(&mockT{ctx, cancel, makeMA("/ip4/8.8.8.8")})
err := s.AddListenAddr(makeMA("/ip4/8.8.8.8"))
if err != nil {
t.Fatal(err)
Expand All @@ -117,8 +122,10 @@ func TestSkipLocalPeer(t *testing.T) {
defer cancel()

s := swarmt.GenSwarm(t)
defer s.Close()

d := dialPolicy{host: blankhost.NewBlankHost(s)}
s.AddTransport(&mockT{ctx, makeMA("/ip4/192.168.0.1")})
s.AddTransport(&mockT{ctx, cancel, makeMA("/ip4/192.168.0.1")})
err := s.AddListenAddr(makeMA("/ip4/192.168.0.1"))
if err != nil {
t.Fatal(err)
Expand Down