refactor after forking multiformats

go.mod

-module gitlab.dms3.io/dms3/public/go-dms3-routing
+module gitlab.dms3.io/dms3/go-dms3-routing
 
 go 1.15
 
 require (
 	github.com/gogo/protobuf v1.3.1
-	github.com/multiformats/go-multiaddr v0.3.1
 	github.com/multiformats/go-multihash v0.0.14
-	gitlab.dms3.io/dms3/public/go-cid v0.0.1
-	gitlab.dms3.io/dms3/public/go-datastore v0.0.1
-	gitlab.dms3.io/dms3/public/go-dms3-delay v0.0.1
-	gitlab.dms3.io/dms3/public/go-dms3-ds-help v0.0.2
-	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-p2p-core v0.0.1
-	gitlab.dms3.io/p2p/go-p2p-record v0.0.1
-	gitlab.dms3.io/p2p/go-p2p-testing v0.0.1
+	gitlab.dms3.io/dms3/go-cid v0.0.3
+	gitlab.dms3.io/dms3/go-datastore v0.0.2
+	gitlab.dms3.io/dms3/go-dms3-delay v0.0.2
+	gitlab.dms3.io/dms3/go-dms3-ds-help v0.0.3
+	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-p2p-core v0.0.2
+	gitlab.dms3.io/p2p/go-p2p-record v0.0.2
+	gitlab.dms3.io/p2p/go-p2p-testing v0.0.2
 )

go.sum

@@ -40,8 +40,6 @@ github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm4
 github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 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/goprocess v0.1.4 h1:DRGOFReOMqqDNXwW70QkacFW0YN9QnwLV0Vqk+3oU0o=
 github.com/jbenet/goprocess v0.1.4/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4=
@@ -57,7 +55,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/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 h1:MHkK1uRtFbVqvAgvWxafZe54+5uBxLluGylDiKgdhwo=
@@ -73,11 +70,6 @@ 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=
@@ -104,30 +96,32 @@ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0
 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-datastore v0.0.1 h1:RjZLvnqlvWDpb5ZwvkVEWGONF7zKNPe4Q0DND5oxZec=
-gitlab.dms3.io/dms3/public/go-datastore v0.0.1/go.mod h1:qSI0hpmVMo6HCp0uveHTKyQ87j1aVe2hqiTeiPCehYA=
-gitlab.dms3.io/dms3/public/go-dms3-delay v0.0.1 h1:WaE6RyFDr6hMSGtWtFTP8ffNYvlWN2RbZHlCsI6CVxc=
-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-ds-help v0.0.2 h1:SYgjiHzcpFBgabZhLVdfC4LPKjcQ/Lc8xgh3c3JsoFs=
-gitlab.dms3.io/dms3/public/go-dms3-ds-help v0.0.2/go.mod h1:szc3LU0qkzM55gKHJuGx2TU6tIn/4sRJt/ThZzffi9A=
-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-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-datastore v0.0.2 h1:cLsmDEiDz+onFnbPhyLYuPECw+tJEnvpil958ps0WHw=
+gitlab.dms3.io/dms3/go-datastore v0.0.2/go.mod h1:IOybd0feVxRiGt5idG/FzjdeK6itS0uaMgD42CmANFo=
+gitlab.dms3.io/dms3/go-dms3-delay v0.0.2 h1:+kwb2jAGjNAqzxpGl2EJYhD2Gadui5XoxHkR8AGo0aQ=
+gitlab.dms3.io/dms3/go-dms3-delay v0.0.2/go.mod h1:WPBu+WALc2GAYE3KfI5QM+r3dX9gv7wHJVfTFlYBwDg=
+gitlab.dms3.io/dms3/go-dms3-ds-help v0.0.3 h1:uSvksVjFcrItUWet55Lokpe5hez+zp4UE6aXeAZp73A=
+gitlab.dms3.io/dms3/go-dms3-ds-help v0.0.3/go.mod h1:mobOVtN8rkzaq3ZY/JSnaZxSL0A2N6gQlyGuAk9e6ug=
+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-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-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-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-record v0.0.1 h1:nE7/MeNH230XhdXDpywipolD5cGEaNS8O3IB3oL00/c=
-gitlab.dms3.io/p2p/go-p2p-record v0.0.1/go.mod h1:1UdB2d+qsd5kWGsxqvPujOghYhDWI7Ttdspo/U6ah74=
-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-record v0.0.2 h1:KnIBvn/lzQrmCfeU4n0YLa5TAxaVbexrC+UjGWkKr5g=
+gitlab.dms3.io/p2p/go-p2p-record v0.0.2/go.mod h1:O9mpqp2teeU/e5WTcHiLldzXXOtAADLG1S/0AYbj4pw=
+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/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=

mock/centralized_client.go

@@ -4,14 +4,14 @@ import (
 	"context"
 	"time"
 
-	cid "gitlab.dms3.io/dms3/public/go-cid"
-	logging "gitlab.dms3.io/dms3/public/go-log"
+	cid "gitlab.dms3.io/dms3/go-cid"
+	logging "gitlab.dms3.io/dms3/go-log"
 
 	"gitlab.dms3.io/p2p/go-p2p-core/peer"
 	"gitlab.dms3.io/p2p/go-p2p-core/routing"
 	tnet "gitlab.dms3.io/p2p/go-p2p-testing/net"
 
-	ma "github.com/multiformats/go-multiaddr"
+	ma "gitlab.dms3.io/mf/go-multiaddr"
 )
 
 var log = logging.Logger("mockrouter")

mock/centralized_server.go

@@ -6,14 +6,14 @@ import (
 	"sync"
 	"time"
 
-	cid "gitlab.dms3.io/dms3/public/go-cid"
-	ds "gitlab.dms3.io/dms3/public/go-datastore"
-	dssync "gitlab.dms3.io/dms3/public/go-datastore/sync"
+	cid "gitlab.dms3.io/dms3/go-cid"
+	ds "gitlab.dms3.io/dms3/go-datastore"
+	dssync "gitlab.dms3.io/dms3/go-datastore/sync"
 
 	"gitlab.dms3.io/p2p/go-p2p-core/peer"
 	tnet "gitlab.dms3.io/p2p/go-p2p-testing/net"
 
-	offline "gitlab.dms3.io/dms3/public/go-dms3-routing/offline"
+	offline "gitlab.dms3.io/dms3/go-dms3-routing/offline"
 )
 
 // server is the mockrouting.Client's private interface to the routing server

mock/centralized_test.go

@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
-	cid "gitlab.dms3.io/dms3/public/go-cid"
-	delay "gitlab.dms3.io/dms3/public/go-dms3-delay"
-	u "gitlab.dms3.io/dms3/public/go-dms3-util"
+	cid "gitlab.dms3.io/dms3/go-cid"
+	delay "gitlab.dms3.io/dms3/go-dms3-delay"
+	u "gitlab.dms3.io/dms3/go-dms3-util"
 
 	"gitlab.dms3.io/p2p/go-p2p-core/peer"
 	tnet "gitlab.dms3.io/p2p/go-p2p-testing/net"

mock/interface.go

@@ -7,8 +7,8 @@ package mockrouting
 import (
 	"context"
 
-	ds "gitlab.dms3.io/dms3/public/go-datastore"
-	delay "gitlab.dms3.io/dms3/public/go-dms3-delay"
+	ds "gitlab.dms3.io/dms3/go-datastore"
+	delay "gitlab.dms3.io/dms3/go-dms3-delay"
 
 	"gitlab.dms3.io/p2p/go-p2p-core/peer"
 	"gitlab.dms3.io/p2p/go-p2p-core/routing"

none/none_client.go

@@ -5,8 +5,8 @@ import (
 	"context"
 	"errors"
 
-	cid "gitlab.dms3.io/dms3/public/go-cid"
-	ds "gitlab.dms3.io/dms3/public/go-datastore"
+	cid "gitlab.dms3.io/dms3/go-cid"
+	ds "gitlab.dms3.io/dms3/go-datastore"
 
 	"gitlab.dms3.io/p2p/go-p2p-core/host"
 	"gitlab.dms3.io/p2p/go-p2p-core/peer"

offline/offline.go

@@ -9,9 +9,9 @@ import (
 	"time"
 
 	proto "github.com/gogo/protobuf/proto"
-	cid "gitlab.dms3.io/dms3/public/go-cid"
-	ds "gitlab.dms3.io/dms3/public/go-datastore"
-	dshelp "gitlab.dms3.io/dms3/public/go-dms3-ds-help"
+	cid "gitlab.dms3.io/dms3/go-cid"
+	ds "gitlab.dms3.io/dms3/go-datastore"
+	dshelp "gitlab.dms3.io/dms3/go-dms3-ds-help"
 
 	"gitlab.dms3.io/p2p/go-p2p-core/peer"
 	"gitlab.dms3.io/p2p/go-p2p-core/routing"

offline/offline_test.go

@@ -5,8 +5,8 @@ import (
 	"context"
 	"testing"
 
-	cid "gitlab.dms3.io/dms3/public/go-cid"
-	ds "gitlab.dms3.io/dms3/public/go-datastore"
+	cid "gitlab.dms3.io/dms3/go-cid"
+	ds "gitlab.dms3.io/dms3/go-datastore"
 
 	"gitlab.dms3.io/p2p/go-p2p-core/routing"
 	"gitlab.dms3.io/p2p/go-p2p-core/test"