Merge 46c6e5ef35 into 57ba1824ac

.travis.yml

@@ -1,10 +1,10 @@
 language: go
 go:
-  - 1.4.2
+  - 1.6.2
 install:
   # - go get code.google.com/p/go.tools/cmd/goimports
   # - go get github.com/golang/lint/golint
-  # - go get golang.org/x/tools/cmd/vet 
+  # - go get golang.org/x/tools/cmd/vet
   - go get golang.org/x/tools/cmd/cover
 before_script:
   # - gofmt -l -w .
@@ -24,6 +24,6 @@ notifications:
   webhooks:
     urls:
       - https://webhooks.gitter.im/e/e09ccdce1048c5e03445
-    on_success: change 
+    on_success: change
     on_failure: always
-    on_start: false 
+    on_start: false

Godeps/Godeps.json

@@ -1,6 +1,6 @@
 {
 	"ImportPath": "github.com/ethereum/go-ethereum",
-	"GoVersion": "go1.5.2",
+	"GoVersion": "go1.6.2",
 	"Packages": [
 		"./..."
 	],

Godeps/Readme

@@ -1,5 +0,0 @@
-This directory tree is generated automatically by godep.
-
-Please do not edit.
-
-See https://github.com/tools/godep for more information.

Godeps/_workspace/.gitignore

@@ -1,2 +0,0 @@
-/pkg
-/bin

Makefile

@@ -103,13 +103,13 @@ evm:
 	@echo "Run \"$(GOBIN)/evm to start the evm."
 
 all:
-	build/env.sh go install -v $(shell build/flags.sh) ./...
+	build/env.sh go install -v $(shell build/flags.sh) `build/env.sh go list ./... | grep -v /vendor/`
 
 test: all
-	build/env.sh go test ./...
+	build/env.sh go test `build/env.sh go list ./... | grep -v /vendor/`
 
 travis-test-with-coverage: all
-	build/env.sh go vet ./...
+	build/env.sh go vet `build/env.sh go list ./... | grep -v /vendor/`
 	build/env.sh build/test-global-coverage.sh
 
 xgo:

build/env.sh

@@ -20,9 +20,11 @@ fi
 
 # Set up the environment to use the workspace.
 # Also add Godeps workspace so we build using canned dependencies.
-GOPATH="$ethdir/go-ethereum/Godeps/_workspace:$workspace"
+GOPATH="$workspace"
 GOBIN="$PWD/build/bin"
-export GOPATH GOBIN
+GO15VENDOREXPERIMENT=1
+
+export GOPATH GOBIN GO15VENDOREXPERIMENT
 
 # Run the command inside the workspace.
 cd "$ethdir/go-ethereum"

build/test-global-coverage.sh

@@ -3,7 +3,7 @@
 set -e
 echo "" > coverage.txt
 
-for d in $(find ./* -maxdepth 10 -type d -not -path "./build" -not -path "./Godeps/*" ); do
+for d in $(find ./* -maxdepth 10 -type d -not -path "./build" -not -path "./vendor/*" ); do
     if ls $d/*.go &> /dev/null; then
         go test  -coverprofile=profile.out -covermode=atomic $d
         if [ -f profile.out ]; then

node/node.go

@@ -152,7 +152,7 @@ func (n *Node) Start() error {
 	}
 	// Otherwise copy and specialize the P2P configuration
 	running := new(p2p.Server)
-	*running = *n.serverConfig
+	reflect.ValueOf(running).Elem().Set(reflect.ValueOf(n.serverConfig).Elem()) // Fancy *running = *n.serverConfig to prevent mutex copy
 
 	services := make(map[reflect.Type]Service)
 	for _, constructor := range n.serviceFuncs {