Merge branch 'mainnet' into feature/change-transport-interface

# Conflicts:
#	pkg/setup/node.go
#	pkg/transport-discovery/client/client_test.go

.gitignore

@@ -10,18 +10,19 @@
 .idea/
 
 /skywire.json
-/*-config.json
 /apps/
 /skywire/
 /local*
 
-pkg/node/apps/
-pkg/node/bar/
-pkg/node/foo/
+pkg/visor/apps/
+pkg/visor/bar/
+pkg/visor/foo/
 
 /node
 /users.db
+/hypervisor
 /*-node
+/*-visor
 /*-cli
 /*-server
 /*.json

.golangci.yml

@@ -169,10 +169,6 @@ issues:
   # it can be disabled by `exclude-use-default: false`. To list all
   # excluded by default patterns execute `golangci-lint run --help`
   exclude:
-    - "G304: Potential file inclusion via variable"
-    - "G204: Subprocess launched with variable"
-    - "G104: Errors unhandled"
-    - Error return value of .((os\.)?std(out|err)\..*|.*Close|.*Flush|os\.Remove(All)?|.*printf?|os\.(Un)?Setenv). is not checked
 
   # Independently from option `exclude` we use default exclude patterns,
   # it can be disabled by this option. To list all
@@ -192,4 +188,4 @@ issues:
   # large codebase. It's not practical to fix all existing issues at the moment
   # of integration: much better don't allow issues in new code.
   # Default is false.
-  new: false
+  new: false

CHANGELOG.md

@@ -22,4 +22,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
-- First release of the mainnet Skywire node and apps for testing.
+- First release of the mainnet Skywire visor and apps for testing.

Makefile

@@ -8,7 +8,7 @@
 .PHONY : docker-run docker-stop     
 
 OPTS?=GO111MODULE=on 
-DOCKER_IMAGE?=skywire-runner # docker image to use for running skywire-node.`golang`, `buildpack-deps:stretch-scm`  is OK too
+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
 DOCKER_OPTS?=GO111MODULE=on GOOS=linux # go options for compiling for docker container
@@ -19,27 +19,27 @@ check: lint test ## Run linters and tests
 
 build: dep host-apps bin ## Install dependencies, build apps and binaries. `go build` with ${OPTS} 
 
-run: stop build	config  ## Run skywire-node on host
-	./skywire-node skywire.json
+run: stop build	config  ## Run skywire-visor on host
+	./skywire-visor skywire.json
 
-stop: ## Stop running skywire-node on host
-	-bash -c "kill $$(ps aux |grep '[s]kywire-node' |awk '{print $$2}')"
+stop: ## Stop running skywire-visor on host
+	-bash -c "kill $$(ps aux |grep '[s]kywire-visor' |awk '{print $$2}')"
 
 config: ## Generate skywire.json
 	-./skywire-cli node gen-config -o  ./skywire.json -r
 
 clean: ## Clean project: remove created binaries and apps
 	-rm -rf ./apps
-	-rm -f ./skywire-node ./skywire-cli ./setup-node ./manager-node ./SSH-cli
+	-rm -f ./skywire-visor ./skywire-cli ./setup-node ./hypervisor ./SSH-cli
 
-install: ## Install `skywire-node`, `skywire-cli`, `manager-node`, `SSH-cli`	
-	${OPTS} go install ./cmd/skywire-node ./cmd/skywire-cli ./cmd/setup-node ./cmd/manager-node ./cmd/therealssh-cli
+install: ## Install `skywire-visor`, `skywire-cli`, `hypervisor`, `SSH-cli`
+	${OPTS} go install ./cmd/skywire-visor ./cmd/skywire-cli ./cmd/setup-node ./cmd/hypervisor ./cmd/therealssh-cli
 
 rerun: stop
-	${OPTS} go build -race -o ./skywire-node ./cmd/skywire-node 
+	${OPTS} go build -race -o ./skywire-visor ./cmd/skywire-visor
 	-./skywire-cli node gen-config -o  ./skywire.json -r
 	perl -pi -e 's/localhost//g' ./skywire.json
-	./skywire-node skywire.json
+	./skywire-visor skywire.json
 
 
 lint: ## Run linters. Use make install-linters first	
@@ -51,10 +51,10 @@ vendorcheck:  ## Run vendorcheck
 	GO111MODULE=off vendorcheck ./internal/... 
 	GO111MODULE=off vendorcheck ./pkg/... 
 	GO111MODULE=off vendorcheck ./cmd/apps/... 
-	GO111MODULE=off vendorcheck ./cmd/manager-node/... 
+	GO111MODULE=off vendorcheck ./cmd/hypervisor/...
 	GO111MODULE=off vendorcheck ./cmd/setup-node/... 
 	GO111MODULE=off vendorcheck ./cmd/skywire-cli/... 
-	GO111MODULE=off vendorcheck ./cmd/skywire-node/... 
+	GO111MODULE=off vendorcheck ./cmd/skywire-visor/...
 	# vendorcheck fails on ./cmd/therealssh-cli
 	# the problem is indirect dependency to github.com/sirupsen/logrus
 	#GO111MODULE=off vendorcheck ./cmd/therealssh-cli/... 	
@@ -90,58 +90,58 @@ host-apps: ## Build app
 	${OPTS} go build ${BUILD_OPTS} -o ./apps/SSH-client.v1.0  ./cmd/apps/therealssh-client
 
 # Bin 
-bin: ## Build `skywire-node`, `skywire-cli`, `manager-node`, `SSH-cli`
-	${OPTS} go build ${BUILD_OPTS} -o ./skywire-node ./cmd/skywire-node 
-	${OPTS} go build ${BUILD_OPTS} -o ./skywire-cli  ./cmd/skywire-cli 
+bin: ## Build `skywire-visor`, `skywire-cli`, `hypervisor`, `SSH-cli`
+	${OPTS} go build ${BUILD_OPTS} -o ./skywire-visor ./cmd/skywire-visor
+	${OPTS} go build ${BUILD_OPTS} -o ./skywire-cli  ./cmd/skywire-cli
 	${OPTS} go build ${BUILD_OPTS} -o ./setup-node ./cmd/setup-node
 	${OPTS} go build ${BUILD_OPTS} -o ./messaging-server ./cmd/messaging-server
-	${OPTS} go build ${BUILD_OPTS} -o ./manager-node ./cmd/manager-node 
+	${OPTS} go build ${BUILD_OPTS} -o ./hypervisor ./cmd/hypervisor
 	${OPTS} go build ${BUILD_OPTS} -o ./SSH-cli ./cmd/therealssh-cli
 
 
-release: ## Build skywire-node`, skywire-cli, manager-node, SSH-cli and apps without -race flag
-	${OPTS} go build -o ./skywire-node ./cmd/skywire-node 
-	${OPTS} go build -o ./skywire-cli  ./cmd/skywire-cli 
+release: ## Build `skywire-visor`, `skywire-cli`, `hypervisor`, `SSH-cli` and apps without -race flag
+	${OPTS} go build -o ./skywire-visor ./cmd/skywire-visor
+	${OPTS} go build -o ./skywire-cli  ./cmd/skywire-cli
 	${OPTS} go build -o ./setup-node ./cmd/setup-node
-	${OPTS} go build -o ./manager-node ./cmd/manager-node 
+	${OPTS} go build -o ./hypervisor ./cmd/hypervisor
 	${OPTS} go build -o ./SSH-cli ./cmd/therealssh-cli
-	${OPTS} go build -o ./apps/skychat.v1.0 ./cmd/apps/skychat	
+	${OPTS} go build -o ./apps/skychat.v1.0 ./cmd/apps/skychat
 	${OPTS} go build -o ./apps/helloworld.v1.0 ./cmd/apps/helloworld
 	${OPTS} go build -o ./apps/socksproxy.v1.0 ./cmd/apps/therealproxy
 	${OPTS} go build -o ./apps/socksproxy-client.v1.0  ./cmd/apps/therealproxy-client
 	${OPTS} go build -o ./apps/SSH.v1.0  ./cmd/apps/therealssh
 	${OPTS} go build -o ./apps/SSH-client.v1.0  ./cmd/apps/therealssh-client
 
-# Dockerized skywire-node
+# Dockerized skywire-visor
 docker-image: ## Build docker image `skywire-runner`
 	docker image build --tag=skywire-runner --rm  - < skywire-runner.Dockerfile
 
 docker-clean: ## Clean docker system: remove container ${DOCKER_NODE} and network ${DOCKER_NETWORK}
 	-docker network rm ${DOCKER_NETWORK} 
-	-docker container rm --force ${DOCKER_NODE} 
+	-docker container rm --force ${DOCKER_NODE}
 
 docker-network: ## Create docker network ${DOCKER_NETWORK}
 	-docker network create ${DOCKER_NETWORK}
 
-docker-apps: ## Build apps binaries for dockerized skywire-node. `go build` with  ${DOCKER_OPTS}
+docker-apps: ## Build apps binaries for dockerized skywire-visor. `go build` with  ${DOCKER_OPTS}
 	-${DOCKER_OPTS} go build -race -o ./node/apps/skychat.v1.0 ./cmd/apps/skychat
 	-${DOCKER_OPTS} go build -race -o ./node/apps/helloworld.v1.0 ./cmd/apps/helloworld
 	-${DOCKER_OPTS} go build -race -o ./node/apps/socksproxy.v1.0 ./cmd/apps/therealproxy
 	-${DOCKER_OPTS} go build -race -o ./node/apps/socksproxy-client.v1.0  ./cmd/apps/therealproxy-client
 	-${DOCKER_OPTS} go build -race -o ./node/apps/SSH.v1.0  ./cmd/apps/therealssh
 	-${DOCKER_OPTS} go build -race -o ./node/apps/SSH-client.v1.0  ./cmd/apps/therealssh-client
 
-docker-bin: ## Build `skywire-node`, `skywire-cli`, `manager-node`, `therealssh-cli`. `go build` with  ${DOCKER_OPTS}
-	${DOCKER_OPTS} go build -race -o ./node/skywire-node ./cmd/skywire-node 
+docker-bin: ## Build `skywire-visor`, `skywire-cli`, `hypervisor`, `therealssh-cli`. `go build` with  ${DOCKER_OPTS}
+	${DOCKER_OPTS} go build -race -o ./node/skywire-visor ./cmd/skywire-visor
 
-docker-volume: dep docker-apps docker-bin bin  ## Prepare docker volume for dockerized skywire-node	
+docker-volume: dep docker-apps docker-bin bin  ## Prepare docker volume for dockerized skywire-visor
 	-${DOCKER_OPTS} go build  -o ./docker/skywire-services/setup-node ./cmd/setup-node
-	-./skywire-cli node gen-config -o  ./node/skywire.json -r
+	-./skywire-cli node gen-config -o  ./skywire-visor/skywire.json -r
 	perl -pi -e 's/localhost//g' ./node/skywire.json # To make node accessible from outside with skywire-cli
 
-docker-run: docker-clean docker-image docker-network docker-volume ## Run dockerized skywire-node ${DOCKER_NODE} in image ${DOCKER_IMAGE} with network ${DOCKER_NETWORK}
+docker-run: docker-clean docker-image docker-network docker-volume ## Run dockerized skywire-visor ${DOCKER_NODE} in image ${DOCKER_IMAGE} with network ${DOCKER_NETWORK}
 	docker run -it -v $(shell pwd)/node:/sky --network=${DOCKER_NETWORK} \
-		--name=${DOCKER_NODE} ${DOCKER_IMAGE} bash -c "cd /sky && ./skywire-node skywire.json"
+		--name=${DOCKER_NODE} ${DOCKER_IMAGE} bash -c "cd /sky && ./skywire-visor skywire.json"
 
 docker-setup-node:	## Runs setup-node in detached state in ${DOCKER_NETWORK}
 	-docker container rm setup-node -f
@@ -150,13 +150,13 @@ docker-setup-node:	## Runs setup-node in detached state in ${DOCKER_NETWORK}
 	 				--hostname=setup-node	skywire-services \
 					  bash -c "./setup-node setup-node.json"
 
-docker-stop: ## Stop running dockerized skywire-node ${DOCKER_NODE}
+docker-stop: ## Stop running dockerized skywire-visor ${DOCKER_NODE}
 	-docker container stop ${DOCKER_NODE}
 
 docker-rerun: docker-stop
-	-./skywire-cli gen-config -o  ./node/skywire.json -r
+	-./skywire-cli gen-config -o ./node/skywire.json -r
 	perl -pi -e 's/localhost//g' ./node/skywire.json # To make node accessible from outside with skywire-cli
-	${DOCKER_OPTS} go build -race -o ./node/skywire-node ./cmd/skywire-node 
+	${DOCKER_OPTS} go build -race -o ./node/skywire-visor ./cmd/skywire-visor
 	docker container start -i ${DOCKER_NODE}
 
 run-syslog: ## Run syslog-ng in docker. Logs are mounted under /tmp/syslog
@@ -166,7 +166,7 @@ run-syslog: ## Run syslog-ng in docker. Logs are mounted under /tmp/syslog
 	docker run -d -p 514:514/udp  -v /tmp/syslog:/var/log  --name syslog-ng balabit/syslog-ng:latest 
 
 
-integration-startup: ## Starts up the required transports between 'skywire-node's of interactive testing environment
+integration-startup: ## Starts up the required transports between `skywire-visor`s of interactive testing environment
 	./integration/startup.sh
 
 integration-teardown: ## Tears down all saved configs and states of integration executables
@@ -192,3 +192,4 @@ mod-uncomm: ## Uncomments the 'replace' rule in go.mod
 
 help:
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+