diff --git a/.travis.yml b/.travis.yml index 97207415c..5d4aa9eb4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,14 +11,25 @@ env: go: - 1.11.x -install: - - make deps - -script: - - bash <(curl -s https://github.com/raw/ipfs/ci-helpers/master/travis-ci/run-standard-tests.sh) +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) cache: directories: + - $GOPATH/pkg/mod - $GOPATH/src/gx notifications: diff --git a/Makefile b/Makefile index d6680bd02..b1b62d7cd 100644 --- a/Makefile +++ b/Makefile @@ -10,3 +10,6 @@ deps: gx publish: gx-go rewrite --undo + +mod_deps: + env GO111MODULE=on go mod download diff --git a/dht.go b/dht.go index 11a94bd06..1206f30b2 100644 --- a/dht.go +++ b/dht.go @@ -8,9 +8,9 @@ import ( "sync" "time" - 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" + 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" proto "github.com/gogo/protobuf/proto" cid "github.com/ipfs/go-cid" diff --git a/dht_net.go b/dht_net.go index 4709c9828..d9640a82d 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/pb" + pb "github.com/libp2p/go-libp2p-kad-dht/v5/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 2e5196120..42207bfb7 100644 --- a/dht_test.go +++ b/dht_test.go @@ -14,8 +14,8 @@ import ( "testing" "time" - opts "github.com/libp2p/go-libp2p-kad-dht/opts" - pb "github.com/libp2p/go-libp2p-kad-dht/pb" + opts "github.com/libp2p/go-libp2p-kad-dht/v5/opts" + pb "github.com/libp2p/go-libp2p-kad-dht/v5/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 1612d9802..40da4b2d3 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/pb" + pb "github.com/libp2p/go-libp2p-kad-dht/v5/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 aee2527e3..d6a76bff8 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/libp2p/go-libp2p-kad-dht +module github.com/libp2p/go-libp2p-kad-dht/v5 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.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 988fd3f25..4607f7bd1 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= @@ -197,7 +197,6 @@ github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 h1: github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7/go.mod h1:X2c0RVCI1eSUFI8eLcY3c0423ykwiUdxLJtkDvruhjI= github.com/whyrusleeping/yamux v1.1.2 h1:oGpjhLpa0mZnRMbthCkEe+61VvkQGFSkQgm9WvaHgRU= github.com/whyrusleeping/yamux v1.1.2/go.mod h1:E8LnQQ8HKx5KD29HZFUwM1PxCOdPRzGwur1mcYhXcD8= -golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44 h1:9lP3x0pW80sDI6t1UMSLA4to18W7R7imwAI/sWS9S8Q= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 h1:mKdxBk7AujPs8kU4m80U72y/zjbZ3UcXC7dClwKbUI0= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/handlers.go b/handlers.go index 2d06617c5..e4c6ec2cb 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/pb" + pb "github.com/libp2p/go-libp2p-kad-dht/v5/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 9d482292a..e49aff0d7 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/pb" + pb "github.com/libp2p/go-libp2p-kad-dht/v5/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 e63024fa1..55a6cd25c 100644 --- a/package.json +++ b/package.json @@ -174,4 +174,3 @@ "releaseCmd": "git commit -a -m \"gx publish $VERSION\"", "version": "4.4.22" } - diff --git a/routing.go b/routing.go index 585196c11..c25c87f17 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/pb" + pb "github.com/libp2p/go-libp2p-kad-dht/v5/pb" kb "github.com/libp2p/go-libp2p-kbucket" inet "github.com/libp2p/go-libp2p-net" peer "github.com/libp2p/go-libp2p-peer"