Merge branch 'develop' into fix/setup-node-hangs

Former-commit-id: d3739b1

.gitignore

@@ -30,7 +30,6 @@ pkg/visor/foo/
 /*.json
 /*.sh
 /*.log
-dmsgpty
 
 # Ignore backup go.mod after running '/ci_scripts/go_mod_replace.sh'.
 go.mod-e

.travis.yml

@@ -31,3 +31,4 @@ script:
   - make install-deps-ui
   - make lint-ui
   - make build-ui
+

Makefile

@@ -1,11 +1,11 @@
 .DEFAULT_GOAL := help
-.PHONY : check lint install-linters dep test 
-.PHONY : build  clean install  format  bin
-.PHONY : host-apps bin 
+.PHONY : check lint install-linters dep test
+.PHONY : build  clean install format bin
+.PHONY : host-apps bin
 .PHONY : run stop config
-.PHONY : docker-image  docker-clean docker-network  
-.PHONY : docker-apps docker-bin docker-volume 
-.PHONY : docker-run docker-stop     
+.PHONY : docker-image docker-clean docker-network
+.PHONY : docker-apps docker-bin docker-volume
+.PHONY : docker-run docker-stop
 
 VERSION := $(shell git describe)
 
@@ -22,7 +22,7 @@ DOCKER_NETWORK?=SKYNET
 DOCKER_NODE?=SKY01
 DOCKER_OPTS?=GO111MODULE=on GOOS=linux # go options for compiling for docker container
 
-TEST_OPTS_BASE:=-cover -timeout=5m
+TEST_OPTS_BASE:=-cover -timeout=5m -mod=vendor
 
 RACE_FLAG:=-race
 GOARCH:=$(shell go env GOARCH)
@@ -113,15 +113,17 @@ install-linters: ## Install linters
 	# However, they suggest `curl ... | bash` which we should not do
 	# ${OPTS} go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
 	${OPTS} go get -u golang.org/x/tools/cmd/goimports
+	${OPTS} go get -u github.com/incu6us/goimports-reviser
 
 tidy: ## Tidies and vendors dependencies.
 	${OPTS} go mod tidy -v
 	${OPTS} go mod vendor -v
 
-format: tidy ## Formats the code. Must have goimports installed (use make install-linters).
+format: tidy ## Formats the code. Must have goimports and goimports-reviser installed (use make install-linters).
 	${OPTS} goimports -w -local ${PROJECT_BASE} ./pkg
 	${OPTS} goimports -w -local ${PROJECT_BASE} ./cmd
 	${OPTS} goimports -w -local ${PROJECT_BASE} ./internal
+	find . -type f -name '*.go' -not -path "./vendor/*"  -exec goimports-reviser -project-name ${PROJECT_BASE} -file-path {} \;
 
 dep: ## Sorts dependencies
 	${OPTS} go mod vendor -v

cmd/skywire-cli/commands/mdisc/root.go

@@ -7,12 +7,11 @@ import (
 	"text/tabwriter"
 	"time"
 
-	"github.com/SkycoinProject/skywire-mainnet/pkg/skyenv"
-
 	"github.com/SkycoinProject/dmsg/disc"
 	"github.com/spf13/cobra"
 
 	"github.com/SkycoinProject/skywire-mainnet/cmd/skywire-cli/internal"
+	"github.com/SkycoinProject/skywire-mainnet/pkg/skyenv"
 )
 
 var mdAddr string

cmd/skywire-cli/commands/rtfind/root.go

@@ -4,15 +4,14 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/SkycoinProject/skywire-mainnet/pkg/routefinder/rfclient"
-	"github.com/SkycoinProject/skywire-mainnet/pkg/routing"
-	"github.com/SkycoinProject/skywire-mainnet/pkg/skyenv"
-
 	"github.com/SkycoinProject/dmsg/cipher"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 
 	"github.com/SkycoinProject/skywire-mainnet/cmd/skywire-cli/internal"
+	"github.com/SkycoinProject/skywire-mainnet/pkg/routefinder/rfclient"
+	"github.com/SkycoinProject/skywire-mainnet/pkg/routing"
+	"github.com/SkycoinProject/skywire-mainnet/pkg/skyenv"
 )
 
 var frAddr string

cmd/skywire-cli/commands/visor/gen-config.go

@@ -6,13 +6,12 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/SkycoinProject/dmsg/cipher"
 	"github.com/SkycoinProject/skycoin/src/util/logging"
 	"github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
 
 	"github.com/SkycoinProject/skywire-mainnet/pkg/visor/visorconfig"
-
-	"github.com/SkycoinProject/dmsg/cipher"
-	"github.com/spf13/cobra"
 )
 
 func init() {

cmd/skywire-visor/commands/root.go

@@ -6,7 +6,7 @@ import (
 	"io"
 	"io/ioutil"
 	"net/http"
-	_ "net/http/pprof" //nolint:gosec // https://golang.org/doc/diagnostics.html#profiling
+	_ "net/http/pprof" // nolint:gosec // https://golang.org/doc/diagnostics.html#profiling
 	"os"
 
 	"github.com/SkycoinProject/dmsg/buildinfo"

pkg/app/appserver/rpc_ingress_client_test.go

@@ -9,18 +9,16 @@ import (
 	"testing"
 	"time"
 
-	"github.com/SkycoinProject/skywire-mainnet/internal/testhelpers"
-
 	"github.com/SkycoinProject/dmsg"
 	"github.com/SkycoinProject/dmsg/cipher"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/net/nettest"
 
+	"github.com/SkycoinProject/skywire-mainnet/internal/testhelpers"
+	"github.com/SkycoinProject/skywire-mainnet/pkg/app/appcommon"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/app/appnet"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/routing"
-
-	"github.com/SkycoinProject/skywire-mainnet/pkg/app/appcommon"
 )
 
 func TestRPCClient_Dial(t *testing.T) {

pkg/hypervisor/user_manager.go

@@ -9,10 +9,9 @@ import (
 	"sync"
 	"time"
 
+	"github.com/SkycoinProject/dmsg/httputil"
 	"github.com/google/uuid"
 	"github.com/gorilla/securecookie"
-
-	"github.com/SkycoinProject/dmsg/httputil"
 )
 
 const (

pkg/router/router_test.go

@@ -10,12 +10,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/sirupsen/logrus"
-
 	"github.com/SkycoinProject/dmsg"
 	"github.com/SkycoinProject/dmsg/cipher"
 	"github.com/SkycoinProject/skycoin/src/util/logging"
 	"github.com/google/uuid"
+	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 

pkg/setup/config.go

@@ -3,9 +3,9 @@ package setup
 import (
 	"time"
 
-	"github.com/SkycoinProject/skywire-mainnet/pkg/snet"
-
 	"github.com/SkycoinProject/dmsg/cipher"
+
+	"github.com/SkycoinProject/skywire-mainnet/pkg/snet"
 )
 
 //go:generate readmegen -n Config -o ./README.md ./config.go

pkg/snet/network.go

@@ -9,16 +9,16 @@ import (
 	"sync"
 	"time"
 
+	"github.com/SkycoinProject/dmsg"
+	"github.com/SkycoinProject/dmsg/cipher"
+	"github.com/SkycoinProject/dmsg/disc"
+	"github.com/SkycoinProject/skycoin/src/util/logging"
+
 	"github.com/SkycoinProject/skywire-mainnet/pkg/app/appevent"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/snet/arclient"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/snet/stcp"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/snet/stcph"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/snet/stcpr"
-
-	"github.com/SkycoinProject/dmsg"
-	"github.com/SkycoinProject/dmsg/cipher"
-	"github.com/SkycoinProject/dmsg/disc"
-	"github.com/SkycoinProject/skycoin/src/util/logging"
 )
 
 var log = logging.MustGetLogger("snet")

pkg/snet/network_test.go

@@ -3,10 +3,9 @@ package snet
 import (
 	"testing"
 
-	"github.com/stretchr/testify/require"
-
 	"github.com/SkycoinProject/dmsg"
 	"github.com/SkycoinProject/dmsg/cipher"
+	"github.com/stretchr/testify/require"
 )
 
 func TestDisassembleAddr(t *testing.T) {

pkg/snet/stcp/handshake.go

@@ -9,11 +9,10 @@ import (
 	"net"
 	"time"
 
-	cipher2 "github.com/SkycoinProject/skycoin/src/cipher"
-	"github.com/SkycoinProject/skycoin/src/util/logging"
-
 	"github.com/SkycoinProject/dmsg"
 	"github.com/SkycoinProject/dmsg/cipher"
+	cipher2 "github.com/SkycoinProject/skycoin/src/cipher"
+	"github.com/SkycoinProject/skycoin/src/util/logging"
 )
 
 var log = logging.MustGetLogger("stcp")

pkg/snet/stcph/handshake.go

@@ -9,11 +9,10 @@ import (
 	"net"
 	"time"
 
-	cipher2 "github.com/SkycoinProject/skycoin/src/cipher"
-	"github.com/SkycoinProject/skycoin/src/util/logging"
-
 	"github.com/SkycoinProject/dmsg"
 	"github.com/SkycoinProject/dmsg/cipher"
+	cipher2 "github.com/SkycoinProject/skycoin/src/cipher"
+	"github.com/SkycoinProject/skycoin/src/util/logging"
 )
 
 var log = logging.MustGetLogger("stcph")

pkg/snet/stcpr/handshake.go

@@ -9,11 +9,10 @@ import (
 	"net"
 	"time"
 
-	cipher2 "github.com/SkycoinProject/skycoin/src/cipher"
-	"github.com/SkycoinProject/skycoin/src/util/logging"
-
 	"github.com/SkycoinProject/dmsg"
 	"github.com/SkycoinProject/dmsg/cipher"
+	cipher2 "github.com/SkycoinProject/skycoin/src/cipher"
+	"github.com/SkycoinProject/skycoin/src/util/logging"
 )
 
 var log = logging.MustGetLogger("stcpr")

pkg/transport/discovery_test.go

@@ -4,9 +4,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/stretchr/testify/require"
-
 	"github.com/SkycoinProject/dmsg/cipher"
+	"github.com/stretchr/testify/require"
 
 	"github.com/SkycoinProject/skywire-mainnet/pkg/transport"
 )

pkg/transport/entry_test.go

@@ -4,9 +4,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-
 	"github.com/SkycoinProject/dmsg/cipher"
+	"github.com/stretchr/testify/assert"
 
 	"github.com/SkycoinProject/skywire-mainnet/pkg/transport"
 )

pkg/transport/manager.go

@@ -9,14 +9,14 @@ import (
 	"sync"
 	"time"
 
+	"github.com/SkycoinProject/dmsg/cipher"
+	"github.com/SkycoinProject/skycoin/src/util/logging"
+	"github.com/google/uuid"
+
 	"github.com/SkycoinProject/skywire-mainnet/pkg/routing"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/skyenv"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/snet"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/snet/snettest"
-
-	"github.com/SkycoinProject/dmsg/cipher"
-	"github.com/SkycoinProject/skycoin/src/util/logging"
-	"github.com/google/uuid"
 )
 
 // ManagerConfig configures a Manager.

pkg/transport/manager_test.go

@@ -9,16 +9,15 @@ import (
 	"testing"
 	"time"
 
+	"github.com/SkycoinProject/dmsg"
+	"github.com/SkycoinProject/dmsg/cipher"
 	"github.com/SkycoinProject/skycoin/src/util/logging"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"github.com/SkycoinProject/skywire-mainnet/pkg/routing"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/snet/snettest"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/transport"
-
-	"github.com/SkycoinProject/dmsg"
-	"github.com/SkycoinProject/dmsg/cipher"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 var masterLogger *logging.MasterLogger

pkg/visor/rpc_test.go

@@ -6,14 +6,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/SkycoinProject/skywire-mainnet/pkg/visor/visorconfig"
-
-	"github.com/SkycoinProject/skywire-mainnet/pkg/transport"
-
 	"github.com/SkycoinProject/dmsg/cipher"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/SkycoinProject/skywire-mainnet/pkg/transport"
+	"github.com/SkycoinProject/skywire-mainnet/pkg/visor/visorconfig"
 )
 
 func baseConfig(t *testing.T) *visorconfig.V1 {