Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/relay import #135

Merged
merged 3 commits into from
Oct 5, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gx/lastpubver
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.0: QmX663j2gE9igSEw1zMbtbEGJ2vX1Po3r38yq9GTxtr7Q6
4.0.1: QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum
14 changes: 8 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
13 changes: 8 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion p2p/protocol/relay/relay.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}