Merge branch 'port-2021-07-03'

gater_test.go

@@ -8,7 +8,7 @@ import (
 	"gitlab.dms3.io/p2p/go-p2p-core/network"
 	"gitlab.dms3.io/p2p/go-p2p-core/peer"
 
-	ma "github.com/multiformats/go-multiaddr"
+	ma "gitlab.dms3.io/mf/go-multiaddr"
 )
 
 type testGater struct {

go.mod

@@ -4,10 +4,10 @@ go 1.15
 
 require (
 	github.com/jbenet/go-temp-err-catcher v0.1.0
-	github.com/multiformats/go-multiaddr v0.3.1
 	github.com/stretchr/testify v1.4.0
-	gitlab.dms3.io/dms3/public/go-log v0.0.1
-	gitlab.dms3.io/p2p/go-p2p-core v0.0.1
-	gitlab.dms3.io/p2p/go-p2p-mplex v0.0.1
-	gitlab.dms3.io/p2p/go-p2p-pnet v0.0.1
+	gitlab.dms3.io/dms3/go-log v0.0.2
+	gitlab.dms3.io/mf/go-multiaddr v0.0.2
+	gitlab.dms3.io/p2p/go-p2p-core v0.0.2
+	gitlab.dms3.io/p2p/go-p2p-mplex v0.0.2
+	gitlab.dms3.io/p2p/go-p2p-pnet v0.0.2
 )

go.sum

@@ -39,8 +39,6 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/ipfs/go-cid v0.0.7 h1:ysQJVJA3fNDF1qigJbsSQOdjhVLsOEoPdh0+R97k3jY=
-github.com/ipfs/go-cid v0.0.7/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I=
 github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA=
 github.com/jbenet/go-temp-err-catcher v0.1.0 h1:zpb3ZH6wIE8Shj2sKS+khgRvf7T7RABoLk/+KKHggpk=
 github.com/jbenet/go-temp-err-catcher v0.1.0/go.mod h1:0kJRvmDZXNMIiJirNPEYfhpPwbGVtZVWC34vc5WLsDk=
@@ -56,7 +54,6 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/libp2p/go-maddr-filter v0.1.0/go.mod h1:VzZhTXkMucEGGEOSKddrwGiOv0tUhgnKqNEmIAz/bPU=
 github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0OXOcUbGjvZxxijuBwbbmlSxLiuofa+g=
 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=
@@ -70,14 +67,8 @@ github.com/multiformats/go-base32 v0.0.3 h1:tw5+NhuwaOjJCC5Pp82QuXbrmLzWg7uxlMFp
 github.com/multiformats/go-base32 v0.0.3/go.mod h1:pLiuGC8y0QR3Ue4Zug5UzK9LjgbkL8NSQj0zQ5Nz/AA=
 github.com/multiformats/go-base36 v0.1.0 h1:JR6TyF7JjGd3m6FbLU2cOxhC0Li8z8dLNGQ89tUg4F4=
 github.com/multiformats/go-base36 v0.1.0/go.mod h1:kFGE83c6s80PklsHO9sRn2NCoffoRdUUOENyW/Vv6sM=
-github.com/multiformats/go-multiaddr v0.2.2/go.mod h1:NtfXiOtHvghW9KojvtySjH5y0u0xW5UouOmQQrn6a3Y=
-github.com/multiformats/go-multiaddr v0.3.0/go.mod h1:dF9kph9wfJ+3VLAaeBqo9Of8x4fJxp6ggJGteB8HQTI=
-github.com/multiformats/go-multiaddr v0.3.1 h1:1bxa+W7j9wZKTZREySx1vPMs2TqrYWjVZ7zE6/XLG1I=
-github.com/multiformats/go-multiaddr v0.3.1/go.mod h1:uPbspcUPd5AfaP6ql3ujFY+QWzmBD8uLLL4bXW0XfGc=
-github.com/multiformats/go-multiaddr-net v0.2.0/go.mod h1:gGdH3UXny6U3cKKYCvpXI5rnK7YaOIEOPVDI9tsJbEA=
 github.com/multiformats/go-multibase v0.0.3 h1:l/B6bJDQjvQ5G52jw4QGSYeOTZoAwIO77RblWplfIqk=
 github.com/multiformats/go-multibase v0.0.3/go.mod h1:5+1R4eQrT3PkYZ24C3W2Ue2tPwIdYQD509ZjSb5y9Oc=
-github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
 github.com/multiformats/go-multihash v0.0.14 h1:QoBceQYQQtNUuf6s7wHxnE2c8bhbMqhfGzNI032se/I=
 github.com/multiformats/go-multihash v0.0.14/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
 github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
@@ -100,27 +91,29 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-gitlab.dms3.io/dms3/public/go-cid v0.0.1 h1:qs4dtkDigcLGY/58dIZaFjKLt+orrTcmTBvtqaM3570=
-gitlab.dms3.io/dms3/public/go-cid v0.0.1/go.mod h1:GQw3gc4CSrFY+aX6M+OBQDlg0p5/eQJoRrayaZzkAOQ=
-gitlab.dms3.io/dms3/public/go-log v0.0.1 h1:jqz2g8pVdPW+Sy8CCo4rYfGEjktGhCBfgIb3oeY6yx8=
-gitlab.dms3.io/dms3/public/go-log v0.0.1/go.mod h1:OsyF7lVYe47r03v1ZCbrmz0byeGUWB0Y219jN1DJx3s=
+gitlab.dms3.io/dms3/go-cid v0.0.3 h1:5qZ1sl1Bi26naLz7Vsc8fjWcJKX8bR6njt3WPCteXac=
+gitlab.dms3.io/dms3/go-cid v0.0.3/go.mod h1:qT/Q1NZD31UnWQ+rwsQgzGrrsQhpq7dYSlXf7ulDgtk=
+gitlab.dms3.io/dms3/go-log v0.0.2 h1:vuNG5qmx6P9iK+A1+k4AmC6Q+ORm2ekWaQVbMmeL2wc=
+gitlab.dms3.io/dms3/go-log v0.0.2/go.mod h1:iLuW2zqJJaP1WdbME4P6AS9AIMovwGDAn3zV/riR5iE=
+gitlab.dms3.io/mf/go-multiaddr v0.0.2 h1:MZSIKYi5qBk5iurELtESiTsczdXauQhaqKOnk9vMJfI=
+gitlab.dms3.io/mf/go-multiaddr v0.0.2/go.mod h1:BMNP0l/IA8/dbE6vNBf/ben61YNaPU0kn6wXgqZs9vU=
 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-mplex v0.0.1 h1:U6s3YoddoXmiZF5TEQRRVUd0cwefZPCtUDkhtIzlLmY=
-gitlab.dms3.io/p2p/go-mplex v0.0.1/go.mod h1:1wv8JOAbNlhSTCOWLTrWqdZBagdh7REbYiwZQ0am+30=
+gitlab.dms3.io/p2p/go-flow-metrics v0.0.2/go.mod h1:0QFTYtRYP6Y1xfK0xycr40drfoM+0WVCoOXPyI0eFN0=
+gitlab.dms3.io/p2p/go-mplex v0.0.2 h1:H6IJCR9SIjM5W5uXe2HYAectN1HTJu/+eWkj0SkbZRY=
+gitlab.dms3.io/p2p/go-mplex v0.0.2/go.mod h1:xybsl2Yr4EXk0OKjB8xt7Fn6GhHQfUYe63tbTmxKvNM=
 gitlab.dms3.io/p2p/go-msgio v0.0.1 h1:Yh+40UhoamgwL8J3PD8wezS1ottJGHHwVdp/d1vIWZA=
 gitlab.dms3.io/p2p/go-msgio v0.0.1/go.mod h1:H6AqMy1HOxZb+yEXj2d3o4wgWb+lJx9aYI+nWka46T0=
 gitlab.dms3.io/p2p/go-openssl v0.0.1 h1:BC9zzxiRliZmWNpxQQX37DDkmKpR2rXNUkwxRT0f6NI=
 gitlab.dms3.io/p2p/go-openssl v0.0.1/go.mod h1:aQ3IGGzTd5vw48HiiXv6z6sFKiB52w2jZdg2TFNjylA=
-gitlab.dms3.io/p2p/go-p2p-core v0.0.1 h1:ENn1teKT3rq5v5BN0y4hRWP3rjKEZbOCiwUI1t8CiGI=
-gitlab.dms3.io/p2p/go-p2p-core v0.0.1/go.mod h1:xm5X+ChR6cZDKYaIDSmuCs6Uvd1GtbDy47xXjCljBAk=
-gitlab.dms3.io/p2p/go-p2p-mplex v0.0.1 h1:umePc6wXeP7T9Y0EKOdaiuliVawVDM8euNNL5g8Fwg0=
-gitlab.dms3.io/p2p/go-p2p-mplex v0.0.1/go.mod h1:iW5naFZ8U9XjwcX8gzkQzUiTCH7l1fgXpQlPHAypnP0=
-gitlab.dms3.io/p2p/go-p2p-pnet v0.0.1 h1:IpKT0i694bzYGbml81t0uOa8ihrtsR8z3dR9BN5T1LU=
-gitlab.dms3.io/p2p/go-p2p-pnet v0.0.1/go.mod h1:+7VrE3IPZMnD9nJeUtQUjbTOVIyy5wJ36CnTHk2dTJQ=
-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-p2p-core v0.0.2 h1:mMe0MmJaiG4zzDSc2u6BwXeZ4o5P5EuRM4maXL0AP5Q=
+gitlab.dms3.io/p2p/go-p2p-core v0.0.2/go.mod h1:V4Oqm6ZHKOwCcf0tkBJBomlztwnytpABtOsQIeD676E=
+gitlab.dms3.io/p2p/go-p2p-mplex v0.0.2 h1:bgDSuMuzesrMqLfromBUlSxX8W4Kmnw62Y0ceRFzpSQ=
+gitlab.dms3.io/p2p/go-p2p-mplex v0.0.2/go.mod h1:bohexmBfoDjkqd2zx5s+uYsb066m3gPcppRGq4c8SIw=
+gitlab.dms3.io/p2p/go-p2p-pnet v0.0.2 h1:8DK7on8L18v+zkxhP9cuO+99Xz07s3quY7s1Ni/OtJk=
+gitlab.dms3.io/p2p/go-p2p-pnet v0.0.2/go.mod h1:VRKLLhFhnX6+1CZVNJBGm05mcnm5VJSHgn9ISmG6pME=
+gitlab.dms3.io/p2p/go-p2p-testing v0.0.2 h1:mAAzsnTbNDDXToKxAWs1dSJTFcG8jO4vwmgg/JRYdCE=
+gitlab.dms3.io/p2p/go-p2p-testing v0.0.2/go.mod h1:2PatJW3XwpOT2bxlR3Q9IqBuwZaMN483guaseyQkdZk=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

listener.go

@@ -6,8 +6,8 @@ import (
 	"sync"
 
 	tec "github.com/jbenet/go-temp-err-catcher"
-	manet "github.com/multiformats/go-multiaddr/net"
-	logging "gitlab.dms3.io/dms3/public/go-log"
+	logging "gitlab.dms3.io/dms3/go-log"
+	manet "gitlab.dms3.io/mf/go-multiaddr/net"
 	"gitlab.dms3.io/p2p/go-p2p-core/transport"
 )
 

listener_test.go

@@ -14,8 +14,8 @@ import (
 	"gitlab.dms3.io/p2p/go-p2p-core/sec/insecure"
 	"gitlab.dms3.io/p2p/go-p2p-core/transport"
 
-	ma "github.com/multiformats/go-multiaddr"
-	manet "github.com/multiformats/go-multiaddr/net"
+	ma "gitlab.dms3.io/mf/go-multiaddr"
+	manet "gitlab.dms3.io/mf/go-multiaddr/net"
 	st "gitlab.dms3.io/p2p/go-p2p-transport-upgrader"
 
 	"github.com/stretchr/testify/require"

upgrader.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"net"
 
-	manet "github.com/multiformats/go-multiaddr/net"
+	manet "gitlab.dms3.io/mf/go-multiaddr/net"
 	"gitlab.dms3.io/p2p/go-p2p-core/connmgr"
 	"gitlab.dms3.io/p2p/go-p2p-core/mux"
 	"gitlab.dms3.io/p2p/go-p2p-core/network"

upgrader_test.go

@@ -11,8 +11,8 @@ import (
 	"gitlab.dms3.io/p2p/go-p2p-core/sec/insecure"
 	"gitlab.dms3.io/p2p/go-p2p-core/transport"
 
-	ma "github.com/multiformats/go-multiaddr"
-	manet "github.com/multiformats/go-multiaddr/net"
+	ma "gitlab.dms3.io/mf/go-multiaddr"
+	manet "gitlab.dms3.io/mf/go-multiaddr/net"
 	mplex "gitlab.dms3.io/p2p/go-p2p-mplex"
 
 	st "gitlab.dms3.io/p2p/go-p2p-transport-upgrader"