From b130e2a7b190569b51284e7511d67b1330b6865a Mon Sep 17 00:00:00 2001
From: Jeromy <why@ipfs.io>
Date: Wed, 5 Oct 2016 12:16:25 -0700
Subject: [PATCH] fix import and update travis scripts

---
 .travis.yml                 | 14 ++++++++------
 Makefile                    | 17 ++++++++++++-----
 p2p/protocol/relay/relay.go |  2 +-
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1b2ce8d..0fd6d5c 100644
--- a/.travis.yml
+++ b/.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:
+  - $GOPATH/bin/goveralls ./... -service="travis-ci"
 
 cache:
     directories:
         - $GOPATH/src/gx
+
+notifications:
+  email: false
diff --git a/Makefile b/Makefile
index eba7bbc..7811c09 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,15 @@
-export IPFS_API ?= v04x.ipfs.io
-
 gx:
-	go get -u github.com/whyrusleeping/gx
-	go get -u github.com/whyrusleeping/gx-go
+	go get github.com/whyrusleeping/gx
+	go get github.com/whyrusleeping/gx-go
+
+covertools:
+	go get github.com/mattn/goveralls
+	go get golang.org/x/tools/cmd/cover
 
-deps: gx
+deps: gx covertools
 	gx --verbose install --global
+	gx-go rewrite
+
+publish:
+	gx-go rewrite --undo
+
diff --git a/p2p/protocol/relay/relay.go b/p2p/protocol/relay/relay.go
index dabda1a..1256ff9 100644
--- a/p2p/protocol/relay/relay.go
+++ b/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")
-- 
GitLab