diff --git a/addrs.go b/addrs.go index 09f8df766c975d3b5c9da662aa0071f4b3713cf8..1bfd9114017cb2aa6f135e2a98641d959a11c23e 100644 --- a/addrs.go +++ b/addrs.go @@ -1,8 +1,8 @@ package swarm import ( - ma "github.com/multiformats/go-multiaddr" mamask "github.com/whyrusleeping/multiaddr-filter" + ma "gitlab.dms3.io/mf/go-multiaddr" ) // http://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml diff --git a/dial_error.go b/dial_error.go index 2ab764fb99cd8fbc446bf6b994fe5127f131fccc..a375555e2c5e14911c9dcd65900c3b712c37171e 100644 --- a/dial_error.go +++ b/dial_error.go @@ -7,7 +7,7 @@ import ( "gitlab.dms3.io/p2p/go-p2p-core/peer" - ma "github.com/multiformats/go-multiaddr" + ma "gitlab.dms3.io/mf/go-multiaddr" ) // maxDialDialErrors is the maximum number of dial errors we record diff --git a/dial_test.go b/dial_test.go index acd863f96b7d9664a11624e7ce717ee47d45fb47..1f56341d2d6c201a6582ed85f03406ed68ad9ec9 100644 --- a/dial_test.go +++ b/dial_test.go @@ -18,8 +18,8 @@ import ( swarmt "gitlab.dms3.io/p2p/go-p2p-swarm/testing" "gitlab.dms3.io/p2p/go-p2p-testing/ci" - 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" . "gitlab.dms3.io/p2p/go-p2p-swarm" ) diff --git a/go.mod b/go.mod index bc7e45b72c9e648d274a4b54bb2b116c28465ec4..0b7a9f09bdb96aa90e9daddcfdb0c9818a764bc9 100644 --- a/go.mod +++ b/go.mod @@ -4,20 +4,20 @@ go 1.15 require ( github.com/jbenet/goprocess v0.1.4 - github.com/multiformats/go-multiaddr v0.3.3 - github.com/multiformats/go-multiaddr-fmt v0.1.0 //github.com/prometheus/common v0.18.0 github.com/stretchr/testify v1.7.0 github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 - gitlab.dms3.io/dms3/public/go-log v0.0.1 - gitlab.dms3.io/p2p/go-conn-security-multistream v0.0.1 - gitlab.dms3.io/p2p/go-p2p-addrutil v0.0.2 - gitlab.dms3.io/p2p/go-p2p-core v0.0.1 - gitlab.dms3.io/p2p/go-p2p-peerstore v0.0.1 - gitlab.dms3.io/p2p/go-p2p-quic-transport v0.0.1 - gitlab.dms3.io/p2p/go-p2p-testing v0.0.1 - gitlab.dms3.io/p2p/go-p2p-transport-upgrader v0.0.1 - gitlab.dms3.io/p2p/go-p2p-yamux v0.0.2 - gitlab.dms3.io/p2p/go-stream-muxer-multistream v0.0.1 - gitlab.dms3.io/p2p/go-tcp-transport v0.0.1 + gitlab.dms3.io/dms3/go-log v0.0.2 + gitlab.dms3.io/mf/go-multiaddr v0.0.2 + gitlab.dms3.io/mf/go-multiaddr-fmt v0.0.1 + gitlab.dms3.io/p2p/go-conn-security-multistream v0.0.2 + gitlab.dms3.io/p2p/go-p2p-addrutil v0.0.3 + gitlab.dms3.io/p2p/go-p2p-core v0.0.2 + gitlab.dms3.io/p2p/go-p2p-peerstore v0.0.2 + gitlab.dms3.io/p2p/go-p2p-quic-transport v0.0.2 + gitlab.dms3.io/p2p/go-p2p-testing v0.0.2 + gitlab.dms3.io/p2p/go-p2p-transport-upgrader v0.0.2 + gitlab.dms3.io/p2p/go-p2p-yamux v0.0.3 + gitlab.dms3.io/p2p/go-stream-muxer-multistream v0.0.2 + gitlab.dms3.io/p2p/go-tcp-transport v0.0.2 ) diff --git a/go.sum b/go.sum index af3aa2e5d815555c15988c45b86531c8e6eeb5ac..70383a00fbe13f43cf472066a96f61d84bc25279 100644 --- a/go.sum +++ b/go.sum @@ -292,7 +292,6 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= 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= @@ -300,22 +299,13 @@ 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.0/go.mod h1:0nO36NvPpyV4QzvTLi/lafl2y95ncPj0vFwVF6k6wJ4= -github.com/multiformats/go-multiaddr v0.2.1/go.mod h1:s/Apk6IyxfvMjDafnhJgJ3/46z7tZ04iMk5wP4QMGGE= 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/go.mod h1:uPbspcUPd5AfaP6ql3ujFY+QWzmBD8uLLL4bXW0XfGc= -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 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E= -github.com/multiformats/go-multiaddr-fmt v0.1.0/go.mod h1:hGtDIW4PU4BqJ50gW2quDuPVjyWNZxToGUh/HwTZYJo= -github.com/multiformats/go-multiaddr-net v0.1.2/go.mod h1:QsWt3XK/3hwvNxZJp92iMQKME1qHfpYmyIjFVsSOY6Y= github.com/multiformats/go-multiaddr-net v0.2.0 h1:MSXRGN0mFymt6B1yo/6BPnIRpLPEnKgQNvVfCX5VDJk= 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.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/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc= github.com/multiformats/go-multihash v0.0.15 h1:hWOPdrNqDjwHDx82vsYGSDZNyktOJJ2dzZJzFkOV1jM= @@ -323,8 +313,6 @@ github.com/multiformats/go-multihash v0.0.15/go.mod h1:D6aZrWNLFTV/ynMpKsNtB40mJ github.com/multiformats/go-multistream v0.1.1/go.mod h1:KmHZ40hzVxiaiwlj3MEbYgK9JFk2/9UktWZAF54Du38= github.com/multiformats/go-multistream v0.2.1 h1:R5exp4cKvGlePuxg/bn4cnV53K4DxCe+uldxs7QzfrE= github.com/multiformats/go-multistream v0.2.1/go.mod h1:5GZPQZbkWOLOn3J2y4Y99vVW7vOfsAflxARk3x14o6k= -github.com/multiformats/go-varint v0.0.1/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= -github.com/multiformats/go-varint v0.0.2/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= github.com/multiformats/go-varint v0.0.6 h1:gk85QWKxh3TazbLxED/NlDVv8+q+ReFJk7Y2W/KhfNY= github.com/multiformats/go-varint v0.0.6/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= @@ -492,59 +480,73 @@ github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7/go. github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +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-dms3-delay v0.0.2/go.mod h1:WPBu+WALc2GAYE3KfI5QM+r3dX9gv7wHJVfTFlYBwDg= +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/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-dms3-delay v0.0.1/go.mod h1:Mg+buHOoh8UruN+MMqeqBUPBKMRTmpsXAyxv5ZSt+X4= -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/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 h1:rgX0NJwnjLUXA426H8la0BLxQLhCRcyzaZu5GX4Wsbc= +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-conn-security-multistream v0.0.1 h1:QTn1n+ZHRyXDxMn6Mw729hnV46wZ9gRr5JZLFV0FsTk= gitlab.dms3.io/p2p/go-conn-security-multistream v0.0.1/go.mod h1:SCdGUSFmCt+twk7CbulZ9DGdX7ab9PTJLtAkDPyDU2I= +gitlab.dms3.io/p2p/go-conn-security-multistream v0.0.2 h1:sYH5gW8N/Xyni1lA5h5tVqnJLOmevDy5csinG4tpcMQ= +gitlab.dms3.io/p2p/go-conn-security-multistream v0.0.2/go.mod h1:xZy3z0EGD3IPU1SjzKA4XJZzNPG5/gL73JK3b7WuQuQ= gitlab.dms3.io/p2p/go-flow-metrics v0.0.1 h1:Elax0cR4SUGUMMS9GfCzDHByNRPKUkG4YEAOv7gEHuY= 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 h1:btZSRSP181T6Ii3a5iJ6qeHdiPgPUdvowNH30Udl4J8= +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-netroute v0.0.1 h1:SJH1/YgST5q8823T0q/vj6OMaZ71dw+acgdJVQPbFtc= gitlab.dms3.io/p2p/go-netroute v0.0.1/go.mod h1:Ppim8kqanv6FEn5EL8G1mFRvdKG6i1ubfyK/vqfCMd8= 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-addrutil v0.0.2 h1:vzDpiEMmfzZzZHW0mYY62JRcsdOPQG9KuAEZUt6ysi4= -gitlab.dms3.io/p2p/go-p2p-addrutil v0.0.2/go.mod h1:yfmitlrMU52yOP+ZZJ17rj+U0Sggk8nb7tvF3TSdLxE= +gitlab.dms3.io/p2p/go-p2p-addrutil v0.0.3 h1:gTmbuNDjuvXzYFoUCx8ZshTTldTg9CV57uvc9daS4hA= +gitlab.dms3.io/p2p/go-p2p-addrutil v0.0.3/go.mod h1:fA5JiqzWbwjYhtzUOa5Ul/ofZnXbtjNaGWyvQOjAHHg= 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-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-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-quic-transport v0.0.1 h1:uOheTS6JJ/rafOUtq3sziHpuqEbI4d0tF/z19pg9YLg= -gitlab.dms3.io/p2p/go-p2p-quic-transport v0.0.1/go.mod h1:QuNhq8hSQA4+iLhoqe9BaN7jZ2JI9rv7UzAgoHGC1q0= +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-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= +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-quic-transport v0.0.2 h1:RFbo2tftK9rqpLUPdjMZz7HxqBM32/r1SO2potjwwSI= +gitlab.dms3.io/p2p/go-p2p-quic-transport v0.0.2/go.mod h1:G4tkjZ4lKjNSnPYS1PbYqIml3ZQ48KyIDhz4U91v904= 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-tls v0.0.1 h1:WZi3ay/i0OK8M7g29cD2Kr8nbN+njBD/u8Ww5SK6NH0= -gitlab.dms3.io/p2p/go-p2p-tls v0.0.1/go.mod h1:xjgCERRqNB3bHr8gzRlceJhQmybtxK3JXXrqHwblCec= -gitlab.dms3.io/p2p/go-p2p-transport-upgrader v0.0.1 h1:ZNSWc5UH+aKduy3/Gzhx6Q+XxGFv/nODCstDV0FFz+w= -gitlab.dms3.io/p2p/go-p2p-transport-upgrader v0.0.1/go.mod h1:yJ7+av8YB960D2ay6V/Sr1p1MwjkA8Nk/uvBrq8nqaw= -gitlab.dms3.io/p2p/go-p2p-yamux v0.0.2 h1:xL94g+l/rxEzF7bDMBCqFxwFk3IOzLD5vr5F8jsqteU= -gitlab.dms3.io/p2p/go-p2p-yamux v0.0.2/go.mod h1:DbFEK3F78tiwc9oj1tzjVfmUx5QDiYdZZNR4WvF0xbE= +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= +gitlab.dms3.io/p2p/go-p2p-tls v0.0.2 h1:Yi1r9AqDOigPmaY4oBrZvbMxgBiwvhJyHYeM5g5vp8I= +gitlab.dms3.io/p2p/go-p2p-tls v0.0.2/go.mod h1:vi2UEOaT1Q+g987bkBiaSnamdSyzZgHn88ZsAhZgN2o= +gitlab.dms3.io/p2p/go-p2p-transport-upgrader v0.0.2 h1:YgWZHt4fkBdAVdH6oU86jM6hgxsbeZYX/hm7xjPMOlA= +gitlab.dms3.io/p2p/go-p2p-transport-upgrader v0.0.2/go.mod h1:+iia44MgzuwSZCssqZ2CvVW8l/nVRYDNUVMB66TPz8Q= +gitlab.dms3.io/p2p/go-p2p-yamux v0.0.3 h1:YGHb5AcxmPFIzZUYsKkvi1ygJGJFIcub3j6aAg4eLbk= +gitlab.dms3.io/p2p/go-p2p-yamux v0.0.3/go.mod h1:3w5QQCPB3Yn8QSocKe62TNhUyNTMoUhyvg0HJsny+Iw= gitlab.dms3.io/p2p/go-reuseport v0.0.1 h1:2UyE9NOwOMgSx8Shitp9FM+QgUSC7y4SAvlnKpho0Xc= gitlab.dms3.io/p2p/go-reuseport v0.0.1/go.mod h1:T+dBjUvmAjEDJXLvO3lynKdo0cHmZ2uTRKGDnT6huZY= -gitlab.dms3.io/p2p/go-reuseport-transport v0.0.1 h1:C/7XSp+4RgyXbRsI0EI+i0BWLluktCDVGl/fG1gCBM4= -gitlab.dms3.io/p2p/go-reuseport-transport v0.0.1/go.mod h1:VW4Kp0KCKiXPI9ZHmgLZsG8Th2yOggHHoy5vyXlvEOY= +gitlab.dms3.io/p2p/go-reuseport-transport v0.0.2 h1:62Eu6+wb8c7Wfiw+qS+e3f298ornMz1XT9DISaU5EIk= +gitlab.dms3.io/p2p/go-reuseport-transport v0.0.2/go.mod h1:KTQdhF/NscZtgpHvWYtMZrE4XD7HB6y9fPMuQZX+kHc= gitlab.dms3.io/p2p/go-sockaddr v0.0.1 h1:VupmB55WkCvJxOveddXzkKadW/jtb9JEeA0Q572AWL4= gitlab.dms3.io/p2p/go-sockaddr v0.0.1/go.mod h1:g7iIq8MDEq2jtHLw5AlFNjEqAuer7C11HT0A77TlMik= -gitlab.dms3.io/p2p/go-stream-muxer-multistream v0.0.1 h1:2x8I26QQUs+AFnyDQpMFSIDfVPS2LbON8U1swGs1mkw= -gitlab.dms3.io/p2p/go-stream-muxer-multistream v0.0.1/go.mod h1:FlBuf7RTOg7zoZTBc0N4cfmqvXq+vO1LxL0r6kxIuLk= -gitlab.dms3.io/p2p/go-tcp-transport v0.0.1 h1:8qyjLdN0uf8LGpgcFotZyOYcT81gI4ozUg/hhEkthHk= -gitlab.dms3.io/p2p/go-tcp-transport v0.0.1/go.mod h1:klwhxCejDKY97ZQ8s82jFcIPl7CzL6AuqZkY8lX5N+0= +gitlab.dms3.io/p2p/go-stream-muxer-multistream v0.0.2 h1:I6jIBJsNMhJKBdD44InRMHGCfthVgrGZrqgr4hzVgyY= +gitlab.dms3.io/p2p/go-stream-muxer-multistream v0.0.2/go.mod h1:a9scy+6nGbVOVNXkJrP53UEPWgwW2GUw5v6xyQ/JOtk= +gitlab.dms3.io/p2p/go-tcp-transport v0.0.2 h1:Y8pLb7Pde2+WoKxobwymzyT0OxAD/LGeNSCr5/p0GWk= +gitlab.dms3.io/p2p/go-tcp-transport v0.0.2/go.mod h1:enLNmOWAlnh6Adv9H8gU8A5oa/xFxvDdjgo/JDsfxYY= 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.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= diff --git a/limiter.go b/limiter.go index 7959c06949fa19acf9ac989c90f540237e51cf7f..2b3a1d88ee964c45cefd2c62cded6c529d43d487 100644 --- a/limiter.go +++ b/limiter.go @@ -10,7 +10,7 @@ import ( "gitlab.dms3.io/p2p/go-p2p-core/peer" "gitlab.dms3.io/p2p/go-p2p-core/transport" - ma "github.com/multiformats/go-multiaddr" + ma "gitlab.dms3.io/mf/go-multiaddr" ) type dialResult struct { diff --git a/limiter_test.go b/limiter_test.go index d178312e4c1b495fadc2605183ff631da5f0718f..b6f44b8291487a7f0359d6f76ca82b6e4c904632 100644 --- a/limiter_test.go +++ b/limiter_test.go @@ -14,8 +14,8 @@ import ( "gitlab.dms3.io/p2p/go-p2p-core/test" "gitlab.dms3.io/p2p/go-p2p-core/transport" - ma "github.com/multiformats/go-multiaddr" - mafmt "github.com/multiformats/go-multiaddr-fmt" + ma "gitlab.dms3.io/mf/go-multiaddr" + mafmt "gitlab.dms3.io/mf/go-multiaddr-fmt" ) var isFdConsuming = func(addr ma.Multiaddr) bool { diff --git a/peers_test.go b/peers_test.go index 37c95cd691222fd56743e75866fd85f011edd8d7..c93c0f82180beb6bed34d37df17cc02041b95e5b 100644 --- a/peers_test.go +++ b/peers_test.go @@ -8,7 +8,7 @@ import ( "gitlab.dms3.io/p2p/go-p2p-core/peer" "gitlab.dms3.io/p2p/go-p2p-core/peerstore" - ma "github.com/multiformats/go-multiaddr" + ma "gitlab.dms3.io/mf/go-multiaddr" . "gitlab.dms3.io/p2p/go-p2p-swarm" ) diff --git a/simul_test.go b/simul_test.go index 45cedf886a2388fc61d2b85a8ca32f83e83a1db5..31e2d4b5608917cc66c087ab96080c6c1348d6a1 100644 --- a/simul_test.go +++ b/simul_test.go @@ -10,7 +10,7 @@ import ( "gitlab.dms3.io/p2p/go-p2p-core/peer" "gitlab.dms3.io/p2p/go-p2p-core/peerstore" - ma "github.com/multiformats/go-multiaddr" + ma "gitlab.dms3.io/mf/go-multiaddr" . "gitlab.dms3.io/p2p/go-p2p-swarm" swarmt "gitlab.dms3.io/p2p/go-p2p-swarm/testing" diff --git a/swarm.go b/swarm.go index f00fc2992cbaddfe967be89c9eb430a3854aba52..ee250bda153145a2d994f0936145eb6f9b46db9b 100644 --- a/swarm.go +++ b/swarm.go @@ -19,9 +19,9 @@ import ( "github.com/jbenet/goprocess" goprocessctx "github.com/jbenet/goprocess/context" - logging "gitlab.dms3.io/dms3/public/go-log" + logging "gitlab.dms3.io/dms3/go-log" - ma "github.com/multiformats/go-multiaddr" + ma "gitlab.dms3.io/mf/go-multiaddr" ) // DialTimeoutLocal is the maximum duration a Dial to local network address diff --git a/swarm_addr.go b/swarm_addr.go index a06ce72c5bc2a1d8181496eb6c6da35883080961..3cecb8794459c2082dfe161364b28bf5a25bd061 100644 --- a/swarm_addr.go +++ b/swarm_addr.go @@ -3,7 +3,7 @@ package swarm import ( "time" - ma "github.com/multiformats/go-multiaddr" + ma "gitlab.dms3.io/mf/go-multiaddr" addrutil "gitlab.dms3.io/p2p/go-p2p-addrutil" ) diff --git a/swarm_addr_test.go b/swarm_addr_test.go index 07f2ce231b016ecba470b398ca80cd1bb93697cb..bee24a074549ee9e6f28e8a038fc4ce5861e6e43 100644 --- a/swarm_addr_test.go +++ b/swarm_addr_test.go @@ -7,7 +7,7 @@ import ( "gitlab.dms3.io/p2p/go-p2p-core/peerstore" "gitlab.dms3.io/p2p/go-p2p-core/test" - ma "github.com/multiformats/go-multiaddr" + ma "gitlab.dms3.io/mf/go-multiaddr" swarmt "gitlab.dms3.io/p2p/go-p2p-swarm/testing" ) diff --git a/swarm_conn.go b/swarm_conn.go index 635cbd42bcce000166ba7e31718e475e74288295..fd5fa1176693a240a8f973ffc74a521cbe62e93a 100644 --- a/swarm_conn.go +++ b/swarm_conn.go @@ -14,7 +14,7 @@ import ( "gitlab.dms3.io/p2p/go-p2p-core/peer" "gitlab.dms3.io/p2p/go-p2p-core/transport" - ma "github.com/multiformats/go-multiaddr" + ma "gitlab.dms3.io/mf/go-multiaddr" ) // TODO: Put this elsewhere. diff --git a/swarm_dial.go b/swarm_dial.go index 37fd27d528360060cca8e8ed7bd09e541aef7c6b..613a2bd435bcfff94f5241b19db38278898db9f1 100644 --- a/swarm_dial.go +++ b/swarm_dial.go @@ -11,8 +11,8 @@ import ( "gitlab.dms3.io/p2p/go-p2p-core/peer" "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" addrutil "gitlab.dms3.io/p2p/go-p2p-addrutil" ) diff --git a/swarm_listen.go b/swarm_listen.go index c4eb0014bf310d5d1ecf004da5ebc3303fd6b3d4..781db12a2395e1f467d47899f86bf080617ba1d0 100644 --- a/swarm_listen.go +++ b/swarm_listen.go @@ -6,7 +6,7 @@ import ( "gitlab.dms3.io/p2p/go-p2p-core/network" - ma "github.com/multiformats/go-multiaddr" + ma "gitlab.dms3.io/mf/go-multiaddr" ) // Listen sets up listeners for all of the given addresses. diff --git a/swarm_notif_test.go b/swarm_notif_test.go index aed3262350194c3633ec8966a729a5353ae55b06..85de3e902141705c8fe0054045b3d3b9ab262398 100644 --- a/swarm_notif_test.go +++ b/swarm_notif_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" . "gitlab.dms3.io/p2p/go-p2p-swarm" ) diff --git a/swarm_test.go b/swarm_test.go index 06b7d99b868a29ec2487f2309cfbcbe2f768cfdc..f7145e57055df0f5ba5018c54a84a063e6b7f3f5 100644 --- a/swarm_test.go +++ b/swarm_test.go @@ -19,10 +19,10 @@ import ( . "gitlab.dms3.io/p2p/go-p2p-swarm" . "gitlab.dms3.io/p2p/go-p2p-swarm/testing" - ma "github.com/multiformats/go-multiaddr" - manet "github.com/multiformats/go-multiaddr/net" "github.com/stretchr/testify/require" - 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 log = logging.Logger("swarm_test") diff --git a/swarm_transport.go b/swarm_transport.go index d5a3f0d41b1165aa7957dbd204c3048a3ffb22ac..2356f819208a0d8e16fa286c66ea1e350788042b 100644 --- a/swarm_transport.go +++ b/swarm_transport.go @@ -6,7 +6,7 @@ import ( "gitlab.dms3.io/p2p/go-p2p-core/transport" - ma "github.com/multiformats/go-multiaddr" + ma "gitlab.dms3.io/mf/go-multiaddr" ) // TransportForDialing retrieves the appropriate transport for dialing the given diff --git a/testing/testing.go b/testing/testing.go index b72b540f0bad81db6cedfa6c79b6600ae9a5a648..7d5f75b115f30d18e3b93e56571110ed345424af 100644 --- a/testing/testing.go +++ b/testing/testing.go @@ -23,7 +23,7 @@ import ( "gitlab.dms3.io/p2p/go-tcp-transport" "github.com/jbenet/goprocess" - ma "github.com/multiformats/go-multiaddr" + ma "gitlab.dms3.io/mf/go-multiaddr" ) type config struct { diff --git a/transport_test.go b/transport_test.go index 612bac1832f589a8fe960b8b1dd2c7b4f385455a..73d570a61b24bb08013ee14d2d51d963fe0b5ef5 100644 --- a/transport_test.go +++ b/transport_test.go @@ -7,7 +7,7 @@ import ( swarm "gitlab.dms3.io/p2p/go-p2p-swarm" swarmt "gitlab.dms3.io/p2p/go-p2p-swarm/testing" - ma "github.com/multiformats/go-multiaddr" + ma "gitlab.dms3.io/mf/go-multiaddr" "gitlab.dms3.io/p2p/go-p2p-core/peer" "gitlab.dms3.io/p2p/go-p2p-core/transport" ) diff --git a/util_test.go b/util_test.go index 8ea89d81d961f750ee0cce1c4ff573072fc013b2..8ec6678d4921cb5b9be5820b68040c5f4b66ce8b 100644 --- a/util_test.go +++ b/util_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - ma "github.com/multiformats/go-multiaddr" + ma "gitlab.dms3.io/mf/go-multiaddr" "gitlab.dms3.io/p2p/go-p2p-core/test" "github.com/stretchr/testify/require"