initial port

conn.go

@@ -3,8 +3,8 @@ package sm_yamux
 import (
 	"context"
 
-	"github.com/libp2p/go-yamux/v2"
 	"gitlab.dms3.io/p2p/go-p2p-core/mux"
+	"gitlab.dms3.io/p2p/go-yamux/v2"
 )
 
 // conn implements mux.MuxedConn over yamux.Session.

go.mod

@@ -3,7 +3,7 @@ module gitlab.dms3.io/p2p/go-p2p-yamux
 go 1.15
 
 require (
-	github.com/libp2p/go-yamux/v2 v2.2.0
 	gitlab.dms3.io/p2p/go-p2p-core v0.0.1
 	gitlab.dms3.io/p2p/go-p2p-testing v0.0.1
+	gitlab.dms3.io/p2p/go-yamux/v2 v2.0.0
 )

go.sum

@@ -41,11 +41,7 @@ github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlT
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
-github.com/libp2p/go-buffer-pool v0.0.2 h1:QNK2iAFa8gjAe1SPz6mHSMuCcjs+X1wlHzeOSqcmlfs=
-github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM=
 github.com/libp2p/go-maddr-filter v0.1.0/go.mod h1:VzZhTXkMucEGGEOSKddrwGiOv0tUhgnKqNEmIAz/bPU=
-github.com/libp2p/go-yamux/v2 v2.2.0 h1:RwtpYZ2/wVviZ5+3pjC8qdQ4TKnrak0/E01N1UWoAFU=
-github.com/libp2p/go-yamux/v2 v2.2.0/go.mod h1:3So6P6TV6r75R9jiBpiIKgU/66lOarCZjqROGxzPpPQ=
 github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
 github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
 github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
@@ -77,6 +73,7 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 gitlab.dms3.io/dms3/public/go-cid v0.0.1/go.mod h1:GQw3gc4CSrFY+aX6M+OBQDlg0p5/eQJoRrayaZzkAOQ=
+gitlab.dms3.io/p2p/go-buffer-pool v0.0.1 h1:2IUBfHOWOarILKvoF1NHnfSUD5MMI/g6f64ZTUwacoA=
 gitlab.dms3.io/p2p/go-buffer-pool v0.0.1/go.mod h1:M+a5uWIUEkiKihMm5+IL0+pqzG6G7mcD6nNWosKUKO0=
 gitlab.dms3.io/p2p/go-flow-metrics v0.0.1/go.mod h1:0QFTYtRYP6Y1xfK0xycr40drfoM+0WVCoOXPyI0eFN0=
 gitlab.dms3.io/p2p/go-msgio v0.0.1/go.mod h1:H6AqMy1HOxZb+yEXj2d3o4wgWb+lJx9aYI+nWka46T0=
@@ -85,6 +82,8 @@ gitlab.dms3.io/p2p/go-p2p-core v0.0.1 h1:ENn1teKT3rq5v5BN0y4hRWP3rjKEZbOCiwUI1t8
 gitlab.dms3.io/p2p/go-p2p-core v0.0.1/go.mod h1:xm5X+ChR6cZDKYaIDSmuCs6Uvd1GtbDy47xXjCljBAk=
 gitlab.dms3.io/p2p/go-p2p-testing v0.0.1 h1:ygs+JIxfnLLtdtzTv7JQr7SiAgv+Lk6qpBHcNL37YWc=
 gitlab.dms3.io/p2p/go-p2p-testing v0.0.1/go.mod h1:Wy5MSYvMlDtf8GZ9rOdZm0Sxv57XCh1XqNI5z9E6JrU=
+gitlab.dms3.io/p2p/go-yamux/v2 v2.0.0 h1:KyrxDkqwBeNLlLteQGLJtPbKuYOMM5mJ+1UwI+IFl7A=
+gitlab.dms3.io/p2p/go-yamux/v2 v2.0.0/go.mod h1:+RHkU0NF5DxnUv6cOYeuWNcLlcBRP+Eo3zM2OTlk64Y=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=

stream.go

@@ -3,8 +3,8 @@ package sm_yamux
 import (
 	"time"
 
-	"github.com/libp2p/go-yamux/v2"
 	"gitlab.dms3.io/p2p/go-p2p-core/mux"
+	"gitlab.dms3.io/p2p/go-yamux/v2"
 )
 
 // stream implements mux.MuxedStream over yamux.Stream.

transport.go

@@ -4,8 +4,8 @@ import (
 	"io/ioutil"
 	"net"
 
-	"github.com/libp2p/go-yamux/v2"
 	mux "gitlab.dms3.io/p2p/go-p2p-core/mux"
+	"gitlab.dms3.io/p2p/go-yamux/v2"
 )
 
 var DefaultTransport *Transport