feat: use go-libp2p-core 0.7.0 stream interfaces

depends on libp2p/go-libp2p#1001
libp2p · Nov 2, 2020 · 3d76385 · 3d76385
1 parent 20d0395
commit 3d76385
Show file tree

Hide file tree

Showing 3 changed files with 220 additions and 18 deletions.
diff --git a/conn.go b/conn.go
@@ -5,7 +5,6 @@ import (
 	"net"
 	"time"
 
-	"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"
@@ -36,12 +35,7 @@ func (c *conn) Write(b []byte) (n int, err error) {
 // Close closes the connection.
 // Any blocked Read or Write operations will be unblocked and return errors.
 func (c *conn) Close() error {
-	if err := c.s.Close(); err != nil {
-		c.s.Reset()
-		return err
-	}
-	go helpers.AwaitEOF(c.s)
-	return nil
+	return c.s.Close()
 }
 
 // LocalAddr returns the local network address.

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/libp2p/go-libp2p-gostream
 go 1.14
 
 require (
-	github.com/libp2p/go-libp2p v0.7.2
-	github.com/libp2p/go-libp2p-core v0.5.0
-	github.com/multiformats/go-multiaddr v0.2.1
+	github.com/libp2p/go-libp2p v0.11.1-0.20201102192925-b33cbc714465
+	github.com/libp2p/go-libp2p-core v0.7.0
+	github.com/multiformats/go-multiaddr v0.3.1
 )