Merge branch 'mainnet' into feature/remove-transport-manager-dependency

skycoin · Jul 4, 2019 · 9f7d337 · 9f7d337
2 parents 8985275 + 2c3f07f
commit 9f7d337
Show file tree

Hide file tree

Showing 52 changed files with 433 additions and 2,170 deletions.
diff --git a/Makefile b/Makefile
@@ -62,18 +62,7 @@ vendorcheck:  ## Run vendorcheck
 test: ## Run tests
 	-go clean -testcache &>/dev/null
 	${OPTS} go test ${TEST_OPTS} ./internal/...
-	#${OPTS} go test -race -tags no_ci -cover -timeout=5m ./pkg/...
-	${OPTS} go test ${TEST_OPTS} ./pkg/app/...
-	${OPTS} go test ${TEST_OPTS} ./pkg/cipher/...
-	${OPTS} go test ${TEST_OPTS} ./pkg/manager/...
-	${OPTS} go test ${TEST_OPTS} ./pkg/node/...
-	${OPTS} go test ${TEST_OPTS} ./pkg/route-finder/...
-	${OPTS} go test ${TEST_OPTS} ./pkg/router/...
-	${OPTS} go test ${TEST_OPTS} ./pkg/routing/...
-	${OPTS} go test ${TEST_OPTS} ./pkg/setup/...
-	${OPTS} go test ${TEST_OPTS} ./pkg/transport/...
-	${OPTS} go test ${TEST_OPTS} ./pkg/transport-discovery/...
-
+	${OPTS} go test ${TEST_OPTS} ./pkg/...
 
 install-linters: ## Install linters
 	- VERSION=1.17.1 ./ci_scripts/install-golangci-lint.sh 

diff --git a/cmd/apps/skychat/chat.go b/cmd/apps/skychat/chat.go
@@ -108,10 +108,10 @@ func messageHandler(w http.ResponseWriter, req *http.Request) {
 
 	addr := &app.Addr{PubKey: pk, Port: 1}
 	connsMu.Lock()
-	conn := chatConns[pk]
+	conn, ok := chatConns[pk]
 	connsMu.Unlock()
 
-	if conn == nil {
+	if !ok {
 		var err error
 		err = r.Do(func() error {
 			conn, err = chatApp.Dial(addr)

diff --git a/go.mod b/go.mod
@@ -4,7 +4,6 @@ go 1.12
 
 require (
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
-	github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6
 	github.com/go-chi/chi v4.0.2+incompatible
 	github.com/google/uuid v1.1.1
 	github.com/gorilla/handlers v1.4.0

diff --git a/integration/test-messaging.sh b/integration/test-messaging.sh
@@ -1,4 +1,3 @@
 #!/usr/bin/env bash
-source ./integration/generic/env-vars.sh
-# curl --data  {'"recipient":"'$PK_A'", "message":"Hello Joe!"}' -X POST  $CHAT_C  
+curl --data  {'"recipient":"'$PK_A'", "message":"Hello Joe!"}' -X POST  $CHAT_C
 curl --data  {'"recipient":"'$PK_C'", "message":"Hello Mike!"}' -X POST  $CHAT_A
diff --git a/internal/ioutil/ack_waiter.go b/internal/ioutil/ack_waiter.go
diff --git a/internal/ioutil/ack_waiter_test.go b/internal/ioutil/ack_waiter_test.go
diff --git a/internal/ioutil/atomic_bool.go b/internal/ioutil/atomic_bool.go
diff --git a/internal/ioutil/buf_read.go b/internal/ioutil/buf_read.go
diff --git a/internal/ioutil/len_read_writer.go b/internal/ioutil/len_read_writer.go
diff --git a/internal/ioutil/len_read_writer_test.go b/internal/ioutil/len_read_writer_test.go