refactor after forking multiformats

go.mod

@@ -2,15 +2,15 @@ module gitlab.dms3.io/p2p/go-p2p-kbucket
 
 require (
 	github.com/minio/sha256-simd v0.1.1
-	github.com/multiformats/go-multiaddr v0.3.3
 	github.com/multiformats/go-multihash v0.0.14
 	github.com/stretchr/testify v1.5.1
-	gitlab.dms3.io/dms3/public/go-dms3-util v0.0.1
-	gitlab.dms3.io/dms3/public/go-log v0.0.1
-	gitlab.dms3.io/p2p/go-cidranger v0.0.1
-	gitlab.dms3.io/p2p/go-p2p-asn-util v0.0.1
-	gitlab.dms3.io/p2p/go-p2p-core v0.0.1
-	gitlab.dms3.io/p2p/go-p2p-peerstore v0.0.1
+	gitlab.dms3.io/dms3/go-dms3-util v0.0.2
+	gitlab.dms3.io/dms3/go-log v0.0.2
+	gitlab.dms3.io/mf/go-multiaddr v0.0.2
+	gitlab.dms3.io/p2p/go-cidranger v0.0.2
+	gitlab.dms3.io/p2p/go-p2p-asn-util v0.0.2
+	gitlab.dms3.io/p2p/go-p2p-core v0.0.2
+	gitlab.dms3.io/p2p/go-p2p-peerstore v0.0.2
 )
 
 go 1.15

go.sum

@@ -45,8 +45,6 @@ github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uG
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-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/goprocess v0.1.4/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4=
 github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
@@ -60,7 +58,6 @@ github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn
 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/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 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=
@@ -70,7 +67,6 @@ github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mr-tron/base58 v1.1.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8=
-github.com/mr-tron/base58 v1.1.2/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/mr-tron/base58 v1.1.3/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
 github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
@@ -78,14 +74,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.1.1/go.mod h1:aMKBKNEYmzmDmxfX88/vz+J5IU55txyt0p4aiWVohjo=
-github.com/multiformats/go-multiaddr v0.2.2/go.mod h1:NtfXiOtHvghW9KojvtySjH5y0u0xW5UouOmQQrn6a3Y=
-github.com/multiformats/go-multiaddr v0.3.3 h1:vo2OTSAqnENB2rLk79pLtr+uhj+VAzSe3uef5q0lRSs=
-github.com/multiformats/go-multiaddr v0.3.3/go.mod h1:lCKNGP1EQ1eZ35Za2wlqnabm9xQkib3fyB+nZXHLag0=
-github.com/multiformats/go-multiaddr-fmt v0.1.0/go.mod h1:hGtDIW4PU4BqJ50gW2quDuPVjyWNZxToGUh/HwTZYJo=
 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.8/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
 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=
@@ -124,33 +114,36 @@ github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpP
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1/go.mod h1:8UvriyWtv5Q5EOgjHaSseUEdkQfvwFv1I/In/O2M9gc=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-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-datastore v0.0.1/go.mod h1:qSI0hpmVMo6HCp0uveHTKyQ87j1aVe2hqiTeiPCehYA=
-gitlab.dms3.io/dms3/public/go-detect-race v0.0.1 h1:njXKVicy8gRJxyKtG8znbzxpqzxDQBSlzlLTXOna2dU=
-gitlab.dms3.io/dms3/public/go-detect-race v0.0.1/go.mod h1:NcJv8mYRyNhzWxY9ry4uRt0iD+0f7AvunqCKLgqJpwI=
-gitlab.dms3.io/dms3/public/go-dms3-delay v0.0.1/go.mod h1:Mg+buHOoh8UruN+MMqeqBUPBKMRTmpsXAyxv5ZSt+X4=
-gitlab.dms3.io/dms3/public/go-dms3-util v0.0.1 h1:Gd+kJl1Rc+ZEUb9CIS1ZctQnF9G1oruNFyxUC//QBUQ=
-gitlab.dms3.io/dms3/public/go-dms3-util v0.0.1/go.mod h1:ymlwtzTNMq8Ug+gVtPAMxXKCKTXwXJAzXS+SUihfKgo=
-gitlab.dms3.io/dms3/public/go-ds-badger v0.0.1/go.mod h1:uTH9WzVQ4NC6XwwSIu7+NA2LTtzSIj6soXTJzg15D18=
-gitlab.dms3.io/dms3/public/go-ds-leveldb v0.0.1/go.mod h1:LrvzZvWXDJ+4nWOOkwjTOeynffSIBL9mSRPPXHtPy+U=
-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/public/go-log/v2 v2.0.0/go.mod h1:eIsr0zyB2Ny/Tu0TdTeI1CHMRwaBg3q58LL2PKxEk34=
+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-datastore v0.0.2/go.mod h1:IOybd0feVxRiGt5idG/FzjdeK6itS0uaMgD42CmANFo=
+gitlab.dms3.io/dms3/go-detect-race v0.0.3 h1:z174ts1AmdR+mTgGbU8WOUU1nA03UGogru5C1HlykTk=
+gitlab.dms3.io/dms3/go-detect-race v0.0.3/go.mod h1:WWTYJY6zfweMdzFsbxQ2Vxzn6mvvnGRkUT+l7duOI8Q=
+gitlab.dms3.io/dms3/go-dms3-delay v0.0.2/go.mod h1:WPBu+WALc2GAYE3KfI5QM+r3dX9gv7wHJVfTFlYBwDg=
+gitlab.dms3.io/dms3/go-dms3-util v0.0.2 h1:xXHeLaht5szd3QPdQp5KcfmXbIyRvRPSdQnMkJPRgPo=
+gitlab.dms3.io/dms3/go-dms3-util v0.0.2/go.mod h1:5hPwxzo5zK4NeHE/anWIQGHcIoG7aTl9/Pp0j2zg0l8=
+gitlab.dms3.io/dms3/go-ds-badger v0.0.2/go.mod h1:lPg8sF7fBTjUvh6edXwBwL7r7bacG3oV0rHiNNfd7r4=
+gitlab.dms3.io/dms3/go-ds-leveldb v0.0.2/go.mod h1:SWw3zbVmzPzYm/5AGDINZBa3pR8YEZoxdpqvvPkUO/U=
+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/dms3/go-log/v2 v2.0.1/go.mod h1:QNTmVEuz5pe4j73ve23UVWoiYW+ZBU8+bea5kX49W0k=
+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/mf/go-multiaddr-fmt v0.0.1/go.mod h1:IJHPnGlg0LS5nSWJW0tFX2VMDh9jjhetou42HElWdP4=
 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-cidranger v0.0.1 h1:zhadrhyY0vjccSDL9ll+BuuXd2H6G4H6Cyl9KvFUFQY=
-gitlab.dms3.io/p2p/go-cidranger v0.0.1/go.mod h1:A+ojkOQgs+1hYdTPhp0QS0L1pzHAIMDEejKAOyzyk3w=
-gitlab.dms3.io/p2p/go-flow-metrics v0.0.1/go.mod h1:0QFTYtRYP6Y1xfK0xycr40drfoM+0WVCoOXPyI0eFN0=
+gitlab.dms3.io/p2p/go-cidranger v0.0.2 h1://ICzOsYZE4sThdciNz2MT5lGG0ewHG5Ua6PcPE1NC0=
+gitlab.dms3.io/p2p/go-cidranger v0.0.2/go.mod h1:14Y6iX0SfU/5unBvOlnbBNPCbm2MkRCCRj2PeMveC3M=
+gitlab.dms3.io/p2p/go-flow-metrics v0.0.2/go.mod h1:0QFTYtRYP6Y1xfK0xycr40drfoM+0WVCoOXPyI0eFN0=
 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-asn-util v0.0.1 h1:NG9FJ8ULKjZPwMIcX3t7PFaytvwQ8Aq9RM3CmmqbhaY=
-gitlab.dms3.io/p2p/go-p2p-asn-util v0.0.1/go.mod h1:afz4ATHHcBX4kT2aKPaAikIznva/oKjWAKBvgdYlHn4=
-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-peerstore v0.0.1 h1:WI+6NbzVPKGZRWsyR5/bHdWoGZS/Kv0dvGwA43ELTFY=
-gitlab.dms3.io/p2p/go-p2p-peerstore v0.0.1/go.mod h1:2bhIM7r06lYnk/stpTsPN6N+IslVu3TE3Dba6KsqXZo=
+gitlab.dms3.io/p2p/go-p2p-asn-util v0.0.2 h1:s/t2uQNQyqIwaoWkNDGoeQC+KtA759c79u3gRZU4Gas=
+gitlab.dms3.io/p2p/go-p2p-asn-util v0.0.2/go.mod h1:8iKdO/mNVGcq4lbnOmHn50+GSlHbpE3KrjxgOczhQm0=
+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-peerstore v0.0.2 h1:unnuqUTlAKZC1aka5MRGM+vzSu2Ky84+dotSo6/VyiQ=
+gitlab.dms3.io/p2p/go-p2p-peerstore v0.0.2/go.mod h1:axBxiEgIlhQwLjBJh/6tE5mCSJK8+BL/wDAIExRC+ko=
 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=

keyspace/xor.go

@@ -6,7 +6,7 @@ import (
 	"math/bits"
 
 	sha256 "github.com/minio/sha256-simd"
-	u "gitlab.dms3.io/dms3/public/go-dms3-util"
+	u "gitlab.dms3.io/dms3/go-dms3-util"
 )
 
 // XORKeySpace is a KeySpace which:

keyspace/xor_test.go

@@ -5,7 +5,7 @@ import (
 	"math/big"
 	"testing"
 
-	u "gitlab.dms3.io/dms3/public/go-dms3-util"
+	u "gitlab.dms3.io/dms3/go-dms3-util"
 )
 
 func TestPrefixLen(t *testing.T) {

peerdiversity/filter.go

@@ -12,9 +12,9 @@ import (
 	"gitlab.dms3.io/p2p/go-cidranger"
 	asnutil "gitlab.dms3.io/p2p/go-p2p-asn-util"
 
-	ma "github.com/multiformats/go-multiaddr"
-	manet "github.com/multiformats/go-multiaddr/net"
-	logging "gitlab.dms3.io/dms3/public/go-log"
+	logging "gitlab.dms3.io/dms3/go-log"
+	ma "gitlab.dms3.io/mf/go-multiaddr"
+	manet "gitlab.dms3.io/mf/go-multiaddr/net"
 )
 
 var dfLog = logging.Logger("diversityFilter")

peerdiversity/filter_test.go

@@ -7,8 +7,8 @@ import (
 
 	"gitlab.dms3.io/p2p/go-p2p-core/peer"
 
-	ma "github.com/multiformats/go-multiaddr"
 	"github.com/stretchr/testify/require"
+	ma "gitlab.dms3.io/mf/go-multiaddr"
 )
 
 var _ PeerIPGroupFilter = (*mockPeerGroupFilter)(nil)

table.go

@@ -13,7 +13,7 @@ import (
 
 	"gitlab.dms3.io/p2p/go-p2p-kbucket/peerdiversity"
 
-	logging "gitlab.dms3.io/dms3/public/go-log"
+	logging "gitlab.dms3.io/dms3/go-log"
 )
 
 var log = logging.Logger("table")

table_test.go

@@ -11,8 +11,8 @@ import (
 	"gitlab.dms3.io/p2p/go-p2p-kbucket/peerdiversity"
 	pstore "gitlab.dms3.io/p2p/go-p2p-peerstore"
 
-	ma "github.com/multiformats/go-multiaddr"
 	"github.com/stretchr/testify/require"
+	ma "gitlab.dms3.io/mf/go-multiaddr"
 )
 
 var NoOpThreshold = 100 * time.Hour

util.go

@@ -7,7 +7,7 @@ import (
 	ks "gitlab.dms3.io/p2p/go-p2p-kbucket/keyspace"
 
 	"github.com/minio/sha256-simd"
-	u "gitlab.dms3.io/dms3/public/go-dms3-util"
+	u "gitlab.dms3.io/dms3/go-dms3-util"
 )
 
 // Returned if a routing table query returns no results. This is NOT expected