Merge pull request #35 from libp2p/feat/update-stream-muxer

Update stream muxer.

.gx/lastpubver

-1.7.7: QmQUmDr1DMDDy6KMSsJuyV9nVD7dJZ9iWxXESQWPvte2NP
+2.0.0: QmZr3z6ZdvYZgRquj6VJZL7kd5aSfbxUD2FTwFPdRsQMYo

package.json

@@ -9,9 +9,9 @@
   "gxDependencies": [
     {
       "author": "whyrusleeping",
-      "hash": "QmahYsGWry85Y7WUe2SX5G4JkH2zifEQAUtJVLZ24aC9DF",
+      "hash": "QmNa31VPzC561NWwRsJLE7nGYZYuuD2QfpK2b1q9BK54J1",
       "name": "go-libp2p-net",
-      "version": "1.6.12"
+      "version": "2.0.0"
     },
     {
       "author": "whyrusleeping",
@@ -39,21 +39,21 @@
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmWUNsat6Jb19nC5CiJCDXepTkxjdxi3eZqeoB6mrmmaGu",
+      "hash": "QmQFhPsJCp82az4SXbziP9QcVSqggEELnV9wGZqMR1EfMB",
       "name": "go-smux-spdystream",
-      "version": "1.2.0"
+      "version": "2.0.0"
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmRVYfZ7tWNHPBzWiG6KWGzvT2hcGems8srihsQE29x1U5",
+      "hash": "QmVniQJkdzLZaZwzwMdd3dJTvWiJ1DQEkreVy6hs6h7Vk5",
       "name": "go-smux-multistream",
-      "version": "1.5.5"
+      "version": "2.0.0"
     },
     {
       "author": "whyrusleeping",
-      "hash": "Qmbn7RYyWzBVXiUp9jZ1dA4VADHy9DtS7iZLwfhEUQvm3U",
+      "hash": "QmfTJ3UpS5ycNX7uQvPUSSRjGxk9EhUG7SyCstX6tCoNXS",
       "name": "go-smux-yamux",
-      "version": "1.2.0"
+      "version": "2.0.0"
     },
     {
       "author": "whyrusleeping",
@@ -69,15 +69,15 @@
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmVNPgPmEG4QKaDKkxMPKY34Z53n8efzv1sEh4NTsdhto7",
+      "hash": "Qma1raveZpdRgcGkhzi1euLqmBgiVPNhHei1Ye39o7Joug",
       "name": "go-peerstream",
-      "version": "1.7.0"
+      "version": "2.0.0"
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmVjRAPfRtResCMCE4eBqr4Beoa6A89P1YweG9wUS6RqUL",
+      "hash": "QmQbh3Rb7KM37As3vkHYnEFnzkVXNCP8EYGtHz6g2fXk14",
       "name": "go-libp2p-metrics",
-      "version": "1.6.10"
+      "version": "2.0.0"
     },
     {
       "author": "whyrusleeping",
@@ -93,9 +93,9 @@
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmeZBgYBHvxMukGK5ojg28BCNLB9SeXqT7XXg6o7r2GbJy",
+      "hash": "QmY9JXR3FupnYAYJWK9aMr9bCpqWKcToQ1tz8DVGTrHpHw",
       "name": "go-stream-muxer",
-      "version": "1.1.0"
+      "version": "3.0.0"
     },
     {
       "author": "whyrusleeping",
@@ -174,6 +174,6 @@
   "license": "MIT",
   "name": "go-libp2p-swarm",
   "releaseCmd": "git commit -a -m \"gx publish $VERSION\"",
-  "version": "1.7.7"
+  "version": "2.0.0"
 }
 

swarm.go

@@ -12,7 +12,6 @@ import (
 	"time"
 
 	logging "github.com/ipfs/go-log"
-	pst "github.com/jbenet/go-stream-muxer"
 	"github.com/jbenet/goprocess"
 	goprocessctx "github.com/jbenet/goprocess/context"
 	addrutil "github.com/libp2p/go-addr-util"
@@ -27,6 +26,7 @@ import (
 	transport "github.com/libp2p/go-libp2p-transport"
 	filter "github.com/libp2p/go-maddr-filter"
 	ps "github.com/libp2p/go-peerstream"
+	pst "github.com/libp2p/go-stream-muxer"
 	tcpt "github.com/libp2p/go-tcp-transport"
 	ws "github.com/libp2p/go-ws-transport"
 	ma "github.com/multiformats/go-multiaddr"

swarm_listen.go

@@ -145,7 +145,7 @@ func (s *Swarm) addConnListener(list iconn.Listener) error {
 // connHandler is called by the StreamSwarm whenever a new connection is added
 // here we configure it slightly. Note that this is sequential, so if anything
 // will take a while do it in a goroutine.
-// See https://godoc.org/github.com/jbenet/go-peerstream for more information
+// See https://godoc.org/github.com/libp2p/go-peerstream for more information
 func (s *Swarm) connHandler(c *ps.Conn) *Conn {
 	ctx := context.Background()
 	// this context is for running the handshake, which -- when receiveing connections

swarm_notif_test.go

@@ -125,7 +125,7 @@ func TestNotifications(t *testing.T) {
 	for _, s := range swarms {
 		s.SetStreamHandler(func(s inet.Stream) {
 			streams <- s
-			s.Close()
+			s.Reset()
 		})
 	}
 
@@ -139,7 +139,7 @@ func TestNotifications(t *testing.T) {
 				t.Error(err)
 			} else {
 				st1.Write([]byte("hello"))
-				st1.Close()
+				st1.Reset()
 				testOCStream(notifiees[i], st1)
 				st2 := <-streams
 				testOCStream(n2, st2)

swarm_stream.go

@@ -43,6 +43,11 @@ func (s *Stream) Close() error {
 	return s.Stream().Close()
 }
 
+// Reset resets the stream, closing both ends.
+func (s *Stream) Reset() error {
+	return s.Stream().Reset()
+}
+
 func (s *Stream) Protocol() protocol.ID {
 	return (*ps.Stream)(s).Protocol()
 }