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.

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

Add host with circuitv2 to integration test #3162

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
148 changes: 148 additions & 0 deletions p2p/test/transport/transport_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ import (
rcmgr "github.com/libp2p/go-libp2p/p2p/host/resource-manager"
"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
"github.com/libp2p/go-libp2p/p2p/net/swarm"
"github.com/libp2p/go-libp2p/p2p/protocol/circuitv2/client"
"github.com/libp2p/go-libp2p/p2p/protocol/circuitv2/relay"
"github.com/libp2p/go-libp2p/p2p/protocol/ping"
"github.com/libp2p/go-libp2p/p2p/security/noise"
tls "github.com/libp2p/go-libp2p/p2p/security/tls"
Expand Down Expand Up @@ -68,6 +70,16 @@ func transformOpts(opts TransportTestCaseOpts) []config.Option {
return libp2pOpts
}

func connect(t *testing.T, a, b host.Host) {
pi := peer.AddrInfo{ID: a.ID(), Addrs: a.Addrs()}
err := b.Connect(context.Background(), pi)
if err != nil {
t.Fatal(err)
}
}

const RelayTestOnTransportName = "QUIC"

var transportsToTest = []TransportTestCase{
{
Comment on lines 83 to 84
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add another item to this list with Name: "circuit-v2"

Name: "TCP / Noise / Yamux",
Expand Down Expand Up @@ -225,6 +237,20 @@ var transportsToTest = []TransportTestCase{
return h
},
},
{
Name: "circuit-v2",
HostGenerator: func(t *testing.T, opts TransportTestCaseOpts) host.Host {
libp2pOpts := transformOpts(opts)
if opts.NoListen {
libp2pOpts = append(libp2pOpts, libp2p.NoListenAddrs)
Comment on lines +244 to +245
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to add the relay transport to the host, if not already present.

} else {
libp2pOpts = append(libp2pOpts, libp2p.ListenAddrStrings("/ip4/127.0.0.1/udp/0/quic-v1"))
}
Comment on lines +247 to +248
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need this host to obtain a relay reservation with a relay server.

For the listen side, you'll need to start 2 hosts. 1 relay host, 1 listener node. The listener node will obtain a relay reservation with the relay host and then advertise its address using AddressFactory(https://github.com/libp2p/go-libp2p/blob/master/options.go#L260)

h, err := libp2p.New(libp2pOpts...)
require.NoError(t, err)
return h
},
},
}

func TestPing(t *testing.T) {
Expand Down Expand Up @@ -868,6 +894,128 @@ func TestConnClosedWhenRemoteCloses(t *testing.T) {
}
}

func TestConnRelay(t *testing.T) {
for _, tc := range transportsToTest {
t.Run(tc.Name, func(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
Comment on lines +897 to +901
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need this test. We want to run all the transport integration tests for the circuit relay transport.


var hosts []host.Host
// Set host
for i := 0; i < 3; i++ {
h := tc.HostGenerator(t, TransportTestCaseOpts{})
hosts = append(hosts, h)
}

// Set stream handler
rch := make(chan []byte, 1)
hosts[0].SetStreamHandler("test", func(s network.Stream) {
defer s.Close()
defer close(rch)

buf := make([]byte, 1024)
nread := 0
for nread < len(buf) {
n, err := s.Read(buf[nread:])
nread += n
if err != nil {
if err == io.EOF {
break
}
t.Fatal(err)
}
}

rch <- buf[:nread]
})

r, err := relay.New(hosts[1])
if err != nil {
t.Fatal(err)
}
defer r.Close()

connect(t, hosts[0], hosts[1])
connect(t, hosts[1], hosts[2])

rinfo := hosts[1].Peerstore().PeerInfo(hosts[1].ID())
rsvp, err := client.Reserve(ctx, hosts[0], rinfo)
if err != nil {
t.Fatal(err)
}

if rsvp.Voucher == nil {
t.Fatal("no reservation voucher")
}

raddr, err := ma.NewMultiaddr(fmt.Sprintf("/p2p/%s/p2p-circuit/p2p/%s", hosts[1].ID(), hosts[0].ID()))
if err != nil {
t.Fatal(err)
}

sub, err := hosts[2].EventBus().Subscribe(new(event.EvtPeerConnectednessChanged))
require.NoError(t, err)

err = hosts[2].Connect(ctx, peer.AddrInfo{ID: hosts[0].ID(), Addrs: []ma.Multiaddr{raddr}})
if err != nil {
t.Fatal(err)
}
for {
var e interface{}
select {
case e = <-sub.Out():
case <-time.After(2 * time.Second):
t.Fatal("expected limited connectivity event")
}
evt, ok := e.(event.EvtPeerConnectednessChanged)
if !ok {
t.Fatalf("invalid event: %s", e)
}
if evt.Peer == hosts[0].ID() {
if evt.Connectedness != network.Limited {
t.Fatalf("expected limited connectivity %s", evt.Connectedness)
}
break
}
}

conns := hosts[2].Network().ConnsToPeer(hosts[0].ID())
if len(conns) != 1 {
t.Fatalf("expected 1 connection, but got %d", len(conns))
}
if !conns[0].Stat().Limited {
t.Fatal("expected transient connection")
}

s, err := hosts[2].NewStream(network.WithAllowLimitedConn(ctx, "test"), hosts[0].ID(), "test")
if err != nil {
t.Fatal(err)
}

msg := []byte("relay works!")
nwritten, err := s.Write(msg)
if err != nil {
t.Fatal(err)
}
if nwritten != len(msg) {
t.Fatalf("expected to write %d bytes, but wrote %d instead", len(msg), nwritten)
}
s.CloseWrite()

got := <-rch
if !bytes.Equal(msg, got) {
t.Fatalf("Wrong echo; expected %s but got %s", string(msg), string(got))
}

t.Cleanup(func() {
for i := range len(hosts) {
hosts[i].Close()
}
})
})
}
}

func TestErrorCodes(t *testing.T) {
assertStreamErrors := func(s network.Stream, expectedError error) {
buf := make([]byte, 10)
Expand Down
Loading