From 120a585ebf6a122404061329621255f5c2efc3f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Kripalani?= Date: Tue, 12 Feb 2019 14:12:53 +0000 Subject: [PATCH 1/2] Revert "Test go mod in travis and use major versioning in import paths (#236)" This reverts commit 7e68ac3c60c15243c7d2e622b91aed92245a2677. --- .travis.yml | 21 +++++---------------- Makefile | 3 --- dht.go | 6 +++--- dht_net.go | 2 +- dht_test.go | 4 ++-- ext_test.go | 2 +- go.mod | 4 ++-- go.sum | 4 ++-- handlers.go | 2 +- lookup.go | 2 +- package.json | 1 + routing.go | 2 +- 12 files changed, 20 insertions(+), 33 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5d4aa9eb4..97207415c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,25 +11,14 @@ env: go: - 1.11.x -install: true - -jobs: - include: - - stage: "build and test" - name: "gx" - script: - - make deps - - bash <(curl -s https://github.com/raw/ipfs/ci-helpers/master/travis-ci/run-standard-tests.sh) - - - name: "go mod" - script: - - export GO111MODULE=on - - make mod_deps - - bash <(curl -s https://github.com/raw/ipfs/ci-helpers/master/travis-ci/run-standard-tests.sh) +install: + - make deps + +script: + - bash <(curl -s https://github.com/raw/ipfs/ci-helpers/master/travis-ci/run-standard-tests.sh) cache: directories: - - $GOPATH/pkg/mod - $GOPATH/src/gx notifications: diff --git a/Makefile b/Makefile index b1b62d7cd..d6680bd02 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,3 @@ deps: gx publish: gx-go rewrite --undo - -mod_deps: - env GO111MODULE=on go mod download diff --git a/dht.go b/dht.go index 1206f30b2..11a94bd06 100644 --- a/dht.go +++ b/dht.go @@ -8,9 +8,9 @@ import ( "sync" "time" - opts "github.com/libp2p/go-libp2p-kad-dht/v5/opts" - pb "github.com/libp2p/go-libp2p-kad-dht/v5/pb" - providers "github.com/libp2p/go-libp2p-kad-dht/v5/providers" + opts "github.com/libp2p/go-libp2p-kad-dht/opts" + pb "github.com/libp2p/go-libp2p-kad-dht/pb" + providers "github.com/libp2p/go-libp2p-kad-dht/providers" proto "github.com/gogo/protobuf/proto" cid "github.com/ipfs/go-cid" diff --git a/dht_net.go b/dht_net.go index d9640a82d..4709c9828 100644 --- a/dht_net.go +++ b/dht_net.go @@ -10,7 +10,7 @@ import ( ggio "github.com/gogo/protobuf/io" ctxio "github.com/jbenet/go-context/io" - pb "github.com/libp2p/go-libp2p-kad-dht/v5/pb" + pb "github.com/libp2p/go-libp2p-kad-dht/pb" inet "github.com/libp2p/go-libp2p-net" peer "github.com/libp2p/go-libp2p-peer" ) diff --git a/dht_test.go b/dht_test.go index 42207bfb7..2e5196120 100644 --- a/dht_test.go +++ b/dht_test.go @@ -14,8 +14,8 @@ import ( "testing" "time" - opts "github.com/libp2p/go-libp2p-kad-dht/v5/opts" - pb "github.com/libp2p/go-libp2p-kad-dht/v5/pb" + opts "github.com/libp2p/go-libp2p-kad-dht/opts" + pb "github.com/libp2p/go-libp2p-kad-dht/pb" cid "github.com/ipfs/go-cid" u "github.com/ipfs/go-ipfs-util" diff --git a/ext_test.go b/ext_test.go index 40da4b2d3..1612d9802 100644 --- a/ext_test.go +++ b/ext_test.go @@ -8,7 +8,7 @@ import ( ggio "github.com/gogo/protobuf/io" u "github.com/ipfs/go-ipfs-util" - pb "github.com/libp2p/go-libp2p-kad-dht/v5/pb" + pb "github.com/libp2p/go-libp2p-kad-dht/pb" inet "github.com/libp2p/go-libp2p-net" pstore "github.com/libp2p/go-libp2p-peerstore" record "github.com/libp2p/go-libp2p-record" diff --git a/go.mod b/go.mod index 686de4e4c..93b45e5fd 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/libp2p/go-libp2p-kad-dht/v5 +module github.com/libp2p/go-libp2p-kad-dht require ( github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect @@ -22,7 +22,7 @@ require ( github.com/jbenet/goprocess v0.0.0-20160826012719-b497e2f366b8 github.com/kr/pretty v0.1.0 // indirect github.com/libp2p/go-addr-util v2.0.7+incompatible // indirect - github.com/libp2p/go-buffer-pool v0.1.3 // indirect + github.com/libp2p/go-buffer-pool v0.1.1 // indirect github.com/libp2p/go-conn-security v0.1.15 // indirect github.com/libp2p/go-conn-security-multistream v0.1.15 // indirect github.com/libp2p/go-flow-metrics v0.2.0 // indirect diff --git a/go.sum b/go.sum index fba1f66f0..e0abb53a9 100644 --- a/go.sum +++ b/go.sum @@ -71,8 +71,8 @@ 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-addr-util v2.0.7+incompatible h1:Su3MLsvDzl7afq0Z99sCjQxhrjOpf/dVBIWOBur9qlY= github.com/libp2p/go-addr-util v2.0.7+incompatible/go.mod h1:doh2auL/Rkfq1xHxDrWJGHZ8yDojPerOZoPu9XVwRB8= -github.com/libp2p/go-buffer-pool v0.1.3 h1:L0rKTSV7CdgVzxqP75+6AmJsjkvyM+xY8BCcoR9XLLw= -github.com/libp2p/go-buffer-pool v0.1.3/go.mod h1:xtyIz9PMobb13WaxR6Zo1Pd1zXJKYg0a8KiIvDp3TzQ= +github.com/libp2p/go-buffer-pool v0.1.1 h1:G2HLfT76cZIb1x6jPJ3E14um5SzHn/fea4kMgNDPOuU= +github.com/libp2p/go-buffer-pool v0.1.1/go.mod h1:xtyIz9PMobb13WaxR6Zo1Pd1zXJKYg0a8KiIvDp3TzQ= github.com/libp2p/go-conn-security v0.1.15 h1:Ohx7vYeje1Wal+eIBUkejcaQPhVjOAZveXoFmo5pArA= github.com/libp2p/go-conn-security v0.1.15/go.mod h1:lIqm8x2wrAxlG+6CzJ3z4Nk5/F73zdjkS6RKbHSbaJ4= github.com/libp2p/go-conn-security-multistream v0.1.15 h1:ZpIz9u+000dcUM4+S65rUfjSmwKNFFND+MFSLH0z6oc= diff --git a/handlers.go b/handlers.go index e4c6ec2cb..2d06617c5 100644 --- a/handlers.go +++ b/handlers.go @@ -11,7 +11,7 @@ import ( cid "github.com/ipfs/go-cid" ds "github.com/ipfs/go-datastore" u "github.com/ipfs/go-ipfs-util" - pb "github.com/libp2p/go-libp2p-kad-dht/v5/pb" + pb "github.com/libp2p/go-libp2p-kad-dht/pb" inet "github.com/libp2p/go-libp2p-net" peer "github.com/libp2p/go-libp2p-peer" pstore "github.com/libp2p/go-libp2p-peerstore" diff --git a/lookup.go b/lookup.go index e49aff0d7..9d482292a 100644 --- a/lookup.go +++ b/lookup.go @@ -7,7 +7,7 @@ import ( cid "github.com/ipfs/go-cid" logging "github.com/ipfs/go-log" - pb "github.com/libp2p/go-libp2p-kad-dht/v5/pb" + pb "github.com/libp2p/go-libp2p-kad-dht/pb" kb "github.com/libp2p/go-libp2p-kbucket" peer "github.com/libp2p/go-libp2p-peer" notif "github.com/libp2p/go-libp2p-routing/notifications" diff --git a/package.json b/package.json index 55a6cd25c..e63024fa1 100644 --- a/package.json +++ b/package.json @@ -174,3 +174,4 @@ "releaseCmd": "git commit -a -m \"gx publish $VERSION\"", "version": "4.4.22" } + diff --git a/routing.go b/routing.go index c25c87f17..585196c11 100644 --- a/routing.go +++ b/routing.go @@ -11,7 +11,7 @@ import ( cid "github.com/ipfs/go-cid" u "github.com/ipfs/go-ipfs-util" logging "github.com/ipfs/go-log" - pb "github.com/libp2p/go-libp2p-kad-dht/v5/pb" + pb "github.com/libp2p/go-libp2p-kad-dht/pb" kb "github.com/libp2p/go-libp2p-kbucket" inet "github.com/libp2p/go-libp2p-net" peer "github.com/libp2p/go-libp2p-peer" From f90509023d8632e73cfc3925b790b0136f22482f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Kripalani?= Date: Tue, 12 Feb 2019 14:17:08 +0000 Subject: [PATCH 2/2] restore upgraded go.mod deps. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 93b45e5fd..cdaca4ea6 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/jbenet/goprocess v0.0.0-20160826012719-b497e2f366b8 github.com/kr/pretty v0.1.0 // indirect github.com/libp2p/go-addr-util v2.0.7+incompatible // indirect - github.com/libp2p/go-buffer-pool v0.1.1 // indirect + github.com/libp2p/go-buffer-pool v0.1.3 // indirect github.com/libp2p/go-conn-security v0.1.15 // indirect github.com/libp2p/go-conn-security-multistream v0.1.15 // indirect github.com/libp2p/go-flow-metrics v0.2.0 // indirect diff --git a/go.sum b/go.sum index e0abb53a9..fba1f66f0 100644 --- a/go.sum +++ b/go.sum @@ -71,8 +71,8 @@ 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-addr-util v2.0.7+incompatible h1:Su3MLsvDzl7afq0Z99sCjQxhrjOpf/dVBIWOBur9qlY= github.com/libp2p/go-addr-util v2.0.7+incompatible/go.mod h1:doh2auL/Rkfq1xHxDrWJGHZ8yDojPerOZoPu9XVwRB8= -github.com/libp2p/go-buffer-pool v0.1.1 h1:G2HLfT76cZIb1x6jPJ3E14um5SzHn/fea4kMgNDPOuU= -github.com/libp2p/go-buffer-pool v0.1.1/go.mod h1:xtyIz9PMobb13WaxR6Zo1Pd1zXJKYg0a8KiIvDp3TzQ= +github.com/libp2p/go-buffer-pool v0.1.3 h1:L0rKTSV7CdgVzxqP75+6AmJsjkvyM+xY8BCcoR9XLLw= +github.com/libp2p/go-buffer-pool v0.1.3/go.mod h1:xtyIz9PMobb13WaxR6Zo1Pd1zXJKYg0a8KiIvDp3TzQ= github.com/libp2p/go-conn-security v0.1.15 h1:Ohx7vYeje1Wal+eIBUkejcaQPhVjOAZveXoFmo5pArA= github.com/libp2p/go-conn-security v0.1.15/go.mod h1:lIqm8x2wrAxlG+6CzJ3z4Nk5/F73zdjkS6RKbHSbaJ4= github.com/libp2p/go-conn-security-multistream v0.1.15 h1:ZpIz9u+000dcUM4+S65rUfjSmwKNFFND+MFSLH0z6oc=