Merge pull request #97 from libp2p/feat/rw-stream

feat: update to go-libp2p-core 0.7.0
libp2p · Sep 2, 2020 · be059b4 · be059b4
2 parents ec8d960 + 87e9356
commit be059b4
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 12 deletions.
diff --git a/p2p/host/autonat/autonat.go b/p2p/host/autonat/autonat.go
@@ -15,7 +15,7 @@ import (
 
 	logging "github.com/ipfs/go-log"
 	ma "github.com/multiformats/go-multiaddr"
-	manet "github.com/multiformats/go-multiaddr-net"
+	manet "github.com/multiformats/go-multiaddr/net"
 )
 
 var log = logging.Logger("autonat")

diff --git a/p2p/host/autonat/autonat_test.go b/p2p/host/autonat/autonat_test.go
@@ -108,7 +108,7 @@ func TestAutoNATPrivate(t *testing.T) {
 	}
 
 	connect(t, hs, hc)
-	time.Sleep(1 * time.Second)
+	time.Sleep(2 * time.Second)
 
 	status = an.Status()
 	if status != network.ReachabilityPrivate {

diff --git a/p2p/host/autonat/client.go b/p2p/host/autonat/client.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/libp2p/go-libp2p-core/helpers"
 	"github.com/libp2p/go-libp2p-core/host"
 	"github.com/libp2p/go-libp2p-core/network"
 	"github.com/libp2p/go-libp2p-core/peer"
@@ -42,7 +41,7 @@ func (c *client) DialBack(ctx context.Context, p peer.ID) (ma.Multiaddr, error)
 	}
 	// Might as well just reset the stream. Once we get to this point, we
 	// don't care about being nice.
-	defer helpers.FullClose(s)
+	defer s.Close()
 
 	r := protoio.NewDelimitedReader(s, network.MessageSizeMax)
 	w := protoio.NewDelimitedWriter(s)

diff --git a/p2p/host/autonat/dialpolicy.go b/p2p/host/autonat/dialpolicy.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/libp2p/go-libp2p-core/host"
 	ma "github.com/multiformats/go-multiaddr"
-	manet "github.com/multiformats/go-multiaddr-net"
+	manet "github.com/multiformats/go-multiaddr/net"
 )
 
 type dialPolicy struct {

diff --git a/p2p/host/autonat/notify.go b/p2p/host/autonat/notify.go
@@ -4,7 +4,7 @@ import (
 	"github.com/libp2p/go-libp2p-core/network"
 
 	ma "github.com/multiformats/go-multiaddr"
-	manet "github.com/multiformats/go-multiaddr-net"
+	manet "github.com/multiformats/go-multiaddr/net"
 )
 
 var _ network.Notifiee = (*AmbientAutoNAT)(nil)

diff --git a/p2p/host/autonat/pb/autonat.pb.go b/p2p/host/autonat/pb/autonat.pb.go
diff --git a/p2p/host/autonat/svc.go b/p2p/host/autonat/svc.go
@@ -8,7 +8,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/libp2p/go-libp2p-core/helpers"
 	"github.com/libp2p/go-libp2p-core/network"
 	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/libp2p/go-libp2p-core/peerstore"
@@ -17,7 +16,7 @@ import (
 
 	"github.com/libp2p/go-msgio/protoio"
 	ma "github.com/multiformats/go-multiaddr"
-	manet "github.com/multiformats/go-multiaddr-net"
+	manet "github.com/multiformats/go-multiaddr/net"
 )
 
 // AutoNATService provides NAT autodetection services to other peers
@@ -51,7 +50,7 @@ func newAutoNATService(ctx context.Context, c *config) (*autoNATService, error)
 }
 
 func (as *autoNATService) handleStream(s network.Stream) {
-	defer helpers.FullClose(s)
+	defer s.Close()
 
 	pid := s.Conn().RemotePeer()
 	log.Debugf("New stream from %s", pid.Pretty())