From e0c189e5e9d00e1052b4c6051601fc05568128b5 Mon Sep 17 00:00:00 2001 From: gfanton <8671905+gfanton@users.noreply.github.com> Date: Tue, 8 Nov 2022 16:57:44 +0100 Subject: [PATCH] chore: fix import Signed-off-by: gfanton <8671905+gfanton@users.noreply.github.com> --- client.go | 6 +++--- client_test.go | 4 ++-- db/dbi.go | 2 +- db/sqlcipher/db.go | 2 +- db/sqlcipher/db_test.go | 2 +- db/sqlite/db.go | 2 +- db/sqlite/db_test.go | 2 +- discovery.go | 6 +++--- discovery_test.go | 6 +++--- go.mod | 5 +---- go.sum | 18 +++++++----------- pb/rendezvous.pb.go | 3 ++- proto.go | 4 ++-- svc.go | 6 +++--- svc_test.go | 6 +++--- sync_iface.go | 3 ++- sync_inmem_client.go | 6 +++--- sync_inmem_provider.go | 8 ++++---- sync_inmem_test.go | 2 +- test_utils/svc.go | 4 ++-- 20 files changed, 46 insertions(+), 51 deletions(-) diff --git a/client.go b/client.go index 40b44f4..03f5efd 100644 --- a/client.go +++ b/client.go @@ -7,9 +7,9 @@ import ( "time" ggio "github.com/gogo/protobuf/io" - "github.com/libp2p/go-libp2p-core/host" - inet "github.com/libp2p/go-libp2p-core/network" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/host" + inet "github.com/libp2p/go-libp2p/core/network" + "github.com/libp2p/go-libp2p/core/peer" pb "github.com/libp2p/go-libp2p-rendezvous/pb" ) diff --git a/client_test.go b/client_test.go index c43e6e4..7a45d2d 100644 --- a/client_test.go +++ b/client_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" - "github.com/libp2p/go-libp2p-core/host" "github.com/libp2p/go-libp2p-rendezvous/test_utils" + "github.com/libp2p/go-libp2p/core/host" ) func getRendezvousClients(t *testing.T, hosts []host.Host) []RendezvousClient { diff --git a/db/dbi.go b/db/dbi.go index 4da1810..1f9e0be 100644 --- a/db/dbi.go +++ b/db/dbi.go @@ -1,7 +1,7 @@ package dbi import ( - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" ) type RegistrationRecord struct { diff --git a/db/sqlcipher/db.go b/db/sqlcipher/db.go index 3178ab5..08aba29 100644 --- a/db/sqlcipher/db.go +++ b/db/sqlcipher/db.go @@ -16,7 +16,7 @@ import ( _ "github.com/mutecomm/go-sqlcipher/v4" logging "github.com/ipfs/go-log/v2" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" ) var log = logging.Logger("rendezvous/db") diff --git a/db/sqlcipher/db_test.go b/db/sqlcipher/db_test.go index a547982..b07d9f3 100644 --- a/db/sqlcipher/db_test.go +++ b/db/sqlcipher/db_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" ma "github.com/multiformats/go-multiaddr" ) diff --git a/db/sqlite/db.go b/db/sqlite/db.go index 203b355..fb1cf25 100644 --- a/db/sqlite/db.go +++ b/db/sqlite/db.go @@ -16,7 +16,7 @@ import ( _ "github.com/mattn/go-sqlite3" logging "github.com/ipfs/go-log/v2" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" ) var log = logging.Logger("rendezvous/db") diff --git a/db/sqlite/db_test.go b/db/sqlite/db_test.go index ac065db..4fdfb7e 100644 --- a/db/sqlite/db_test.go +++ b/db/sqlite/db_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" ma "github.com/multiformats/go-multiaddr" ) diff --git a/discovery.go b/discovery.go index dae1565..99a4fba 100644 --- a/discovery.go +++ b/discovery.go @@ -7,9 +7,9 @@ import ( "sync" "time" - "github.com/libp2p/go-libp2p-core/discovery" - "github.com/libp2p/go-libp2p-core/host" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/discovery" + "github.com/libp2p/go-libp2p/core/host" + "github.com/libp2p/go-libp2p/core/peer" ) type rendezvousDiscovery struct { diff --git a/discovery_test.go b/discovery_test.go index 6c41e05..4c6c3ab 100644 --- a/discovery_test.go +++ b/discovery_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/libp2p/go-libp2p-core/discovery" - "github.com/libp2p/go-libp2p-core/host" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/discovery" + "github.com/libp2p/go-libp2p/core/host" + "github.com/libp2p/go-libp2p/core/peer" mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" ) diff --git a/go.mod b/go.mod index 6ae0971..f2a40be 100644 --- a/go.mod +++ b/go.mod @@ -7,8 +7,7 @@ require ( github.com/golang/protobuf v1.5.2 github.com/google/uuid v1.3.0 github.com/ipfs/go-log/v2 v2.5.1 - github.com/libp2p/go-libp2p v0.23.0 - github.com/libp2p/go-libp2p-core v0.20.1 + github.com/libp2p/go-libp2p v0.23.3 github.com/mattn/go-sqlite3 v1.14.16 github.com/multiformats/go-multiaddr v0.7.0 github.com/mutecomm/go-sqlcipher/v4 v4.4.2 @@ -18,7 +17,6 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect - github.com/google/go-cmp v0.5.8 // indirect github.com/google/gopacket v1.1.19 // indirect github.com/huin/goupnp v1.0.3 // indirect github.com/ipfs/go-cid v0.3.2 // indirect @@ -59,7 +57,6 @@ require ( golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect golang.org/x/tools v0.1.12 // indirect google.golang.org/protobuf v1.28.1 // indirect - gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.1 // indirect lukechampine.com/blake3 v1.1.7 // indirect ) diff --git a/go.sum b/go.sum index 1d934d9..a6ba752 100644 --- a/go.sum +++ b/go.sum @@ -25,9 +25,8 @@ github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gopacket v1.1.17/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM= github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8= github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo= @@ -57,9 +56,8 @@ github.com/klauspost/cpuid/v2 v2.1.1/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8t github.com/koron/go-ssdp v0.0.0-20191105050749-2e1c40ed0b5d/go.mod h1:5Ky9EC2xfoUKUor0Hjgi2BJhCSXJfMOFlmyYrVKGQMk= github.com/koron/go-ssdp v0.0.3 h1:JivLMY45N76b4p/vsWGOKewBQu6uf39y8l+AQ7sDKx8= github.com/koron/go-ssdp v0.0.3/go.mod h1:b2MxI6yh02pKrsyNoQUsk4+YNikaGhe4894J+Q5lDvA= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= 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= @@ -68,12 +66,10 @@ github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QT github.com/libp2p/go-cidranger v1.1.0 h1:ewPN8EZ0dd1LSnrtuwd4709PXVcITVeuwbag38yPW7c= github.com/libp2p/go-cidranger v1.1.0/go.mod h1:KWZTfSr+r9qEo9OkI9/SIEeAtw+NNoU0dXIXt15Okic= github.com/libp2p/go-flow-metrics v0.1.0 h1:0iPhMI8PskQwzh57jB9WxIuIOQ0r+15PChFGkx3Q3WM= -github.com/libp2p/go-libp2p v0.23.0 h1:P3gFkqPevkWRKMiaI+tR5lNKyDbBllxUXYmD65JYTuA= -github.com/libp2p/go-libp2p v0.23.0/go.mod h1:7/xgogSbnOaGRlRbu4L0P1mVxC7xtLgk4suFhpag6cM= +github.com/libp2p/go-libp2p v0.23.3 h1:/n3i0VtJF0iZ9YMUxl/teOY3h+M8NfgaCjOSYr9D+uI= +github.com/libp2p/go-libp2p v0.23.3/go.mod h1:s9DEa5NLR4g+LZS+md5uGU4emjMWFiqkZr6hBTY8UxI= github.com/libp2p/go-libp2p-asn-util v0.2.0 h1:rg3+Os8jbnO5DxkC7K/Utdi+DkY3q/d1/1q+8WeNAsw= github.com/libp2p/go-libp2p-asn-util v0.2.0/go.mod h1:WoaWxbHKBymSN41hWSq/lGKJEca7TNm58+gGJi2WsLI= -github.com/libp2p/go-libp2p-core v0.20.1 h1:fQz4BJyIFmSZAiTbKV8qoYhEH5Dtv/cVhZbG3Ib/+Cw= -github.com/libp2p/go-libp2p-core v0.20.1/go.mod h1:6zR8H7CvQWgYLsbG4on6oLNSGcyKaYFSEYyDt51+bIY= github.com/libp2p/go-libp2p-testing v0.12.0 h1:EPvBb4kKMWO29qP4mZGyhVzUyR25dvfUIK5WDu6iPUA= github.com/libp2p/go-msgio v0.2.0 h1:W6shmB+FeynDrUVl2dgFQvzfBZcXiyqY4VmpQLu9FqU= github.com/libp2p/go-msgio v0.2.0/go.mod h1:dBVM1gW3Jk9XqHkU4eKdGvVHdLa51hoGfll6jMJMSlY= @@ -87,7 +83,7 @@ github.com/libp2p/go-openssl v0.1.0/go.mod h1:OiOxwPpL3n4xlenjx2h7AwSGaFSC/KZvf6 github.com/libp2p/go-reuseport v0.2.0 h1:18PRvIMlpY6ZK85nIAicSBuXXvrYoSw3dsBAR7zc560= github.com/libp2p/go-sockaddr v0.0.2/go.mod h1:syPvOmNs24S3dFVGJA1/mrqdeijPxLV2Le3BRLKd68k= github.com/libp2p/go-yamux/v4 v4.0.0 h1:+Y80dV2Yx/kv7Y7JKu0LECyVdMXm1VUoko+VQ9rBfZQ= -github.com/lucas-clemente/quic-go v0.29.0 h1:Vw0mGTfmWqGzh4jx/kMymsIkFK6rErFVmg+t9RLrnZE= +github.com/lucas-clemente/quic-go v0.29.1 h1:Z+WMJ++qMLhvpFkRZA+jl3BTxUjm415YBmWanXB8zP0= github.com/marten-seemann/qtls-go1-18 v0.1.2 h1:JH6jmzbduz0ITVQ7ShevK10Av5+jBEKAHMntXmIV7kM= github.com/marten-seemann/qtls-go1-19 v0.1.0 h1:rLFKD/9mp/uq1SYGYuVZhm83wkmU95pK5df3GufyYYU= github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd h1:br0buuQ854V8u83wA0rVZ8ttrq5CpaPZdvrK0LP2lOk= @@ -241,15 +237,15 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/pb/rendezvous.pb.go b/pb/rendezvous.pb.go index 4094695..e9b3d3f 100644 --- a/pb/rendezvous.pb.go +++ b/pb/rendezvous.pb.go @@ -5,10 +5,11 @@ package rendezvous_pb import ( fmt "fmt" - proto "github.com/golang/protobuf/proto" io "io" math "math" math_bits "math/bits" + + proto "github.com/golang/protobuf/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto.go b/proto.go index e8fbc91..02d6a52 100644 --- a/proto.go +++ b/proto.go @@ -8,8 +8,8 @@ import ( pb "github.com/libp2p/go-libp2p-rendezvous/pb" logging "github.com/ipfs/go-log/v2" - "github.com/libp2p/go-libp2p-core/peer" - "github.com/libp2p/go-libp2p-core/protocol" + "github.com/libp2p/go-libp2p/core/peer" + "github.com/libp2p/go-libp2p/core/protocol" ma "github.com/multiformats/go-multiaddr" ) diff --git a/svc.go b/svc.go index 5a1d1de..22ead3e 100644 --- a/svc.go +++ b/svc.go @@ -4,9 +4,9 @@ import ( "fmt" ggio "github.com/gogo/protobuf/io" - "github.com/libp2p/go-libp2p-core/host" - inet "github.com/libp2p/go-libp2p-core/network" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/host" + inet "github.com/libp2p/go-libp2p/core/network" + "github.com/libp2p/go-libp2p/core/peer" db "github.com/libp2p/go-libp2p-rendezvous/db" pb "github.com/libp2p/go-libp2p-rendezvous/pb" diff --git a/svc_test.go b/svc_test.go index 262e578..5b2c6b4 100644 --- a/svc_test.go +++ b/svc_test.go @@ -8,9 +8,9 @@ import ( "time" ggio "github.com/gogo/protobuf/io" - "github.com/libp2p/go-libp2p-core/host" - inet "github.com/libp2p/go-libp2p-core/network" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/host" + inet "github.com/libp2p/go-libp2p/core/network" + "github.com/libp2p/go-libp2p/core/peer" mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" db "github.com/libp2p/go-libp2p-rendezvous/db/sqlite" diff --git a/sync_iface.go b/sync_iface.go index 83e26da..d92e23b 100644 --- a/sync_iface.go +++ b/sync_iface.go @@ -2,7 +2,8 @@ package rendezvous import ( "context" - "github.com/libp2p/go-libp2p-core/peer" + + "github.com/libp2p/go-libp2p/core/peer" ) type RendezvousSync interface { diff --git a/sync_inmem_client.go b/sync_inmem_client.go index aed6fa4..d1de253 100644 --- a/sync_inmem_client.go +++ b/sync_inmem_client.go @@ -8,9 +8,9 @@ import ( ggio "github.com/gogo/protobuf/io" "github.com/google/uuid" - "github.com/libp2p/go-libp2p-core/host" - inet "github.com/libp2p/go-libp2p-core/network" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/host" + inet "github.com/libp2p/go-libp2p/core/network" + "github.com/libp2p/go-libp2p/core/peer" "github.com/multiformats/go-multiaddr" pb "github.com/libp2p/go-libp2p-rendezvous/pb" diff --git a/sync_inmem_provider.go b/sync_inmem_provider.go index b1ce7c7..1c82448 100644 --- a/sync_inmem_provider.go +++ b/sync_inmem_provider.go @@ -7,10 +7,10 @@ import ( "time" ggio "github.com/gogo/protobuf/io" - "github.com/libp2p/go-libp2p-core/host" - inet "github.com/libp2p/go-libp2p-core/network" - "github.com/libp2p/go-libp2p-core/peer" - "github.com/libp2p/go-libp2p-core/protocol" + "github.com/libp2p/go-libp2p/core/host" + inet "github.com/libp2p/go-libp2p/core/network" + "github.com/libp2p/go-libp2p/core/peer" + "github.com/libp2p/go-libp2p/core/protocol" pb "github.com/libp2p/go-libp2p-rendezvous/pb" ) diff --git a/sync_inmem_test.go b/sync_inmem_test.go index fc59dad..faac6d9 100644 --- a/sync_inmem_test.go +++ b/sync_inmem_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/libp2p/go-libp2p-core/host" rendezvous "github.com/libp2p/go-libp2p-rendezvous" db "github.com/libp2p/go-libp2p-rendezvous/db/sqlite" "github.com/libp2p/go-libp2p-rendezvous/test_utils" + "github.com/libp2p/go-libp2p/core/host" mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" ) diff --git a/test_utils/svc.go b/test_utils/svc.go index 86d98c4..375b09f 100644 --- a/test_utils/svc.go +++ b/test_utils/svc.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/libp2p/go-libp2p-core/host" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/host" + "github.com/libp2p/go-libp2p/core/peer" mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" "github.com/stretchr/testify/require" )