Merge pull request #259 from raulk/fix-gomod

Revert #236: Test go mod in travis and use major versioning in import paths

.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:

Makefile

@@ -10,6 +10,3 @@ deps: gx
 
 publish:
 	gx-go rewrite --undo
-
-mod_deps:
-	env GO111MODULE=on go mod download

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"

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"
 )

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"

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"

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

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"

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"

package.json

@@ -174,3 +174,4 @@
   "releaseCmd": "git commit -a -m \"gx publish $VERSION\"",
   "version": "4.4.22"
 }
+

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"