update multistream naming of lazyconn

License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>

Godeps/Godeps.json

@@ -344,7 +344,7 @@
 		},
 		{
 			"ImportPath": "github.com/whyrusleeping/go-multistream",
-			"Rev": "30c7a81b6c568654147bf6e106870c5d64ccebc8"
+			"Rev": "31bb014803a6eba2261bda5593e42c016a5f33bb"
 		},
 		{
 			"ImportPath": "github.com/whyrusleeping/multiaddr-filter",

Godeps/_workspace/src/github.com/whyrusleeping/go-multistream/lazy.go

@@ -6,7 +6,16 @@ import (
 	"sync"
 )
 
-func NewLazyHandshakeConn(c io.ReadWriteCloser, proto string) io.ReadWriteCloser {
+type Multistream interface {
+	io.ReadWriteCloser
+	Protocol() string
+}
+
+func NewMSSelect(c io.ReadWriteCloser, proto string) Multistream {
+	return NewMultistream(NewMultistream(c, ProtocolID), proto)
+}
+
+func NewMultistream(c io.ReadWriteCloser, proto string) Multistream {
 	return &lazyConn{
 		proto: proto,
 		con:   c,
@@ -30,6 +39,10 @@ type lazyConn struct {
 	con   io.ReadWriteCloser
 }
 
+func (l *lazyConn) Protocol() string {
+	return l.proto
+}
+
 func (l *lazyConn) Read(b []byte) (int, error) {
 	if !l.rhandshake {
 		go l.writeHandshake()
@@ -58,20 +71,8 @@ func (l *lazyConn) readHandshake() error {
 	}
 	l.rhsync = true
 
-	// read multistream version
-	tok, err := ReadNextToken(l.con)
-	if err != nil {
-		l.rerr = err
-		return err
-	}
-
-	if tok != ProtocolID {
-		l.rerr = fmt.Errorf("multistream protocol mismatch ( %s != %s )", tok, ProtocolID)
-		return l.rerr
-	}
-
 	// read protocol
-	tok, err = ReadNextToken(l.con)
+	tok, err := ReadNextToken(l.con)
 	if err != nil {
 		l.rerr = err
 		return err
@@ -95,13 +96,7 @@ func (l *lazyConn) writeHandshake() error {
 
 	l.whsync = true
 
-	err := delimWrite(l.con, []byte(ProtocolID))
-	if err != nil {
-		l.werr = err
-		return err
-	}
-
-	err = delimWrite(l.con, []byte(l.proto))
+	err := delimWrite(l.con, []byte(l.proto))
 	if err != nil {
 		l.werr = err
 		return err

Godeps/_workspace/src/github.com/whyrusleeping/go-multistream/multistream_test.go

@@ -126,8 +126,8 @@ func TestLazyConns(t *testing.T) {
 	mux.AddHandler("/b", nil)
 	mux.AddHandler("/c", nil)
 
-	la := NewLazyHandshakeConn(a, "/c")
-	lb := NewLazyHandshakeConn(b, "/c")
+	la := NewMSSelect(a, "/c")
+	lb := NewMSSelect(b, "/c")
 
 	verifyPipe(t, la, lb)
 }
@@ -159,7 +159,7 @@ func TestLazyAndMux(t *testing.T) {
 		close(done)
 	}()
 
-	lb := NewLazyHandshakeConn(b, "/c")
+	lb := NewMSSelect(b, "/c")
 
 	// do a write to push the handshake through
 	_, err := lb.Write([]byte("hello"))
@@ -202,7 +202,7 @@ func TestLazyAndMuxWrite(t *testing.T) {
 		close(done)
 	}()
 
-	lb := NewLazyHandshakeConn(b, "/c")
+	lb := NewMSSelect(b, "/c")
 
 	// do a write to push the handshake through
 	msg := make([]byte, 5)

p2p/host/basic/basic_host.go

@@ -170,7 +170,7 @@ func (h *BasicHost) NewStream(pid protocol.ID, p peer.ID) (inet.Stream, error) {
 
 	logStream := mstream.WrapStream(s, pid, h.bwc)
 
-	lzcon := msmux.NewLazyHandshakeConn(logStream, string(pid))
+	lzcon := msmux.NewMSSelect(logStream, string(pid))
 	return &streamWrapper{
 		Stream: logStream,
 		rw:     lzcon,