Merge pull request #135 from libp2p/fix/relay-import

Fix/relay import

.gx/lastpubver

@@ -1 +1 @@
-4.0.0: QmX663j2gE9igSEw1zMbtbEGJ2vX1Po3r38yq9GTxtr7Q6
+4.0.1: QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum

.travis.yml

@@ -7,16 +7,18 @@ language: go
 go:
     - 1.7
 
-env:
-    - GO15VENDOREXPERIMENT=1
-
 install: true
 
-script:
+before_install:
   - make deps
-  - gx-go rewrite
+
-  - go test ./p2p/...
+#- go vet ./...
+script:
+  - go test ./... -v
 
 cache:
     directories:
         - $GOPATH/src/gx
+
+notifications:
+  email: false

Makefile

@@ -1,8 +1,11 @@
-export IPFS_API ?= v04x.ipfs.io
-
 gx:
-	go get -u github.com/whyrusleeping/gx
+	go get github.com/whyrusleeping/gx
-	go get -u github.com/whyrusleeping/gx-go
+	go get github.com/whyrusleeping/gx-go
 
-deps: gx
+deps: gx 
 	gx --verbose install --global
+	gx-go rewrite
+
+publish:
+	gx-go rewrite --undo
+

p2p/protocol/relay/relay.go

@@ -9,10 +9,10 @@ import (
 	host "github.com/libp2p/go-libp2p-host"
 
 	logging "github.com/ipfs/go-log"
-	mh "github.com/jbenet/go-multihash"
 	inet "github.com/libp2p/go-libp2p-net"
 	peer "github.com/libp2p/go-libp2p-peer"
 	protocol "github.com/libp2p/go-libp2p-protocol"
+	mh "github.com/multiformats/go-multihash"
 )
 
 var log = logging.Logger("protocol/relay")

package.json

@@ -255,6 +255,6 @@
   "license": "MIT",
   "name": "go-libp2p",
   "releaseCmd": "git commit -a -m \"gx publish $VERSION\"",
-  "version": "4.0.0"
+  "version": "4.0.1"
 }