Merge pull request #84 from libp2p/feat/update-multistream

update multistream deps and fix code to work with new changes

p2p/net/mock/mock_conn.go

@@ -6,9 +6,9 @@ import (
 
 	ic "github.com/ipfs/go-libp2p-crypto"
 	peer "github.com/ipfs/go-libp2p-peer"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
 	ma "github.com/jbenet/go-multiaddr"
 	process "github.com/jbenet/goprocess"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
 )
 
 // conn represents one side's perspective of a

p2p/net/mock/mock_link.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	peer "github.com/ipfs/go-libp2p-peer"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
 )
 
 // link implements mocknet.Link

p2p/net/mock/mock_net.go

@@ -5,11 +5,11 @@ import (
 	"sort"
 	"sync"
 
-	host "github.com/ipfs/go-libp2p/p2p/host"
-	bhost "github.com/ipfs/go-libp2p/p2p/host/basic"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
-	p2putil "github.com/ipfs/go-libp2p/p2p/test/util"
-	testutil "github.com/ipfs/go-libp2p/testutil"
+	host "github.com/libp2p/go-libp2p/p2p/host"
+	bhost "github.com/libp2p/go-libp2p/p2p/host/basic"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
+	p2putil "github.com/libp2p/go-libp2p/p2p/test/util"
+	testutil "github.com/libp2p/go-libp2p/testutil"
 
 	ic "github.com/ipfs/go-libp2p-crypto"
 	peer "github.com/ipfs/go-libp2p-peer"

p2p/net/mock/mock_notif_test.go

@@ -5,8 +5,8 @@ import (
 	"time"
 
 	peer "github.com/ipfs/go-libp2p-peer"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
 	ma "github.com/jbenet/go-multiaddr"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
 	context "golang.org/x/net/context"
 )
 

p2p/net/mock/mock_peernet.go

@@ -5,7 +5,7 @@ import (
 	"math/rand"
 	"sync"
 
-	inet "github.com/ipfs/go-libp2p/p2p/net"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
 
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"

p2p/net/mock/mock_printer.go

@@ -5,7 +5,7 @@ import (
 	"io"
 
 	peer "github.com/ipfs/go-libp2p-peer"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
 )
 
 // separate object so our interfaces are separate :)

p2p/net/mock/mock_stream.go

@@ -5,8 +5,8 @@ import (
 	"io"
 	"time"
 
-	inet "github.com/ipfs/go-libp2p/p2p/net"
 	process "github.com/jbenet/goprocess"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
 )
 
 // stream implements inet.Stream
@@ -16,6 +16,8 @@ type stream struct {
 	conn      *conn
 	toDeliver chan *transportObject
 	proc      process.Process
+
+	protocol string
 }
 
 type transportObject struct {
@@ -48,6 +50,14 @@ func (s *stream) Write(p []byte) (n int, err error) {
 	return len(p), nil
 }
 
+func (s *stream) Protocol() string {
+	return s.protocol
+}
+
+func (s *stream) SetProtocol(proto string) {
+	s.protocol = proto
+}
+
 func (s *stream) Close() error {
 	return s.proc.Close()
 }

p2p/net/mock/mock_test.go

@@ -10,9 +10,9 @@ import (
 	"time"
 
 	peer "github.com/ipfs/go-libp2p-peer"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
-	protocol "github.com/ipfs/go-libp2p/p2p/protocol"
-	testutil "github.com/ipfs/go-libp2p/testutil"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
+	protocol "github.com/libp2p/go-libp2p/p2p/protocol"
+	testutil "github.com/libp2p/go-libp2p/testutil"
 
 	detectrace "github.com/jbenet/go-detect-race"
 	context "golang.org/x/net/context"

p2p/net/swarm/addr/addr.go

@@ -9,7 +9,7 @@ import (
 	context "golang.org/x/net/context"
 )
 
-var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/net/swarm/addr")
+var log = logging.Logger("github.com/libp2p/go-libp2p/p2p/net/swarm/addr")
 
 // SupportedTransportStrings is the list of supported transports for the swarm.
 // These are strings of encapsulated multiaddr protocols. E.g.:

p2p/net/swarm/dial_test.go

@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
-	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
-	testutil "github.com/ipfs/go-libp2p/testutil"
-	ci "github.com/ipfs/go-libp2p/testutil/ci"
+	addrutil "github.com/libp2p/go-libp2p/p2p/net/swarm/addr"
+	testutil "github.com/libp2p/go-libp2p/testutil"
+	ci "github.com/libp2p/go-libp2p/testutil/ci"
 
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"

p2p/net/swarm/limiter.go

@@ -7,8 +7,8 @@ import (
 	ma "github.com/jbenet/go-multiaddr"
 	context "golang.org/x/net/context"
 
-	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
-	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
+	conn "github.com/libp2p/go-libp2p/p2p/net/conn"
+	addrutil "github.com/libp2p/go-libp2p/p2p/net/swarm/addr"
 )
 
 type dialResult struct {

p2p/net/swarm/limiter_test.go

@@ -12,7 +12,7 @@ import (
 	mafmt "github.com/whyrusleeping/mafmt"
 	context "golang.org/x/net/context"
 
-	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
+	conn "github.com/libp2p/go-libp2p/p2p/net/conn"
 )
 
 func mustAddr(t *testing.T, s string) ma.Multiaddr {

p2p/net/swarm/simul_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	ci "github.com/ipfs/go-libp2p/testutil/ci"
+	ci "github.com/libp2p/go-libp2p/testutil/ci"
 
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"

p2p/net/swarm/swarm.go

@@ -13,18 +13,18 @@ import (
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
 	transport "github.com/ipfs/go-libp2p-transport"
-	metrics "github.com/ipfs/go-libp2p/p2p/metrics"
-	mconn "github.com/ipfs/go-libp2p/p2p/metrics/conn"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
-	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
-	filter "github.com/ipfs/go-libp2p/p2p/net/filter"
-	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
 	logging "github.com/ipfs/go-log"
 	ma "github.com/jbenet/go-multiaddr"
 	ps "github.com/jbenet/go-peerstream"
 	pst "github.com/jbenet/go-stream-muxer"
 	"github.com/jbenet/goprocess"
 	goprocessctx "github.com/jbenet/goprocess/context"
+	metrics "github.com/libp2p/go-libp2p/p2p/metrics"
+	mconn "github.com/libp2p/go-libp2p/p2p/metrics/conn"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
+	conn "github.com/libp2p/go-libp2p/p2p/net/conn"
+	filter "github.com/libp2p/go-libp2p/p2p/net/filter"
+	addrutil "github.com/libp2p/go-libp2p/p2p/net/swarm/addr"
 	psmss "github.com/whyrusleeping/go-smux-multistream"
 	spdy "github.com/whyrusleeping/go-smux-spdystream"
 	yamux "github.com/whyrusleeping/go-smux-yamux"
@@ -340,9 +340,9 @@ func (n *ps2netNotifee) Disconnected(c *ps.Conn) {
 }
 
 func (n *ps2netNotifee) OpenedStream(s *ps.Stream) {
-	n.not.OpenedStream(n.net, inet.Stream((*Stream)(s)))
+	n.not.OpenedStream(n.net, &Stream{stream: s})
 }
 
 func (n *ps2netNotifee) ClosedStream(s *ps.Stream) {
-	n.not.ClosedStream(n.net, inet.Stream((*Stream)(s)))
+	n.not.ClosedStream(n.net, &Stream{stream: s})
 }

p2p/net/swarm/swarm_addr.go

 package swarm
 
 import (
-	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
-	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
+	conn "github.com/libp2p/go-libp2p/p2p/net/conn"
+	addrutil "github.com/libp2p/go-libp2p/p2p/net/swarm/addr"
 
 	ma "github.com/jbenet/go-multiaddr"
 )

p2p/net/swarm/swarm_addr_test.go

@@ -3,9 +3,9 @@ package swarm
 import (
 	"testing"
 
-	metrics "github.com/ipfs/go-libp2p/p2p/metrics"
-	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
-	testutil "github.com/ipfs/go-libp2p/testutil"
+	metrics "github.com/libp2p/go-libp2p/p2p/metrics"
+	addrutil "github.com/libp2p/go-libp2p/p2p/net/swarm/addr"
+	testutil "github.com/libp2p/go-libp2p/testutil"
 
 	pstore "github.com/ipfs/go-libp2p-peerstore"
 	ma "github.com/jbenet/go-multiaddr"

p2p/net/swarm/swarm_conn.go

@@ -3,8 +3,8 @@ package swarm
 import (
 	"fmt"
 
-	inet "github.com/ipfs/go-libp2p/p2p/net"
-	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
+	conn "github.com/libp2p/go-libp2p/p2p/net/conn"
 
 	ic "github.com/ipfs/go-libp2p-crypto"
 	peer "github.com/ipfs/go-libp2p-peer"

p2p/net/swarm/swarm_dial.go

@@ -8,9 +8,9 @@ import (
 
 	lgbl "github.com/ipfs/go-libp2p-loggables"
 	peer "github.com/ipfs/go-libp2p-peer"
-	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
-	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
 	ma "github.com/jbenet/go-multiaddr"
+	conn "github.com/libp2p/go-libp2p/p2p/net/conn"
+	addrutil "github.com/libp2p/go-libp2p/p2p/net/swarm/addr"
 	context "golang.org/x/net/context"
 )
 

p2p/net/swarm/swarm_listen.go

@@ -5,11 +5,11 @@ import (
 
 	lgbl "github.com/ipfs/go-libp2p-loggables"
 	transport "github.com/ipfs/go-libp2p-transport"
-	mconn "github.com/ipfs/go-libp2p/p2p/metrics/conn"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
-	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
 	ma "github.com/jbenet/go-multiaddr"
 	ps "github.com/jbenet/go-peerstream"
+	mconn "github.com/libp2p/go-libp2p/p2p/metrics/conn"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
+	conn "github.com/libp2p/go-libp2p/p2p/net/conn"
 	context "golang.org/x/net/context"
 )
 

p2p/net/swarm/swarm_net.go

@@ -5,8 +5,8 @@ import (
 
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
-	metrics "github.com/ipfs/go-libp2p/p2p/metrics"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
+	metrics "github.com/libp2p/go-libp2p/p2p/metrics"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
 
 	ma "github.com/jbenet/go-multiaddr"
 	"github.com/jbenet/goprocess"