Merge branch 'mainnet' of https://github.com/skycoin/skywire into fea…

…ture/improve_therealssh_logging
skycoin · Aug 5, 2019 · d461356 · d461356
2 parents 2db97aa + 518e04e
commit d461356
Show file tree

Hide file tree

Showing 26 changed files with 1,021 additions and 60 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -31,6 +31,16 @@ run:
   # autogenerated files. If it's not please let us know.
   skip-files:
 
+  # by default isn't set. If set we pass it to "go list -mod={option}". From "go help modules":
+  # If invoked with -mod=readonly, the go command is disallowed from the implicit
+  # automatic updating of go.mod described above. Instead, it fails when any changes
+  # to go.mod are needed. This setting is most useful to check that go.mod does
+  # not need updates, such as in a continuous integration and testing system.
+  # If invoked with -mod=vendor, the go command assumes that the vendor
+  # directory holds the correct copies of dependencies and ignores
+  # the dependency descriptions in go.mod.
+  modules-download-mode: vendor
+
 
 # output configuration options
 output:

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@
 .PHONY : docker-apps docker-bin docker-volume 
 .PHONY : docker-run docker-stop     
 
-OPTS?=GO111MODULE=on 
+OPTS?=GO111MODULE=on
 DOCKER_IMAGE?=skywire-runner # docker image to use for running skywire-visor.`golang`, `buildpack-deps:stretch-scm`  is OK too
 DOCKER_NETWORK?=SKYNET 
 DOCKER_NODE?=SKY01
@@ -45,7 +45,7 @@ rerun: stop
 lint: ## Run linters. Use make install-linters first	
 	${OPTS} golangci-lint run -c .golangci.yml ./...
 	# The govet version in golangci-lint is out of date and has spurious warnings, run it separately
-	${OPTS} go vet -all ./...
+	${OPTS} go vet -mod=vendor -all ./...
 
 vendorcheck:  ## Run vendorcheck
 	GO111MODULE=off vendorcheck ./internal/... 

diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/prometheus/client_golang v1.0.0
 	github.com/prometheus/common v0.4.1
 	github.com/sirupsen/logrus v1.4.2
-	github.com/skycoin/dmsg v0.0.0-20190708174832-eb49a4b802f7
+	github.com/skycoin/dmsg v0.0.0-20190719095515-52043626400c
 	github.com/skycoin/skycoin v0.26.0
 	github.com/spf13/cobra v0.0.5
 	github.com/stretchr/testify v1.3.0

diff --git a/go.sum b/go.sum
@@ -93,6 +93,8 @@ github.com/skycoin/dmsg v0.0.0-20190628092537-e69f75132be9 h1:Y7CZdMtd5HxkgIaAIL
 github.com/skycoin/dmsg v0.0.0-20190628092537-e69f75132be9/go.mod h1:AwwGhHjvXpbYVz8oYFaXKWHwscc5nHyHjssQBtQgmZg=
 github.com/skycoin/dmsg v0.0.0-20190708174832-eb49a4b802f7 h1:4LjXC4C+RJtsyJKlmtaDPhK7uaCImPZTvmVNkVHR2io=
 github.com/skycoin/dmsg v0.0.0-20190708174832-eb49a4b802f7/go.mod h1:obZYZp8eKR7Xqz+KNhJdUE6Gvp6rEXbDO8YTlW2YXgU=
+github.com/skycoin/dmsg v0.0.0-20190719095515-52043626400c h1:ZEE/nDdNWKDoBPAtCZAejJHaaopMbR/+4owT1U+Xa48=
+github.com/skycoin/dmsg v0.0.0-20190719095515-52043626400c/go.mod h1:obZYZp8eKR7Xqz+KNhJdUE6Gvp6rEXbDO8YTlW2YXgU=
 github.com/skycoin/skycoin v0.26.0 h1:xDxe2r8AclMntZ550Y/vUQgwgLtwrf9Wu5UYiYcN5/o=
 github.com/skycoin/skycoin v0.26.0/go.mod h1:78nHjQzd8KG0jJJVL/j0xMmrihXi70ti63fh8vXScJw=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=

diff --git a/pkg/app/app.go b/pkg/app/app.go
@@ -243,7 +243,10 @@ func (app *App) closeConn(data []byte) error {
 	delete(app.conns, loop)
 	app.mu.Unlock()
 
-	return conn.Close()
+	if conn != nil {
+		return conn.Close()
+	}
+	return nil
 }
 
 func (app *App) confirmLoop(data []byte) error {

diff --git a/pkg/app/app_test.go b/pkg/app/app_test.go
@@ -88,7 +88,7 @@ func TestAppAccept(t *testing.T) {
 	lpk, _ := cipher.GenerateKeyPair()
 	rpk, _ := cipher.GenerateKeyPair()
 	in, out := net.Pipe()
-	app := &App{proto: NewProtocol(in), acceptChan: make(chan [2]routing.Addr), conns: make(map[routing.Loop]io.ReadWriteCloser)}
+	app := &App{proto: NewProtocol(in), acceptChan: make(chan [2]routing.Addr, 2), conns: make(map[routing.Loop]io.ReadWriteCloser)}
 	go app.handleProto()
 
 	proto := NewProtocol(out)

diff --git a/pkg/router/visor.go → pkg/router/app_manager.go b/pkg/router/visor.go → pkg/router/app_manager.go
diff --git a/pkg/router/visor_test.go → pkg/router/app_manager_test.go b/pkg/router/visor_test.go → pkg/router/app_manager_test.go
diff --git a/pkg/transport/manager.go b/pkg/transport/manager.go
@@ -336,7 +336,7 @@ func (tm *Manager) acceptTransport(ctx context.Context, factory Factory) (*Manag
 	entry, err := settlementResponderHandshake().Do(tm, tr, 30*time.Second)
 	if err != nil {
 		go func() {
-			if err = tr.Close(); err != nil {
+			if err := tr.Close(); err != nil {
 				tm.Logger.Warnf("Failed to close transport: %s", err)
 			}
 		}()

diff --git a/vendor/github.com/skycoin/dmsg/.golangci.yml b/vendor/github.com/skycoin/dmsg/.golangci.yml
diff --git a/vendor/github.com/skycoin/dmsg/README.md b/vendor/github.com/skycoin/dmsg/README.md
diff --git a/vendor/github.com/skycoin/dmsg/client.go b/vendor/github.com/skycoin/dmsg/client.go
diff --git a/vendor/github.com/skycoin/dmsg/disc/client.go b/vendor/github.com/skycoin/dmsg/disc/client.go
diff --git a/vendor/github.com/skycoin/dmsg/disc/entry.go b/vendor/github.com/skycoin/dmsg/disc/entry.go
diff --git a/vendor/github.com/skycoin/dmsg/ioutil/ack_waiter.go b/vendor/github.com/skycoin/dmsg/ioutil/ack_waiter.go
diff --git a/vendor/github.com/skycoin/dmsg/ioutil/buf_read.go b/vendor/github.com/skycoin/dmsg/ioutil/buf_read.go
diff --git a/vendor/github.com/skycoin/dmsg/ioutil/logging.go b/vendor/github.com/skycoin/dmsg/ioutil/logging.go
diff --git a/vendor/github.com/skycoin/dmsg/noise/noise.go b/vendor/github.com/skycoin/dmsg/noise/noise.go