diff --git a/.gx/lastpubver b/.gx/lastpubver index ad1af5ae976570fb065cf093dc3756b1bd367277..21ff7509c12203077be18fec1ed337aa009b23b9 100644 --- a/.gx/lastpubver +++ b/.gx/lastpubver @@ -1 +1 @@ -4.0.0: QmX663j2gE9igSEw1zMbtbEGJ2vX1Po3r38yq9GTxtr7Q6 +4.0.1: QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum diff --git a/.travis.yml b/.travis.yml index 1b2ce8d8cf9329c6dd7f42c13d1640e3ae255aba..22556c243950f45d86507f581f6ce65d61166f06 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: + - go test ./... -v cache: directories: - $GOPATH/src/gx + +notifications: + email: false diff --git a/Makefile b/Makefile index eba7bbc327339ce44c6f2e02554a4b536ece2171..0344faddd13b198ef7284dc7354ff3db8676ef6d 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,11 @@ -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 -deps: gx +deps: gx 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 dabda1ae644d6dd46560c2f58aa6cc388c7f2513..1256ff9343f87268c3515c96d7e5be64ea4e3658 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") diff --git a/package.json b/package.json index ca78bcea52d6b7ac948a9212c75ecc135548beac..f1b49e5fdcb03ac41d5e94eeb8edb0175f0feb3f 100644 --- a/package.json +++ b/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" }