From 3adf33fdd2ccd602f6e309b0b8677fe7ef948efc Mon Sep 17 00:00:00 2001 From: Nikita Kryuchkov Date: Mon, 3 Aug 2020 17:01:58 +0300 Subject: [PATCH 1/3] Fix module name Former-commit-id: 67d41b07ba5e20ee760e6d22dbb12fe9497387a8 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 0469b5d5e..052b55cd7 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/SkycoinProject/skywire-mainnet +module github.com/skycoin/skywire go 1.13 From 19f371057e77ee32ec533a5d327fe2f9050f6d29 Mon Sep 17 00:00:00 2001 From: Nikita Kryuchkov Date: Mon, 3 Aug 2020 17:13:38 +0300 Subject: [PATCH 2/3] Fix import path for this repository Former-commit-id: a301d07344d7040cb870255855834602392e28db --- .goreleaser.yml | 12 +- Makefile | 2 +- README.md | 8 +- ci_scripts/run-internal-tests.sh | 32 ++-- ci_scripts/run-pkg-tests.sh | 146 +++++++++--------- cmd/apps/helloworld/helloworld.go | 8 +- cmd/apps/skychat/chat.go | 10 +- cmd/apps/skysocks-client/skysocks-client.go | 14 +- cmd/apps/skysocks/skysocks.go | 10 +- cmd/hypervisor/commands/gen-config.go | 4 +- cmd/hypervisor/commands/root.go | 8 +- cmd/hypervisor/hypervisor.go | 2 +- cmd/setup-node/commands/root.go | 6 +- cmd/setup-node/setup-node.go | 2 +- cmd/skywire-cli/commands/mdisc/root.go | 4 +- cmd/skywire-cli/commands/root.go | 6 +- cmd/skywire-cli/commands/rtfind/root.go | 8 +- cmd/skywire-cli/commands/visor/app.go | 4 +- cmd/skywire-cli/commands/visor/gen-config.go | 12 +- cmd/skywire-cli/commands/visor/root.go | 2 +- cmd/skywire-cli/commands/visor/routes.go | 6 +- .../commands/visor/transport_discovery.go | 4 +- cmd/skywire-cli/commands/visor/transports.go | 6 +- cmd/skywire-cli/skywire-cli.go | 2 +- cmd/skywire-visor/commands/root.go | 10 +- cmd/skywire-visor/skywire-visor.go | 2 +- go.sum | 2 +- internal/skysocks/client.go | 2 +- internal/utclient/client.go | 2 +- internal/utclient/client_test.go | 2 +- mainnet_rules.md | 16 +- pkg/app/appnet/addr.go | 2 +- pkg/app/appnet/addr_test.go | 2 +- pkg/app/appnet/networker_test.go | 2 +- pkg/app/appnet/skywire_networker.go | 4 +- pkg/app/appserver/mock_proc_manager.go | 2 +- pkg/app/appserver/proc.go | 2 +- pkg/app/appserver/proc_manager.go | 2 +- pkg/app/appserver/proc_manager_test.go | 2 +- pkg/app/appserver/rpc_gateway.go | 8 +- pkg/app/appserver/rpc_gateway_test.go | 10 +- pkg/app/appserver/server.go | 2 +- pkg/app/appserver/server_test.go | 10 +- pkg/app/client.go | 8 +- pkg/app/client_test.go | 8 +- pkg/app/conn.go | 2 +- pkg/app/conn_test.go | 14 +- pkg/app/idmanager/util_test.go | 2 +- pkg/app/listener.go | 4 +- pkg/app/listener_test.go | 6 +- pkg/app/mock_rpc_client.go | 4 +- pkg/app/rpc_client.go | 8 +- pkg/app/rpc_client_test.go | 10 +- pkg/hypervisor/config.go | 4 +- pkg/hypervisor/hypervisor.go | 10 +- pkg/routefinder/rfclient/client.go | 2 +- pkg/routefinder/rfclient/mock.go | 4 +- pkg/router/mock_router.go | 2 +- pkg/router/route_group.go | 6 +- pkg/router/route_group_test.go | 8 +- pkg/router/router.go | 12 +- pkg/router/router_test.go | 12 +- pkg/router/routerclient/client.go | 4 +- pkg/router/routerclient/client_test.go | 6 +- pkg/router/routerclient/wrappers.go | 4 +- pkg/router/rpc_gateway.go | 2 +- pkg/router/rpc_gateway_test.go | 4 +- pkg/setup/idreservoir.go | 2 +- pkg/setup/node.go | 8 +- pkg/setup/node_test.go | 14 +- pkg/setup/rpc_gateway.go | 2 +- pkg/setup/setupclient/client.go | 4 +- pkg/setup/setupclient/wrappers.go | 6 +- pkg/snet/network.go | 2 +- pkg/snet/snettest/env.go | 4 +- pkg/transport-discovery/client/client.go | 4 +- pkg/transport-discovery/client/client_test.go | 4 +- pkg/transport/discovery_test.go | 2 +- pkg/transport/entry_test.go | 2 +- pkg/transport/handshake.go | 2 +- pkg/transport/handshake_test.go | 6 +- pkg/transport/log_test.go | 2 +- pkg/transport/managed_transport.go | 6 +- pkg/transport/manager.go | 8 +- pkg/transport/manager_test.go | 6 +- pkg/util/pathutil/configpath.go | 2 +- pkg/util/pathutil/util.go | 2 +- pkg/util/updater/updater.go | 6 +- pkg/util/updater/updater_test.go | 4 +- pkg/visor/config.go | 12 +- pkg/visor/config_test.go | 4 +- pkg/visor/rpc.go | 12 +- pkg/visor/rpc_client.go | 14 +- pkg/visor/rpc_client_serve.go | 2 +- pkg/visor/rpc_test.go | 12 +- pkg/visor/visor.go | 24 +-- pkg/visor/visor_test.go | 14 +- 97 files changed, 370 insertions(+), 370 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index a148b75f1..68e876438 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -19,7 +19,7 @@ builds: env: - CGO_ENABLED=0 main: ./cmd/skywire-visor/ - ldflags: -s -w -X github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo.version={{.Version}} -X github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo.commit={{.ShortCommit}} -X github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo.date={{.Date}} + ldflags: -s -w -X github.com/skycoin/skywire/pkg/util/buildinfo.version={{.Version}} -X github.com/skycoin/skywire/pkg/util/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire/pkg/util/buildinfo.date={{.Date}} - id: skywire-cli binary: skywire-cli goos: @@ -35,7 +35,7 @@ builds: env: - CGO_ENABLED=0 main: ./cmd/skywire-cli/ - ldflags: -s -w -X github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo.version={{.Version}} -X github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo.commit={{.ShortCommit}} -X github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo.date={{.Date}} + ldflags: -s -w -X github.com/skycoin/skywire/pkg/util/buildinfo.version={{.Version}} -X github.com/skycoin/skywire/pkg/util/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire/pkg/util/buildinfo.date={{.Date}} - id: hypervisor binary: hypervisor goos: @@ -51,7 +51,7 @@ builds: env: - CGO_ENABLED=0 main: ./cmd/hypervisor/ - ldflags: -s -w -X github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo.version={{.Version}} -X github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo.commit={{.ShortCommit}} -X github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo.date={{.Date}} + ldflags: -s -w -X github.com/skycoin/skywire/pkg/util/buildinfo.version={{.Version}} -X github.com/skycoin/skywire/pkg/util/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire/pkg/util/buildinfo.date={{.Date}} - id: skychat binary: apps/skychat goos: @@ -67,7 +67,7 @@ builds: env: - CGO_ENABLED=0 main: ./cmd/apps/skychat/ - ldflags: -s -w -X github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo.version={{.Version}} -X github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo.commit={{.ShortCommit}} -X github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo.date={{.Date}} + ldflags: -s -w -X github.com/skycoin/skywire/pkg/util/buildinfo.version={{.Version}} -X github.com/skycoin/skywire/pkg/util/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire/pkg/util/buildinfo.date={{.Date}} - id: skysocks binary: apps/skysocks goos: @@ -83,7 +83,7 @@ builds: env: - CGO_ENABLED=0 main: ./cmd/apps/skysocks/ - ldflags: -s -w -X github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo.version={{.Version}} -X github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo.commit={{.ShortCommit}} -X github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo.date={{.Date}} + ldflags: -s -w -X github.com/skycoin/skywire/pkg/util/buildinfo.version={{.Version}} -X github.com/skycoin/skywire/pkg/util/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire/pkg/util/buildinfo.date={{.Date}} - id: skysocks-client binary: apps/skysocks-client goos: @@ -99,7 +99,7 @@ builds: env: - CGO_ENABLED=0 main: ./cmd/apps/skysocks-client/ - ldflags: -s -w -X github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo.version={{.Version}} -X github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo.commit={{.ShortCommit}} -X github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo.date={{.Date}} + ldflags: -s -w -X github.com/skycoin/skywire/pkg/util/buildinfo.version={{.Version}} -X github.com/skycoin/skywire/pkg/util/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire/pkg/util/buildinfo.date={{.Date}} archives: - format: tar.gz wrap_in_directory: false diff --git a/Makefile b/Makefile index 8967baca2..78c7e6851 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ RFC_3339 := "+%Y-%m-%dT%H:%M:%SZ" DATE := $(shell date -u $(RFC_3339)) COMMIT := $(shell git rev-list -1 HEAD) -PROJECT_BASE := github.com/SkycoinProject/skywire-mainnet +PROJECT_BASE := github.com/skycoin/skywire OPTS?=GO111MODULE=on MANAGER_UI_DIR = static/skywire-manager-src DOCKER_IMAGE?=skywire-runner # docker image to use for running skywire-visor.`golang`, `buildpack-deps:stretch-scm` is OK too diff --git a/README.md b/README.md index ffb96464f..9d3a6f958 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.com/SkycoinProject/skywire-mainnet.svg?branch=master)](https://travis-ci.com/SkycoinProject/skywire-mainnet) +[![Build Status](https://travis-ci.com/skycoin/skywire.svg?branch=master)](https://travis-ci.com/skycoin/skywire) # Skywire Mainnet @@ -28,7 +28,7 @@ Skywire requires a version of [golang](https://golang.org/) with [go modules](ht ```bash # Clone. -$ git clone https://github.com/SkycoinProject/skywire-mainnet.git +$ git clone https://github.com/skycoin/skywire.git $ cd skywire-mainnet # Build. @@ -146,7 +146,7 @@ $ skywire-cli visor ls-tp ## Creating a GitHub release To maintain actual `skywire-visor` state on users' Skywire nodes we have a mechanism for updating `skywire-visor` binaries. -Binaries for each version are uploaded to [GitHub releases](https://github.com/SkycoinProject/skywire-mainnet/releases/). +Binaries for each version are uploaded to [GitHub releases](https://github.com/skycoin/skywire/releases/). We use [goreleaser](https://goreleaser.com) for creating them. ### How to create a GitHub release @@ -158,4 +158,4 @@ We use [goreleaser](https://goreleaser.com) for creating them. 5. Push the created tag to the repository: `git push origin 0.1.0`, where `0.1.0` is release version. 6. [Issue a personal GitHub access token.](https://github.com/settings/tokens) 7. Run `GITHUB_TOKEN=your_token make github-release` -8. [Check the created GitHub release.](https://github.com/SkycoinProject/skywire-mainnet/releases/) +8. [Check the created GitHub release.](https://github.com/skycoin/skywire/releases/) diff --git a/ci_scripts/run-internal-tests.sh b/ci_scripts/run-internal-tests.sh index 9a61a8766..bd1dec41b 100755 --- a/ci_scripts/run-internal-tests.sh +++ b/ci_scripts/run-internal-tests.sh @@ -1,20 +1,20 @@ # commit a70894c8c4223424151cdff7441b1fb2e6bad309 -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/httpauth -run TestClient >> ./logs/internal/TestClient.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/httpauth -run TestClient >> ./logs/internal/TestClient.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/ioutil -run TestAckReadWriter >> ./logs/internal/TestAckReadWriter.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/ioutil -run TestAckReadWriterCRCFailure >> ./logs/internal/TestAckReadWriterCRCFailure.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/ioutil -run TestAckReadWriterFlushOnClose >> ./logs/internal/TestAckReadWriterFlushOnClose.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/ioutil -run TestAckReadWriterPartialRead >> ./logs/internal/TestAckReadWriterPartialRead.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/ioutil -run TestAckReadWriterReadError >> ./logs/internal/TestAckReadWriterReadError.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/ioutil -run TestLenReadWriter >> ./logs/internal/TestLenReadWriter.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/ioutil -run TestAckReadWriter >> ./logs/internal/TestAckReadWriter.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/ioutil -run TestAckReadWriterCRCFailure >> ./logs/internal/TestAckReadWriterCRCFailure.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/ioutil -run TestAckReadWriterFlushOnClose >> ./logs/internal/TestAckReadWriterFlushOnClose.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/ioutil -run TestAckReadWriterPartialRead >> ./logs/internal/TestAckReadWriterPartialRead.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/ioutil -run TestAckReadWriterReadError >> ./logs/internal/TestAckReadWriterReadError.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/ioutil -run TestLenReadWriter >> ./logs/internal/TestLenReadWriter.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/noise -run TestRPCClientDialer >> ./logs/internal/TestRPCClientDialer.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/noise -run TestConn >> ./logs/internal/TestConn.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/noise -run TestListener >> ./logs/internal/TestListener.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/noise -run TestKKAndSecp256k1 >> ./logs/internal/TestKKAndSecp256k1.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/noise -run TestXKAndSecp256k1 >> ./logs/internal/TestXKAndSecp256k1.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/noise -run TestReadWriterKKPattern >> ./logs/internal/TestReadWriterKKPattern.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/noise -run TestReadWriterXKPattern >> ./logs/internal/TestReadWriterXKPattern.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/noise -run TestReadWriterConcurrentTCP >> ./logs/internal/TestReadWriterConcurrentTCP.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/noise -run TestRPCClientDialer >> ./logs/internal/TestRPCClientDialer.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/noise -run TestConn >> ./logs/internal/TestConn.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/noise -run TestListener >> ./logs/internal/TestListener.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/noise -run TestKKAndSecp256k1 >> ./logs/internal/TestKKAndSecp256k1.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/noise -run TestXKAndSecp256k1 >> ./logs/internal/TestXKAndSecp256k1.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/noise -run TestReadWriterKKPattern >> ./logs/internal/TestReadWriterKKPattern.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/noise -run TestReadWriterXKPattern >> ./logs/internal/TestReadWriterXKPattern.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/noise -run TestReadWriterConcurrentTCP >> ./logs/internal/TestReadWriterConcurrentTCP.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/skysocks -run TestProxy >> ./logs/internal/TestProxy.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/skysocks -run TestProxy >> ./logs/internal/TestProxy.log diff --git a/ci_scripts/run-pkg-tests.sh b/ci_scripts/run-pkg-tests.sh index eb33d8eb1..ac2149321 100755 --- a/ci_scripts/run-pkg-tests.sh +++ b/ci_scripts/run-pkg-tests.sh @@ -1,79 +1,79 @@ # commit a70894c8c4223424151cdff7441b1fb2e6bad309 -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/app -run TestAppDial >> ./logs/pkg/TestAppDial.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/app -run TestAppAccept >> ./logs/pkg/TestAppAccept.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/app -run TestAppWrite >> ./logs/pkg/TestAppWrite.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/app -run TestAppRead >> ./logs/pkg/TestAppRead.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/app -run TestAppSetup >> ./logs/pkg/TestAppSetup.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/app -run TestAppCloseConn >> ./logs/pkg/TestAppCloseConn.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/app -run TestAppClose >> ./logs/pkg/TestAppClose.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/app -run TestAppCommand >> ./logs/pkg/TestAppCommand.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/app -run TestPipeConn >> ./logs/pkg/TestPipeConn.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/app -run TestProtocol >> ./logs/pkg/TestProtocol.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/app -run TestProtocolParallel >> ./logs/pkg/TestProtocolParallel.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/app -run TestAppDial >> ./logs/pkg/TestAppDial.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/app -run TestAppAccept >> ./logs/pkg/TestAppAccept.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/app -run TestAppWrite >> ./logs/pkg/TestAppWrite.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/app -run TestAppRead >> ./logs/pkg/TestAppRead.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/app -run TestAppSetup >> ./logs/pkg/TestAppSetup.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/app -run TestAppCloseConn >> ./logs/pkg/TestAppCloseConn.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/app -run TestAppClose >> ./logs/pkg/TestAppClose.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/app -run TestAppCommand >> ./logs/pkg/TestAppCommand.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/app -run TestPipeConn >> ./logs/pkg/TestPipeConn.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/app -run TestProtocol >> ./logs/pkg/TestProtocol.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/app -run TestProtocolParallel >> ./logs/pkg/TestProtocolParallel.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/hypervisor -run TestNewVisor >> ./logs/pkg/TestNewVisor.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/hypervisor -run TestNewVisor >> ./logs/pkg/TestNewVisor.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/visor -run TestDmsgDiscovery >> ./logs/pkg/TestDmsgDiscovery.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/visor -run TestTransportDiscovery >> ./logs/pkg/TestTransportDiscovery.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/visor -run TestTransportLogStore >> ./logs/pkg/TestTransportLogStore.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/visor -run TestRoutingTable >> ./logs/pkg/TestRoutingTable.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/visor -run TestAppsConfig >> ./logs/pkg/TestAppsConfig.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/visor -run TestAppsDir >> ./logs/pkg/TestAppsDir.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/visor -run TestLocalDir >> ./logs/pkg/TestLocalDir.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/visor -run TestNewVisor >> ./logs/pkg/TestNewVisor.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/visor -run TestVisorStartClose >> ./logs/pkg/TestVisorStartClose.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/visor -run TestVisorSpawnApp >> ./logs/pkg/TestVisorSpawnApp.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/visor -run TestVisorSpawnAppValidations >> ./logs/pkg/TestVisorSpawnAppValidations.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/visor -run TestListApps >> ./logs/pkg/TestListApps.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/visor -run TestStartStopApp >> ./logs/pkg/TestStartStopApp.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/visor -run TestRPC >> ./logs/pkg/TestRPC.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/visor -run TestDmsgDiscovery >> ./logs/pkg/TestDmsgDiscovery.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/visor -run TestTransportDiscovery >> ./logs/pkg/TestTransportDiscovery.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/visor -run TestTransportLogStore >> ./logs/pkg/TestTransportLogStore.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/visor -run TestRoutingTable >> ./logs/pkg/TestRoutingTable.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/visor -run TestAppsConfig >> ./logs/pkg/TestAppsConfig.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/visor -run TestAppsDir >> ./logs/pkg/TestAppsDir.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/visor -run TestLocalDir >> ./logs/pkg/TestLocalDir.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/visor -run TestNewVisor >> ./logs/pkg/TestNewVisor.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/visor -run TestVisorStartClose >> ./logs/pkg/TestVisorStartClose.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/visor -run TestVisorSpawnApp >> ./logs/pkg/TestVisorSpawnApp.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/visor -run TestVisorSpawnAppValidations >> ./logs/pkg/TestVisorSpawnAppValidations.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/visor -run TestListApps >> ./logs/pkg/TestListApps.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/visor -run TestStartStopApp >> ./logs/pkg/TestStartStopApp.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/visor -run TestRPC >> ./logs/pkg/TestRPC.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestAppManagerInit >> ./logs/pkg/TestAppManagerInit.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestAppManagerSetupRouteGroup >> ./logs/pkg/TestAppManagerSetupRouteGroup.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestAppManagerCloseRouteGRoup >> ./logs/pkg/TestAppManagerCloseRouteGroup.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestAppManagerForward >> ./logs/pkg/TestAppManagerForward.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestManagedRoutingTableCleanup >> ./logs/pkg/TestManagedRoutingTableCleanup.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestPortManager >> ./logs/pkg/TestPortManager.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestRouteManagerGetRule >> ./logs/pkg/TestRouteManagerGetRule.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestRouteManagerRemoveRouteGroupRule >> ./logs/pkg/TestRouteManagerRemoveRouteGroupRule.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestRouteManagerAddRemoveRule >> ./logs/pkg/TestRouteManagerAddRemoveRule.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestRouteManagerDeleteRules >> ./logs/pkg/TestRouteManagerDeleteRules.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestRouteManagerConfirmRouteGroup >> ./logs/pkg/TestRouteManagerConfirmRouteGroup.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestRouteManagerRouteGroupClosed >> ./logs/pkg/TestRouteManagerRouteGroupClosed.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestRouterForwarding >> ./logs/pkg/TestRouterForwarding.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestRouterAppInit >> ./logs/pkg/TestRouterAppInit.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestRouterApp >> ./logs/pkg/TestRouterApp.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestRouterLocalApp >> ./logs/pkg/TestRouterLocalApp.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestRouterSetup >> ./logs/pkg/TestRouterSetup.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestRouterSetupRouteGroup >> ./logs/pkg/TestRouterSetupRouteGroup.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestRouterSetupRouteGroupLocal >> ./logs/pkg/TestRouterSetupRouteGroupLocal.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestRouterCloseRouteGroup >> ./logs/pkg/TestRouterCloseRouteGroup.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestRouterCloseRouteGroupOnAppClose >> ./logs/pkg/TestRouterCloseRouteGroupOnAppClose.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestRouterCloseRouteGroupOnRouterClose >> ./logs/pkg/TestRouterCloseRouteGroupOnRouterClose.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestRouterRouteExpiration >> ./logs/pkg/TestRouterRouteExpiration.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestAppManagerInit >> ./logs/pkg/TestAppManagerInit.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestAppManagerSetupRouteGroup >> ./logs/pkg/TestAppManagerSetupRouteGroup.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestAppManagerCloseRouteGRoup >> ./logs/pkg/TestAppManagerCloseRouteGroup.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestAppManagerForward >> ./logs/pkg/TestAppManagerForward.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestManagedRoutingTableCleanup >> ./logs/pkg/TestManagedRoutingTableCleanup.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestPortManager >> ./logs/pkg/TestPortManager.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestRouteManagerGetRule >> ./logs/pkg/TestRouteManagerGetRule.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestRouteManagerRemoveRouteGroupRule >> ./logs/pkg/TestRouteManagerRemoveRouteGroupRule.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestRouteManagerAddRemoveRule >> ./logs/pkg/TestRouteManagerAddRemoveRule.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestRouteManagerDeleteRules >> ./logs/pkg/TestRouteManagerDeleteRules.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestRouteManagerConfirmRouteGroup >> ./logs/pkg/TestRouteManagerConfirmRouteGroup.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestRouteManagerRouteGroupClosed >> ./logs/pkg/TestRouteManagerRouteGroupClosed.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestRouterForwarding >> ./logs/pkg/TestRouterForwarding.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestRouterAppInit >> ./logs/pkg/TestRouterAppInit.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestRouterApp >> ./logs/pkg/TestRouterApp.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestRouterLocalApp >> ./logs/pkg/TestRouterLocalApp.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestRouterSetup >> ./logs/pkg/TestRouterSetup.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestRouterSetupRouteGroup >> ./logs/pkg/TestRouterSetupRouteGroup.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestRouterSetupRouteGroupLocal >> ./logs/pkg/TestRouterSetupRouteGroupLocal.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestRouterCloseRouteGroup >> ./logs/pkg/TestRouterCloseRouteGroup.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestRouterCloseRouteGroupOnAppClose >> ./logs/pkg/TestRouterCloseRouteGroupOnAppClose.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestRouterCloseRouteGroupOnRouterClose >> ./logs/pkg/TestRouterCloseRouteGroupOnRouterClose.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestRouterRouteExpiration >> ./logs/pkg/TestRouterRouteExpiration.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/routing -run TestBoltDBRoutingTable >> ./logs/pkg/TestBoltDBRoutingTable.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/routing -run TestMakePacket >> ./logs/pkg/TestMakePacket.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/routing -run TestRoutingTable >> ./logs/pkg/TestRoutingTable.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/routing -run TestAppRule >> ./logs/pkg/TestAppRule.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/routing -run TestForwardRule >> ./logs/pkg/TestForwardRule.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/setup -run TestNewProtocol >> ./logs/pkg/TestNewProtocol.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/routing -run TestBoltDBRoutingTable >> ./logs/pkg/TestBoltDBRoutingTable.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/routing -run TestMakePacket >> ./logs/pkg/TestMakePacket.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/routing -run TestRoutingTable >> ./logs/pkg/TestRoutingTable.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/routing -run TestAppRule >> ./logs/pkg/TestAppRule.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/routing -run TestForwardRule >> ./logs/pkg/TestForwardRule.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/setup -run TestNewProtocol >> ./logs/pkg/TestNewProtocol.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/transport -run TestSettlementHandshake >> ./logs/pkg/TestSettlementHandshake.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/transport -run TestSettlementHandshakeInvalidSig >> ./logs/pkg/TestSettlementHandshakeInvalidSig.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/transport -run TestSettlementHandshakePrivate >> ./logs/pkg/TestSettlementHandshakePrivate.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/transport -run TestSettlementHandshakeExistingTransport >> ./logs/pkg/TestSettlementHandshakeExistingTransport.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/transport -run TestValidateEntry >> ./logs/pkg/TestValidateEntry.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/transport -run TestInMemoryTransportLogStore >> ./logs/pkg/TestInMemoryTransportLogStore.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/transport -run TestFileTransportLogStore >> ./logs/pkg/TestFileTransportLogStore.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/transport -run TestTransportManager >> ./logs/pkg/TestTransportManager.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/transport -run TestTransportManagerReEstablishTransports >> ./logs/pkg/TestTransportManagerReEstablishTransports.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/transport -run TestTransportManagerLogs >> ./logs/pkg/TestTransportManagerLogs.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/transport -run TestTCPFactory >> ./logs/pkg/TestTCPFactory.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/transport -run TestFilePKTable >> ./logs/pkg/TestFilePKTable.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/transport-discovery/client -run TestClientAuth >> ./logs/pkg/TestClientAuth.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/transport-discovery/client -run TestRegisterTransportResponses >> ./logs/pkg/TestRegisterTransportResponses.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/transport-discovery/client -run TestRegisterTransports >> ./logs/pkg/TestRegisterTransports.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/transport-discovery/client -run TestGetTransportByID >> ./logs/pkg/TestGetTransportByID.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/transport-discovery/client -run TestGetTransportsByEdge >> ./logs/pkg/TestGetTransportsByEdge.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/transport-discovery/client -run TestUpdateStatuses >> ./logs/pkg/TestUpdateStatuses.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/transport -run TestSettlementHandshake >> ./logs/pkg/TestSettlementHandshake.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/transport -run TestSettlementHandshakeInvalidSig >> ./logs/pkg/TestSettlementHandshakeInvalidSig.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/transport -run TestSettlementHandshakePrivate >> ./logs/pkg/TestSettlementHandshakePrivate.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/transport -run TestSettlementHandshakeExistingTransport >> ./logs/pkg/TestSettlementHandshakeExistingTransport.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/transport -run TestValidateEntry >> ./logs/pkg/TestValidateEntry.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/transport -run TestInMemoryTransportLogStore >> ./logs/pkg/TestInMemoryTransportLogStore.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/transport -run TestFileTransportLogStore >> ./logs/pkg/TestFileTransportLogStore.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/transport -run TestTransportManager >> ./logs/pkg/TestTransportManager.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/transport -run TestTransportManagerReEstablishTransports >> ./logs/pkg/TestTransportManagerReEstablishTransports.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/transport -run TestTransportManagerLogs >> ./logs/pkg/TestTransportManagerLogs.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/transport -run TestTCPFactory >> ./logs/pkg/TestTCPFactory.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/transport -run TestFilePKTable >> ./logs/pkg/TestFilePKTable.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/transport-discovery/client -run TestClientAuth >> ./logs/pkg/TestClientAuth.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/transport-discovery/client -run TestRegisterTransportResponses >> ./logs/pkg/TestRegisterTransportResponses.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/transport-discovery/client -run TestRegisterTransports >> ./logs/pkg/TestRegisterTransports.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/transport-discovery/client -run TestGetTransportByID >> ./logs/pkg/TestGetTransportByID.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/transport-discovery/client -run TestGetTransportsByEdge >> ./logs/pkg/TestGetTransportsByEdge.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/transport-discovery/client -run TestUpdateStatuses >> ./logs/pkg/TestUpdateStatuses.log diff --git a/cmd/apps/helloworld/helloworld.go b/cmd/apps/helloworld/helloworld.go index 705f9cad4..e8a178f35 100644 --- a/cmd/apps/helloworld/helloworld.go +++ b/cmd/apps/helloworld/helloworld.go @@ -10,10 +10,10 @@ import ( "github.com/SkycoinProject/dmsg/cipher" "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/pkg/app" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appnet" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo" + "github.com/skycoin/skywire/pkg/app" + "github.com/skycoin/skywire/pkg/app/appnet" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/util/buildinfo" ) const ( diff --git a/cmd/apps/skychat/chat.go b/cmd/apps/skychat/chat.go index 31a4d2551..844ac0efe 100644 --- a/cmd/apps/skychat/chat.go +++ b/cmd/apps/skychat/chat.go @@ -17,11 +17,11 @@ import ( "github.com/SkycoinProject/dmsg/cipher" "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/internal/netutil" - "github.com/SkycoinProject/skywire-mainnet/pkg/app" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appnet" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo" + "github.com/skycoin/skywire/internal/netutil" + "github.com/skycoin/skywire/pkg/app" + "github.com/skycoin/skywire/pkg/app/appnet" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/util/buildinfo" ) const ( diff --git a/cmd/apps/skysocks-client/skysocks-client.go b/cmd/apps/skysocks-client/skysocks-client.go index 114554044..a9fe47d87 100644 --- a/cmd/apps/skysocks-client/skysocks-client.go +++ b/cmd/apps/skysocks-client/skysocks-client.go @@ -13,13 +13,13 @@ import ( "github.com/SkycoinProject/dmsg/cipher" "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/internal/netutil" - "github.com/SkycoinProject/skywire-mainnet/internal/skysocks" - "github.com/SkycoinProject/skywire-mainnet/pkg/app" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appnet" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" - "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo" + "github.com/skycoin/skywire/internal/netutil" + "github.com/skycoin/skywire/internal/skysocks" + "github.com/skycoin/skywire/pkg/app" + "github.com/skycoin/skywire/pkg/app/appnet" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/util/buildinfo" ) const ( diff --git a/cmd/apps/skysocks/skysocks.go b/cmd/apps/skysocks/skysocks.go index 3f1ff4e18..71609d4bc 100644 --- a/cmd/apps/skysocks/skysocks.go +++ b/cmd/apps/skysocks/skysocks.go @@ -11,11 +11,11 @@ import ( "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/internal/skysocks" - "github.com/SkycoinProject/skywire-mainnet/pkg/app" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appnet" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo" + "github.com/skycoin/skywire/internal/skysocks" + "github.com/skycoin/skywire/pkg/app" + "github.com/skycoin/skywire/pkg/app/appnet" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/util/buildinfo" ) const ( diff --git a/cmd/hypervisor/commands/gen-config.go b/cmd/hypervisor/commands/gen-config.go index 0461a6e0f..8964e8e6a 100644 --- a/cmd/hypervisor/commands/gen-config.go +++ b/cmd/hypervisor/commands/gen-config.go @@ -6,8 +6,8 @@ import ( "github.com/spf13/cobra" - "github.com/SkycoinProject/skywire-mainnet/pkg/hypervisor" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/pathutil" + "github.com/skycoin/skywire/pkg/hypervisor" + "github.com/skycoin/skywire/pkg/util/pathutil" ) // nolint:gochecknoglobals diff --git a/cmd/hypervisor/commands/root.go b/cmd/hypervisor/commands/root.go index 5866bcd3c..8bdb60ce5 100644 --- a/cmd/hypervisor/commands/root.go +++ b/cmd/hypervisor/commands/root.go @@ -11,10 +11,10 @@ import ( "github.com/rakyll/statik/fs" "github.com/spf13/cobra" - _ "github.com/SkycoinProject/skywire-mainnet/cmd/hypervisor/statik" // embedded static files - "github.com/SkycoinProject/skywire-mainnet/pkg/hypervisor" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/pathutil" + _ "github.com/skycoin/skywire/cmd/hypervisor/statik" // embedded static files + "github.com/skycoin/skywire/pkg/hypervisor" + "github.com/skycoin/skywire/pkg/util/buildinfo" + "github.com/skycoin/skywire/pkg/util/pathutil" ) const configEnv = "SW_HYPERVISOR_CONFIG" diff --git a/cmd/hypervisor/hypervisor.go b/cmd/hypervisor/hypervisor.go index d04920195..836a2693c 100644 --- a/cmd/hypervisor/hypervisor.go +++ b/cmd/hypervisor/hypervisor.go @@ -4,7 +4,7 @@ skywire hypervisor package main import ( - "github.com/SkycoinProject/skywire-mainnet/cmd/hypervisor/commands" + "github.com/skycoin/skywire/cmd/hypervisor/commands" ) func main() { diff --git a/cmd/setup-node/commands/root.go b/cmd/setup-node/commands/root.go index 2fe966d28..a07c5f05e 100644 --- a/cmd/setup-node/commands/root.go +++ b/cmd/setup-node/commands/root.go @@ -15,9 +15,9 @@ import ( logrussyslog "github.com/sirupsen/logrus/hooks/syslog" "github.com/spf13/cobra" - "github.com/SkycoinProject/skywire-mainnet/pkg/metrics" - "github.com/SkycoinProject/skywire-mainnet/pkg/setup" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo" + "github.com/skycoin/skywire/pkg/metrics" + "github.com/skycoin/skywire/pkg/setup" + "github.com/skycoin/skywire/pkg/util/buildinfo" ) var ( diff --git a/cmd/setup-node/setup-node.go b/cmd/setup-node/setup-node.go index fbf1c7e2d..6c0c4ee21 100644 --- a/cmd/setup-node/setup-node.go +++ b/cmd/setup-node/setup-node.go @@ -1,7 +1,7 @@ package main import ( - "github.com/SkycoinProject/skywire-mainnet/cmd/setup-node/commands" + "github.com/skycoin/skywire/cmd/setup-node/commands" ) func main() { diff --git a/cmd/skywire-cli/commands/mdisc/root.go b/cmd/skywire-cli/commands/mdisc/root.go index fdfe55dcc..426105d2c 100644 --- a/cmd/skywire-cli/commands/mdisc/root.go +++ b/cmd/skywire-cli/commands/mdisc/root.go @@ -7,12 +7,12 @@ import ( "text/tabwriter" "time" - "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skyenv" "github.com/SkycoinProject/dmsg/disc" "github.com/spf13/cobra" - "github.com/SkycoinProject/skywire-mainnet/cmd/skywire-cli/internal" + "github.com/skycoin/skywire/cmd/skywire-cli/internal" ) var mdAddr string diff --git a/cmd/skywire-cli/commands/root.go b/cmd/skywire-cli/commands/root.go index 567f5fb1a..4367812b5 100644 --- a/cmd/skywire-cli/commands/root.go +++ b/cmd/skywire-cli/commands/root.go @@ -5,9 +5,9 @@ import ( "github.com/spf13/cobra" - "github.com/SkycoinProject/skywire-mainnet/cmd/skywire-cli/commands/mdisc" - "github.com/SkycoinProject/skywire-mainnet/cmd/skywire-cli/commands/rtfind" - "github.com/SkycoinProject/skywire-mainnet/cmd/skywire-cli/commands/visor" + "github.com/skycoin/skywire/cmd/skywire-cli/commands/mdisc" + "github.com/skycoin/skywire/cmd/skywire-cli/commands/rtfind" + "github.com/skycoin/skywire/cmd/skywire-cli/commands/visor" ) var rootCmd = &cobra.Command{ diff --git a/cmd/skywire-cli/commands/rtfind/root.go b/cmd/skywire-cli/commands/rtfind/root.go index be2b90fa2..ef4308159 100644 --- a/cmd/skywire-cli/commands/rtfind/root.go +++ b/cmd/skywire-cli/commands/rtfind/root.go @@ -4,15 +4,15 @@ 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/skycoin/skywire/pkg/routefinder/rfclient" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/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/skycoin/skywire/cmd/skywire-cli/internal" ) var frAddr string diff --git a/cmd/skywire-cli/commands/visor/app.go b/cmd/skywire-cli/commands/visor/app.go index 83bc7e13f..1f492427d 100644 --- a/cmd/skywire-cli/commands/visor/app.go +++ b/cmd/skywire-cli/commands/visor/app.go @@ -10,8 +10,8 @@ import ( "github.com/spf13/cobra" - "github.com/SkycoinProject/skywire-mainnet/cmd/skywire-cli/internal" - "github.com/SkycoinProject/skywire-mainnet/pkg/visor" + "github.com/skycoin/skywire/cmd/skywire-cli/internal" + "github.com/skycoin/skywire/pkg/visor" ) func init() { diff --git a/cmd/skywire-cli/commands/visor/gen-config.go b/cmd/skywire-cli/commands/visor/gen-config.go index 06ecccc18..f3e527d4e 100644 --- a/cmd/skywire-cli/commands/visor/gen-config.go +++ b/cmd/skywire-cli/commands/visor/gen-config.go @@ -7,16 +7,16 @@ import ( "path" "path/filepath" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appcommon" - "github.com/SkycoinProject/skywire-mainnet/pkg/restart" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" - "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" + "github.com/skycoin/skywire/pkg/app/appcommon" + "github.com/skycoin/skywire/pkg/restart" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skyenv" "github.com/SkycoinProject/dmsg/cipher" "github.com/spf13/cobra" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/pathutil" - "github.com/SkycoinProject/skywire-mainnet/pkg/visor" + "github.com/skycoin/skywire/pkg/util/pathutil" + "github.com/skycoin/skywire/pkg/visor" ) func init() { diff --git a/cmd/skywire-cli/commands/visor/root.go b/cmd/skywire-cli/commands/visor/root.go index d304818e2..1c35f3421 100644 --- a/cmd/skywire-cli/commands/visor/root.go +++ b/cmd/skywire-cli/commands/visor/root.go @@ -8,7 +8,7 @@ import ( "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/spf13/cobra" - "github.com/SkycoinProject/skywire-mainnet/pkg/visor" + "github.com/skycoin/skywire/pkg/visor" ) var logger = logging.MustGetLogger("skywire-cli") diff --git a/cmd/skywire-cli/commands/visor/routes.go b/cmd/skywire-cli/commands/visor/routes.go index 66e8a808a..17590e7e5 100644 --- a/cmd/skywire-cli/commands/visor/routes.go +++ b/cmd/skywire-cli/commands/visor/routes.go @@ -11,9 +11,9 @@ import ( "github.com/spf13/cobra" - "github.com/SkycoinProject/skywire-mainnet/cmd/skywire-cli/internal" - "github.com/SkycoinProject/skywire-mainnet/pkg/router" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/skycoin/skywire/cmd/skywire-cli/internal" + "github.com/skycoin/skywire/pkg/router" + "github.com/skycoin/skywire/pkg/routing" ) func init() { diff --git a/cmd/skywire-cli/commands/visor/transport_discovery.go b/cmd/skywire-cli/commands/visor/transport_discovery.go index 1bbf91a6c..483a2da26 100644 --- a/cmd/skywire-cli/commands/visor/transport_discovery.go +++ b/cmd/skywire-cli/commands/visor/transport_discovery.go @@ -10,8 +10,8 @@ import ( "github.com/google/uuid" "github.com/spf13/cobra" - "github.com/SkycoinProject/skywire-mainnet/cmd/skywire-cli/internal" - "github.com/SkycoinProject/skywire-mainnet/pkg/transport" + "github.com/skycoin/skywire/cmd/skywire-cli/internal" + "github.com/skycoin/skywire/pkg/transport" ) func init() { diff --git a/cmd/skywire-cli/commands/visor/transports.go b/cmd/skywire-cli/commands/visor/transports.go index ecb12b912..bd91eaa48 100644 --- a/cmd/skywire-cli/commands/visor/transports.go +++ b/cmd/skywire-cli/commands/visor/transports.go @@ -11,9 +11,9 @@ import ( "github.com/SkycoinProject/dmsg/cipher" "github.com/spf13/cobra" - "github.com/SkycoinProject/skywire-mainnet/cmd/skywire-cli/internal" - "github.com/SkycoinProject/skywire-mainnet/pkg/snet/stcp" - "github.com/SkycoinProject/skywire-mainnet/pkg/visor" + "github.com/skycoin/skywire/cmd/skywire-cli/internal" + "github.com/skycoin/skywire/pkg/snet/stcp" + "github.com/skycoin/skywire/pkg/visor" ) func init() { diff --git a/cmd/skywire-cli/skywire-cli.go b/cmd/skywire-cli/skywire-cli.go index 66d50e0a3..0d2da60de 100644 --- a/cmd/skywire-cli/skywire-cli.go +++ b/cmd/skywire-cli/skywire-cli.go @@ -4,7 +4,7 @@ CLI for skywire visor package main import ( - "github.com/SkycoinProject/skywire-mainnet/cmd/skywire-cli/commands" + "github.com/skycoin/skywire/cmd/skywire-cli/commands" ) func main() { diff --git a/cmd/skywire-visor/commands/root.go b/cmd/skywire-visor/commands/root.go index 1b689f856..e4524a510 100644 --- a/cmd/skywire-visor/commands/root.go +++ b/cmd/skywire-visor/commands/root.go @@ -24,11 +24,11 @@ import ( logrussyslog "github.com/sirupsen/logrus/hooks/syslog" "github.com/spf13/cobra" - "github.com/SkycoinProject/skywire-mainnet/internal/utclient" - "github.com/SkycoinProject/skywire-mainnet/pkg/restart" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/pathutil" - "github.com/SkycoinProject/skywire-mainnet/pkg/visor" + "github.com/skycoin/skywire/internal/utclient" + "github.com/skycoin/skywire/pkg/restart" + "github.com/skycoin/skywire/pkg/util/buildinfo" + "github.com/skycoin/skywire/pkg/util/pathutil" + "github.com/skycoin/skywire/pkg/visor" ) // TODO(evanlinjin): Determine if this is still needed. diff --git a/cmd/skywire-visor/skywire-visor.go b/cmd/skywire-visor/skywire-visor.go index 282da4c41..d4aa990b7 100644 --- a/cmd/skywire-visor/skywire-visor.go +++ b/cmd/skywire-visor/skywire-visor.go @@ -4,7 +4,7 @@ skywire visor package main import ( - "github.com/SkycoinProject/skywire-mainnet/cmd/skywire-visor/commands" + "github.com/skycoin/skywire/cmd/skywire-visor/commands" ) func main() { diff --git a/go.sum b/go.sum index 99ac554da..cd670f98e 100644 --- a/go.sum +++ b/go.sum @@ -8,7 +8,7 @@ github.com/SkycoinProject/dmsg v0.2.0/go.mod h1:MiX+UG/6fl3g+9rS13/fq7BwUQ2eOlg1 github.com/SkycoinProject/skycoin v0.26.0/go.mod h1:xqPLOKh5B6GBZlGA7B5IJfQmCy7mwimD9NlqxR3gMXo= github.com/SkycoinProject/skycoin v0.27.0 h1:N3IHxj8ossHOcsxLYOYugT+OaELLncYHJHxbbYLPPmY= github.com/SkycoinProject/skycoin v0.27.0/go.mod h1:xqPLOKh5B6GBZlGA7B5IJfQmCy7mwimD9NlqxR3gMXo= -github.com/SkycoinProject/skywire-mainnet v0.0.0-20200309204032-14af5342da86/go.mod h1:xuOpE5ZZU2kR39u0tJWtOpak/sJpnEFj1HpTxtyPU/A= +github.com/skycoin/skywire v0.0.0-20200309204032-14af5342da86/go.mod h1:xuOpE5ZZU2kR39u0tJWtOpak/sJpnEFj1HpTxtyPU/A= github.com/SkycoinProject/yamux v0.0.0-20191213015001-a36efeefbf6a h1:6nHCJqh7trsuRcpMC5JmtDukUndn2VC9sY64K6xQ7hQ= github.com/SkycoinProject/yamux v0.0.0-20191213015001-a36efeefbf6a/go.mod h1:IaE1dxncLQs4RJcQTZPikJfAZY4szH87u2h0lT0SDuM= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= diff --git a/internal/skysocks/client.go b/internal/skysocks/client.go index ec042c6d9..a144bb8fd 100644 --- a/internal/skysocks/client.go +++ b/internal/skysocks/client.go @@ -10,7 +10,7 @@ import ( "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/SkycoinProject/yamux" - "github.com/SkycoinProject/skywire-mainnet/pkg/router" + "github.com/skycoin/skywire/pkg/router" ) // Log is skysocks package level logger, it can be replaced with a different one from outside the package diff --git a/internal/utclient/client.go b/internal/utclient/client.go index 9a3dd352d..49ea2e3d7 100644 --- a/internal/utclient/client.go +++ b/internal/utclient/client.go @@ -14,7 +14,7 @@ import ( "github.com/SkycoinProject/dmsg/cipher" "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/internal/httpauth" + "github.com/skycoin/skywire/internal/httpauth" ) var log = logging.MustGetLogger("utclient") diff --git a/internal/utclient/client_test.go b/internal/utclient/client_test.go index 29c8ebb8d..a6a88c1ec 100644 --- a/internal/utclient/client_test.go +++ b/internal/utclient/client_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire-mainnet/internal/httpauth" + "github.com/skycoin/skywire/internal/httpauth" ) var testPubKey, testSecKey = cipher.GenerateKeyPair() diff --git a/mainnet_rules.md b/mainnet_rules.md index 93b9a3fb6..141efc916 100644 --- a/mainnet_rules.md +++ b/mainnet_rules.md @@ -22,7 +22,7 @@ This article represents the central source of information for the Skywire mainne * Read this information thoroughly and ask in the [Skywire](https://t.me/skywire) Telegram channel if some things appear to not be covered. * Please join [SkywirePSA](https://t.me/SkywirePSA) as well to get structured public service announcements (PSA) about the Skywire project. -* In case you bought an official Skyminer in the [Skycoin hardware store](https://store.skycoin.com/) please read [the Official Skyminer Guide](https://github.com/skycoinproject/skywire-mainnet/wiki/Skyminer-Official-Guide) if you haven't done that already. +* In case you bought an official Skyminer in the [Skycoin hardware store](https://store.skycoin.com/) please read [the Official Skyminer Guide](https://github.com/skycoin/skywire/wiki/Skyminer-Official-Guide) if you haven't done that already. * Participants will be contacted at the beginning of every month via the so-called *Skywire Status Update Emails* including details of their last month's Skywire mainnet participation. * You can contact support at store.skycoin.com/pages/support @@ -42,7 +42,7 @@ Based on this central rule, each whitelisted person is eligible for receiving re * one DIY miner with up to 8 (eight) nodes
You must use the Skywire Whitelisting System to keep your submitted data up to date -
Read the Skywire whitelisting system user guide to familiarize yourself with the new system.
+
Read the Skywire whitelisting system user guide to familiarize yourself with the new system.
Different locations are required due to the fact that we want to spread out the meshnet and not create built-up areas. This prevents paying people to simply run single board computers (SBC) and to require them to provide a service to the network. @@ -130,9 +130,9 @@ We are calculating the underlying Skycoin price for your rewards based on the mo As of now, you are provided with two tools to check whether or not you're online and generating uptime: * The [discovery website](https://uptime-tracker.skywire.skycoin.com/visors) * The [Skywire whitelisting system](https://whitelist.skycoin.com) - - along with the [Skywire whitelisting system user guide](https://github.com/skycoinproject/skywire-mainnet/wiki/Skywire-Whitelisting-System) + - along with the [Skywire whitelisting system user guide](https://github.com/skycoin/skywire/wiki/Skywire-Whitelisting-System) -You are advised to use [this guide](https://github.com/SkycoinProject/skywire-mainnet/wiki/Troubleshooting#online-status-verification) to **verify that your nodes are online & connected to the discovery server**. +You are advised to use [this guide](https://github.com/skycoin/skywire/wiki/Troubleshooting#online-status-verification) to **verify that your nodes are online & connected to the discovery server**.
Make sure to verify the online status of your nodes on a regular basis!
*** @@ -289,7 +289,7 @@ The following hardware is accepted in the Skywire mainnet: ## Whitelist
Whitelist applications must be submitted using the Skywire Whitelisting System.
-All necessary steps to get up and running are described in this guide
+All necessary steps to get up and running are described in this guide
@@ -316,7 +316,7 @@ All necessary steps to get up and running are described in You must use the Skywire Whitelisting System to keep your submitted data up to date -
Read this guide to familiarize yourself with the new system.
+
Read this guide to familiarize yourself with the new system.
* Keep your account data up to date using the [Skywire Whitelisting System](https://whitelist.skycoin.com) @@ -325,14 +325,14 @@ All necessary steps to get up and running are described in Please note that your account was pre-made for you after purchasing.
You received an email with all necessary links & instructions, please check your inbox and follow the steps in the Official Skyminer Guide! +
Please note that your account was pre-made for you after purchasing.
You received an email with all necessary links & instructions, please check your inbox and follow the steps in the Official Skyminer Guide!
#### DIY Miner - Required Data for the Whitelisting System - Location; doesn't have to be 100% precise. diff --git a/pkg/app/appnet/addr.go b/pkg/app/appnet/addr.go index 040554741..7e6805f52 100644 --- a/pkg/app/appnet/addr.go +++ b/pkg/app/appnet/addr.go @@ -8,7 +8,7 @@ import ( "github.com/SkycoinProject/dmsg" "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/skycoin/skywire/pkg/routing" ) var ( diff --git a/pkg/app/appnet/addr_test.go b/pkg/app/appnet/addr_test.go index 087fc1e5b..d0a00854e 100644 --- a/pkg/app/appnet/addr_test.go +++ b/pkg/app/appnet/addr_test.go @@ -8,7 +8,7 @@ import ( "github.com/SkycoinProject/dmsg/cipher" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/skycoin/skywire/pkg/routing" ) func TestConvertAddr(t *testing.T) { diff --git a/pkg/app/appnet/networker_test.go b/pkg/app/appnet/networker_test.go index dad3b5d1c..c681392ce 100644 --- a/pkg/app/appnet/networker_test.go +++ b/pkg/app/appnet/networker_test.go @@ -8,7 +8,7 @@ import ( "github.com/SkycoinProject/dmsg/cipher" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/skycoin/skywire/pkg/routing" ) func TestAddNetworker(t *testing.T) { diff --git a/pkg/app/appnet/skywire_networker.go b/pkg/app/appnet/skywire_networker.go index 59c68c450..58b9b6722 100644 --- a/pkg/app/appnet/skywire_networker.go +++ b/pkg/app/appnet/skywire_networker.go @@ -12,8 +12,8 @@ import ( "github.com/SkycoinProject/dmsg/netutil" "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/pkg/router" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/skycoin/skywire/pkg/router" + "github.com/skycoin/skywire/pkg/routing" ) var ( diff --git a/pkg/app/appserver/mock_proc_manager.go b/pkg/app/appserver/mock_proc_manager.go index 483cde0e9..7009504f6 100644 --- a/pkg/app/appserver/mock_proc_manager.go +++ b/pkg/app/appserver/mock_proc_manager.go @@ -5,7 +5,7 @@ package appserver import ( io "io" - appcommon "github.com/SkycoinProject/skywire-mainnet/pkg/app/appcommon" + appcommon "github.com/skycoin/skywire/pkg/app/appcommon" logging "github.com/SkycoinProject/skycoin/src/util/logging" diff --git a/pkg/app/appserver/proc.go b/pkg/app/appserver/proc.go index fe22baa53..84d8fbe31 100644 --- a/pkg/app/appserver/proc.go +++ b/pkg/app/appserver/proc.go @@ -12,7 +12,7 @@ import ( "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appcommon" + "github.com/skycoin/skywire/pkg/app/appcommon" ) var ( diff --git a/pkg/app/appserver/proc_manager.go b/pkg/app/appserver/proc_manager.go index 9bee5fad0..d9ac0bed7 100644 --- a/pkg/app/appserver/proc_manager.go +++ b/pkg/app/appserver/proc_manager.go @@ -10,7 +10,7 @@ import ( "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appcommon" + "github.com/skycoin/skywire/pkg/app/appcommon" ) //go:generate mockery -name ProcManager -case underscore -inpkg diff --git a/pkg/app/appserver/proc_manager_test.go b/pkg/app/appserver/proc_manager_test.go index a046b4ab0..4a74a72c0 100644 --- a/pkg/app/appserver/proc_manager_test.go +++ b/pkg/app/appserver/proc_manager_test.go @@ -4,7 +4,7 @@ import ( "sort" "testing" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appcommon" + "github.com/skycoin/skywire/pkg/app/appcommon" "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/stretchr/testify/require" diff --git a/pkg/app/appserver/rpc_gateway.go b/pkg/app/appserver/rpc_gateway.go index 815c5177e..f0643fbdb 100644 --- a/pkg/app/appserver/rpc_gateway.go +++ b/pkg/app/appserver/rpc_gateway.go @@ -9,10 +9,10 @@ import ( "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appnet" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/idmanager" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/rpcutil" + "github.com/skycoin/skywire/pkg/app/appnet" + "github.com/skycoin/skywire/pkg/app/idmanager" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/util/rpcutil" ) // RPCIOErr is used to return an error coming from network stack. diff --git a/pkg/app/appserver/rpc_gateway_test.go b/pkg/app/appserver/rpc_gateway_test.go index 36a01b7f3..31297df6e 100644 --- a/pkg/app/appserver/rpc_gateway_test.go +++ b/pkg/app/appserver/rpc_gateway_test.go @@ -16,11 +16,11 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "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/app/idmanager" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/skycoin/skywire/internal/testhelpers" + "github.com/skycoin/skywire/pkg/app/appcommon" + "github.com/skycoin/skywire/pkg/app/appnet" + "github.com/skycoin/skywire/pkg/app/idmanager" + "github.com/skycoin/skywire/pkg/routing" ) func TestRPCGateway_Dial(t *testing.T) { diff --git a/pkg/app/appserver/server.go b/pkg/app/appserver/server.go index 93ec5035d..88f96e865 100644 --- a/pkg/app/appserver/server.go +++ b/pkg/app/appserver/server.go @@ -9,7 +9,7 @@ import ( "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appcommon" + "github.com/skycoin/skywire/pkg/app/appcommon" ) // Server is a server for app/visor communication. diff --git a/pkg/app/appserver/server_test.go b/pkg/app/appserver/server_test.go index b82930a9f..33dac3bc1 100644 --- a/pkg/app/appserver/server_test.go +++ b/pkg/app/appserver/server_test.go @@ -12,11 +12,11 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire-mainnet/pkg/app" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appcommon" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appnet" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appserver" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/skycoin/skywire/pkg/app" + "github.com/skycoin/skywire/pkg/app/appcommon" + "github.com/skycoin/skywire/pkg/app/appnet" + "github.com/skycoin/skywire/pkg/app/appserver" + "github.com/skycoin/skywire/pkg/routing" ) const ( diff --git a/pkg/app/client.go b/pkg/app/client.go index 24cea7f82..46d97e257 100644 --- a/pkg/app/client.go +++ b/pkg/app/client.go @@ -11,10 +11,10 @@ import ( "github.com/SkycoinProject/dmsg/cipher" "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appcommon" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appnet" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/idmanager" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/skycoin/skywire/pkg/app/appcommon" + "github.com/skycoin/skywire/pkg/app/appnet" + "github.com/skycoin/skywire/pkg/app/idmanager" + "github.com/skycoin/skywire/pkg/routing" ) var ( diff --git a/pkg/app/client_test.go b/pkg/app/client_test.go index 80cb9afa7..884348c1e 100644 --- a/pkg/app/client_test.go +++ b/pkg/app/client_test.go @@ -9,10 +9,10 @@ import ( "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appcommon" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appnet" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/idmanager" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/skycoin/skywire/pkg/app/appcommon" + "github.com/skycoin/skywire/pkg/app/appnet" + "github.com/skycoin/skywire/pkg/app/idmanager" + "github.com/skycoin/skywire/pkg/routing" ) func TestClientConfigFromEnv(t *testing.T) { diff --git a/pkg/app/conn.go b/pkg/app/conn.go index ee70225b9..daeb2dfec 100644 --- a/pkg/app/conn.go +++ b/pkg/app/conn.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appnet" + "github.com/skycoin/skywire/pkg/app/appnet" ) // Conn is a connection from app client to the server. diff --git a/pkg/app/conn_test.go b/pkg/app/conn_test.go index c4dceec04..1b01a6869 100644 --- a/pkg/app/conn_test.go +++ b/pkg/app/conn_test.go @@ -12,13 +12,13 @@ import ( "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/app/appserver" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/idmanager" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" - "github.com/SkycoinProject/skywire-mainnet/pkg/snet/snettest" + "github.com/skycoin/skywire/internal/testhelpers" + "github.com/skycoin/skywire/pkg/app/appcommon" + "github.com/skycoin/skywire/pkg/app/appnet" + "github.com/skycoin/skywire/pkg/app/appserver" + "github.com/skycoin/skywire/pkg/app/idmanager" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/snet/snettest" ) func TestConn_Read(t *testing.T) { diff --git a/pkg/app/idmanager/util_test.go b/pkg/app/idmanager/util_test.go index 7b3a8c4a4..b39ab86a0 100644 --- a/pkg/app/idmanager/util_test.go +++ b/pkg/app/idmanager/util_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appcommon" + "github.com/skycoin/skywire/pkg/app/appcommon" ) func TestAssertListener(t *testing.T) { diff --git a/pkg/app/listener.go b/pkg/app/listener.go index bdd3c4faf..d8e08a341 100644 --- a/pkg/app/listener.go +++ b/pkg/app/listener.go @@ -7,8 +7,8 @@ import ( "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appnet" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/idmanager" + "github.com/skycoin/skywire/pkg/app/appnet" + "github.com/skycoin/skywire/pkg/app/idmanager" ) // Listener is a listener for app server connections. diff --git a/pkg/app/listener_test.go b/pkg/app/listener_test.go index 08cffa450..4b9630907 100644 --- a/pkg/app/listener_test.go +++ b/pkg/app/listener_test.go @@ -8,9 +8,9 @@ import ( "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appnet" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/idmanager" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/skycoin/skywire/pkg/app/appnet" + "github.com/skycoin/skywire/pkg/app/idmanager" + "github.com/skycoin/skywire/pkg/routing" ) func TestListener_Accept(t *testing.T) { diff --git a/pkg/app/mock_rpc_client.go b/pkg/app/mock_rpc_client.go index f3c62f323..1f7155b37 100644 --- a/pkg/app/mock_rpc_client.go +++ b/pkg/app/mock_rpc_client.go @@ -5,9 +5,9 @@ package app import ( mock "github.com/stretchr/testify/mock" - appnet "github.com/SkycoinProject/skywire-mainnet/pkg/app/appnet" + appnet "github.com/skycoin/skywire/pkg/app/appnet" - routing "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + routing "github.com/skycoin/skywire/pkg/routing" time "time" ) diff --git a/pkg/app/rpc_client.go b/pkg/app/rpc_client.go index 65d4bfff9..1e41e366b 100644 --- a/pkg/app/rpc_client.go +++ b/pkg/app/rpc_client.go @@ -5,10 +5,10 @@ import ( "net/rpc" "time" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appcommon" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appnet" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appserver" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/skycoin/skywire/pkg/app/appcommon" + "github.com/skycoin/skywire/pkg/app/appnet" + "github.com/skycoin/skywire/pkg/app/appserver" + "github.com/skycoin/skywire/pkg/routing" ) //go:generate mockery -name RPCClient -case underscore -inpkg diff --git a/pkg/app/rpc_client_test.go b/pkg/app/rpc_client_test.go index 394c1e1f6..4a3371005 100644 --- a/pkg/app/rpc_client_test.go +++ b/pkg/app/rpc_client_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/SkycoinProject/skywire-mainnet/internal/testhelpers" + "github.com/skycoin/skywire/internal/testhelpers" "github.com/SkycoinProject/dmsg" "github.com/SkycoinProject/dmsg/cipher" @@ -18,11 +18,11 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/net/nettest" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appnet" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/skycoin/skywire/pkg/app/appnet" + "github.com/skycoin/skywire/pkg/routing" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appcommon" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appserver" + "github.com/skycoin/skywire/pkg/app/appcommon" + "github.com/skycoin/skywire/pkg/app/appserver" ) func TestRPCClient_Dial(t *testing.T) { diff --git a/pkg/hypervisor/config.go b/pkg/hypervisor/config.go index 14fe1445c..4a0269778 100644 --- a/pkg/hypervisor/config.go +++ b/pkg/hypervisor/config.go @@ -10,8 +10,8 @@ import ( "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/pathutil" + "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/util/pathutil" ) const ( diff --git a/pkg/hypervisor/hypervisor.go b/pkg/hypervisor/hypervisor.go index 1fc682a5a..d1edebbf5 100644 --- a/pkg/hypervisor/hypervisor.go +++ b/pkg/hypervisor/hypervisor.go @@ -23,11 +23,11 @@ import ( "github.com/go-chi/chi/middleware" "github.com/google/uuid" - "github.com/SkycoinProject/skywire-mainnet/pkg/app" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" - "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo" - "github.com/SkycoinProject/skywire-mainnet/pkg/visor" + "github.com/skycoin/skywire/pkg/app" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/util/buildinfo" + "github.com/skycoin/skywire/pkg/visor" ) const ( diff --git a/pkg/routefinder/rfclient/client.go b/pkg/routefinder/rfclient/client.go index e1fb0f52a..b7e333e6a 100644 --- a/pkg/routefinder/rfclient/client.go +++ b/pkg/routefinder/rfclient/client.go @@ -13,7 +13,7 @@ import ( "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/skycoin/skywire/pkg/routing" ) const defaultContextTimeout = 10 * time.Second diff --git a/pkg/routefinder/rfclient/mock.go b/pkg/routefinder/rfclient/mock.go index d5cc19375..8317ed3ca 100644 --- a/pkg/routefinder/rfclient/mock.go +++ b/pkg/routefinder/rfclient/mock.go @@ -6,8 +6,8 @@ import ( "github.com/SkycoinProject/dmsg/cipher" "golang.org/x/net/context" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" - "github.com/SkycoinProject/skywire-mainnet/pkg/transport" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/transport" ) // MockClient implements mock route finder client. diff --git a/pkg/router/mock_router.go b/pkg/router/mock_router.go index c9246630f..99f8d4158 100644 --- a/pkg/router/mock_router.go +++ b/pkg/router/mock_router.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - routing "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + routing "github.com/skycoin/skywire/pkg/routing" ) // MockRouter is an autogenerated mock type for the Router type diff --git a/pkg/router/route_group.go b/pkg/router/route_group.go index 48ca5b09f..4d8e4d31f 100644 --- a/pkg/router/route_group.go +++ b/pkg/router/route_group.go @@ -14,9 +14,9 @@ import ( "github.com/SkycoinProject/dmsg/ioutil" "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" - "github.com/SkycoinProject/skywire-mainnet/pkg/transport" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/deadline" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/transport" + "github.com/skycoin/skywire/pkg/util/deadline" ) const ( diff --git a/pkg/router/route_group_test.go b/pkg/router/route_group_test.go index 7991e8edb..b5d0d6c1c 100644 --- a/pkg/router/route_group_test.go +++ b/pkg/router/route_group_test.go @@ -14,10 +14,10 @@ import ( "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/snet/stcp" - "github.com/SkycoinProject/skywire-mainnet/pkg/transport" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/snet/snettest" + "github.com/skycoin/skywire/pkg/snet/stcp" + "github.com/skycoin/skywire/pkg/transport" ) func TestNewRouteGroup(t *testing.T) { diff --git a/pkg/router/router.go b/pkg/router/router.go index 8a94c59ec..038eaea53 100644 --- a/pkg/router/router.go +++ b/pkg/router/router.go @@ -15,12 +15,12 @@ import ( "github.com/SkycoinProject/dmsg/cipher" "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/pkg/routefinder/rfclient" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" - "github.com/SkycoinProject/skywire-mainnet/pkg/setup/setupclient" - "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" - "github.com/SkycoinProject/skywire-mainnet/pkg/snet" - "github.com/SkycoinProject/skywire-mainnet/pkg/transport" + "github.com/skycoin/skywire/pkg/routefinder/rfclient" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/setup/setupclient" + "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/snet" + "github.com/skycoin/skywire/pkg/transport" ) //go:generate mockery -name Router -case underscore -inpkg diff --git a/pkg/router/router_test.go b/pkg/router/router_test.go index 8e294f7d0..e321b8f67 100644 --- a/pkg/router/router_test.go +++ b/pkg/router/router_test.go @@ -19,12 +19,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire-mainnet/pkg/routefinder/rfclient" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" - "github.com/SkycoinProject/skywire-mainnet/pkg/setup/setupclient" - "github.com/SkycoinProject/skywire-mainnet/pkg/snet" - "github.com/SkycoinProject/skywire-mainnet/pkg/snet/snettest" - "github.com/SkycoinProject/skywire-mainnet/pkg/transport" + "github.com/skycoin/skywire/pkg/routefinder/rfclient" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/setup/setupclient" + "github.com/skycoin/skywire/pkg/snet" + "github.com/skycoin/skywire/pkg/snet/snettest" + "github.com/skycoin/skywire/pkg/transport" ) func TestMain(m *testing.M) { diff --git a/pkg/router/routerclient/client.go b/pkg/router/routerclient/client.go index d992689b5..5957978cb 100644 --- a/pkg/router/routerclient/client.go +++ b/pkg/router/routerclient/client.go @@ -6,8 +6,8 @@ import ( "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" - "github.com/SkycoinProject/skywire-mainnet/pkg/snet" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/snet" ) const rpcName = "RPCGateway" diff --git a/pkg/router/routerclient/client_test.go b/pkg/router/routerclient/client_test.go index a2d823e41..da7f8add8 100644 --- a/pkg/router/routerclient/client_test.go +++ b/pkg/router/routerclient/client_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/net/nettest" - "github.com/SkycoinProject/skywire-mainnet/internal/testhelpers" - "github.com/SkycoinProject/skywire-mainnet/pkg/router" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/skycoin/skywire/internal/testhelpers" + "github.com/skycoin/skywire/pkg/router" + "github.com/skycoin/skywire/pkg/routing" ) func TestClient_Close(t *testing.T) { diff --git a/pkg/router/routerclient/wrappers.go b/pkg/router/routerclient/wrappers.go index 7619fbdfe..12310e7d8 100644 --- a/pkg/router/routerclient/wrappers.go +++ b/pkg/router/routerclient/wrappers.go @@ -5,13 +5,13 @@ import ( "fmt" "net" - "github.com/SkycoinProject/skywire-mainnet/pkg/snet" + "github.com/skycoin/skywire/pkg/snet" "github.com/SkycoinProject/dmsg" "github.com/SkycoinProject/dmsg/cipher" "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/skycoin/skywire/pkg/routing" ) // TODO: remove this diff --git a/pkg/router/rpc_gateway.go b/pkg/router/rpc_gateway.go index 8a50217ef..ca6bbd7db 100644 --- a/pkg/router/rpc_gateway.go +++ b/pkg/router/rpc_gateway.go @@ -3,7 +3,7 @@ package router import ( "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/skycoin/skywire/pkg/routing" ) // RPCGateway is a RPC interface for router. diff --git a/pkg/router/rpc_gateway_test.go b/pkg/router/rpc_gateway_test.go index 748635a56..1e3153c96 100644 --- a/pkg/router/rpc_gateway_test.go +++ b/pkg/router/rpc_gateway_test.go @@ -6,8 +6,8 @@ import ( "github.com/SkycoinProject/dmsg/cipher" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire-mainnet/internal/testhelpers" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/skycoin/skywire/internal/testhelpers" + "github.com/skycoin/skywire/pkg/routing" ) func TestRPCGateway_AddEdgeRules(t *testing.T) { diff --git a/pkg/setup/idreservoir.go b/pkg/setup/idreservoir.go index 872195f76..65cd1ebbe 100644 --- a/pkg/setup/idreservoir.go +++ b/pkg/setup/idreservoir.go @@ -11,7 +11,7 @@ import ( "github.com/SkycoinProject/dmsg/cipher" "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/skycoin/skywire/pkg/routing" ) // ErrNoKey is returned when key is not found. diff --git a/pkg/setup/node.go b/pkg/setup/node.go index a7ba8f67a..f776f3351 100644 --- a/pkg/setup/node.go +++ b/pkg/setup/node.go @@ -11,10 +11,10 @@ import ( "github.com/SkycoinProject/dmsg/disc" "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/pkg/metrics" - "github.com/SkycoinProject/skywire-mainnet/pkg/router/routerclient" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" - "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" + "github.com/skycoin/skywire/pkg/metrics" + "github.com/skycoin/skywire/pkg/router/routerclient" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skyenv" ) // Node performs routes setup operations over messaging channel. diff --git a/pkg/setup/node_test.go b/pkg/setup/node_test.go index 78a047810..8da5e7c5c 100644 --- a/pkg/setup/node_test.go +++ b/pkg/setup/node_test.go @@ -12,11 +12,11 @@ import ( "testing" "time" - "github.com/SkycoinProject/skywire-mainnet/pkg/setup/setupclient" + "github.com/skycoin/skywire/pkg/setup/setupclient" - "github.com/SkycoinProject/skywire-mainnet/internal/testhelpers" + "github.com/skycoin/skywire/internal/testhelpers" - "github.com/SkycoinProject/skywire-mainnet/pkg/snet/snettest" + "github.com/skycoin/skywire/pkg/snet/snettest" "github.com/SkycoinProject/dmsg" "github.com/SkycoinProject/dmsg/cipher" @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire-mainnet/pkg/metrics" - "github.com/SkycoinProject/skywire-mainnet/pkg/router" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" - "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" + "github.com/skycoin/skywire/pkg/metrics" + "github.com/skycoin/skywire/pkg/router" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skyenv" ) func TestMain(m *testing.M) { diff --git a/pkg/setup/rpc_gateway.go b/pkg/setup/rpc_gateway.go index e5be746c0..1bbf0be20 100644 --- a/pkg/setup/rpc_gateway.go +++ b/pkg/setup/rpc_gateway.go @@ -8,7 +8,7 @@ import ( "github.com/SkycoinProject/dmsg/cipher" "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/skycoin/skywire/pkg/routing" ) // RPCGateway is a RPC interface for setup node. diff --git a/pkg/setup/setupclient/client.go b/pkg/setup/setupclient/client.go index c4d7c0f55..7e2144444 100644 --- a/pkg/setup/setupclient/client.go +++ b/pkg/setup/setupclient/client.go @@ -8,8 +8,8 @@ import ( "github.com/SkycoinProject/dmsg/cipher" "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" - "github.com/SkycoinProject/skywire-mainnet/pkg/snet" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/snet" ) const rpcName = "RPCGateway" diff --git a/pkg/setup/setupclient/wrappers.go b/pkg/setup/setupclient/wrappers.go index 6d2816632..d735145e5 100644 --- a/pkg/setup/setupclient/wrappers.go +++ b/pkg/setup/setupclient/wrappers.go @@ -9,9 +9,9 @@ import ( "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/google/uuid" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" - "github.com/SkycoinProject/skywire-mainnet/pkg/snet" - "github.com/SkycoinProject/skywire-mainnet/pkg/snet/snettest" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/snet" + "github.com/skycoin/skywire/pkg/snet/snettest" ) // RouteGroupDialer is an interface for RouteGroup dialers diff --git a/pkg/snet/network.go b/pkg/snet/network.go index ba3e915dd..6cca119d0 100644 --- a/pkg/snet/network.go +++ b/pkg/snet/network.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/SkycoinProject/skywire-mainnet/pkg/snet/stcp" + "github.com/skycoin/skywire/pkg/snet/stcp" "github.com/SkycoinProject/skycoin/src/util/logging" diff --git a/pkg/snet/snettest/env.go b/pkg/snet/snettest/env.go index 65be604db..0b09d0345 100644 --- a/pkg/snet/snettest/env.go +++ b/pkg/snet/snettest/env.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/net/nettest" - "github.com/SkycoinProject/skywire-mainnet/pkg/snet" - "github.com/SkycoinProject/skywire-mainnet/pkg/snet/stcp" + "github.com/skycoin/skywire/pkg/snet" + "github.com/skycoin/skywire/pkg/snet/stcp" ) // KeyPair holds a public/private key pair. diff --git a/pkg/transport-discovery/client/client.go b/pkg/transport-discovery/client/client.go index 6748bf755..3b03bf393 100644 --- a/pkg/transport-discovery/client/client.go +++ b/pkg/transport-discovery/client/client.go @@ -13,8 +13,8 @@ import ( "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/google/uuid" - "github.com/SkycoinProject/skywire-mainnet/internal/httpauth" - "github.com/SkycoinProject/skywire-mainnet/pkg/transport" + "github.com/skycoin/skywire/internal/httpauth" + "github.com/skycoin/skywire/pkg/transport" ) var log = logging.MustGetLogger("transport-discovery") diff --git a/pkg/transport-discovery/client/client_test.go b/pkg/transport-discovery/client/client_test.go index 6670630e1..54057b92d 100644 --- a/pkg/transport-discovery/client/client_test.go +++ b/pkg/transport-discovery/client/client_test.go @@ -16,8 +16,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire-mainnet/internal/httpauth" - "github.com/SkycoinProject/skywire-mainnet/pkg/transport" + "github.com/skycoin/skywire/internal/httpauth" + "github.com/skycoin/skywire/pkg/transport" ) func TestMain(m *testing.M) { diff --git a/pkg/transport/discovery_test.go b/pkg/transport/discovery_test.go index 0d9a810b6..c2e42808a 100644 --- a/pkg/transport/discovery_test.go +++ b/pkg/transport/discovery_test.go @@ -8,7 +8,7 @@ import ( "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/skywire-mainnet/pkg/transport" + "github.com/skycoin/skywire/pkg/transport" ) func TestNewDiscoveryMock(t *testing.T) { diff --git a/pkg/transport/entry_test.go b/pkg/transport/entry_test.go index e279b5378..7d8af44f6 100644 --- a/pkg/transport/entry_test.go +++ b/pkg/transport/entry_test.go @@ -8,7 +8,7 @@ import ( "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/skywire-mainnet/pkg/transport" + "github.com/skycoin/skywire/pkg/transport" ) func TestNewEntry(t *testing.T) { diff --git a/pkg/transport/handshake.go b/pkg/transport/handshake.go index 8879b9090..ad523b314 100644 --- a/pkg/transport/handshake.go +++ b/pkg/transport/handshake.go @@ -11,7 +11,7 @@ import ( "github.com/SkycoinProject/dmsg/cipher" "github.com/SkycoinProject/dmsg/httputil" - "github.com/SkycoinProject/skywire-mainnet/pkg/snet" + "github.com/skycoin/skywire/pkg/snet" ) func makeEntry(pk1, pk2 cipher.PubKey, tpType string) Entry { diff --git a/pkg/transport/handshake_test.go b/pkg/transport/handshake_test.go index fdfc6a8b0..7d3adfb61 100644 --- a/pkg/transport/handshake_test.go +++ b/pkg/transport/handshake_test.go @@ -8,9 +8,9 @@ import ( "github.com/SkycoinProject/dmsg" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" - "github.com/SkycoinProject/skywire-mainnet/pkg/snet/snettest" - "github.com/SkycoinProject/skywire-mainnet/pkg/transport" + "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/snet/snettest" + "github.com/skycoin/skywire/pkg/transport" ) func TestSettlementHS(t *testing.T) { diff --git a/pkg/transport/log_test.go b/pkg/transport/log_test.go index 45e166b8f..ad0cdce10 100644 --- a/pkg/transport/log_test.go +++ b/pkg/transport/log_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire-mainnet/pkg/transport" + "github.com/skycoin/skywire/pkg/transport" ) func testTransportLogStore(t *testing.T, logStore transport.LogStore) { diff --git a/pkg/transport/managed_transport.go b/pkg/transport/managed_transport.go index 76bfc8620..3d88f21b0 100644 --- a/pkg/transport/managed_transport.go +++ b/pkg/transport/managed_transport.go @@ -16,9 +16,9 @@ import ( "github.com/SkycoinProject/dmsg/netutil" "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" - "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" - "github.com/SkycoinProject/skywire-mainnet/pkg/snet" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/snet" ) const logWriteInterval = time.Second * 3 diff --git a/pkg/transport/manager.go b/pkg/transport/manager.go index 6cca66369..0b6f6d3fc 100644 --- a/pkg/transport/manager.go +++ b/pkg/transport/manager.go @@ -9,10 +9,10 @@ import ( "sync" "time" - "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/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/snet" + "github.com/skycoin/skywire/pkg/snet/snettest" "github.com/SkycoinProject/dmsg/cipher" "github.com/SkycoinProject/skycoin/src/util/logging" diff --git a/pkg/transport/manager_test.go b/pkg/transport/manager_test.go index 115306a02..ea57209f9 100644 --- a/pkg/transport/manager_test.go +++ b/pkg/transport/manager_test.go @@ -11,9 +11,9 @@ import ( "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" - "github.com/SkycoinProject/skywire-mainnet/pkg/snet/snettest" - "github.com/SkycoinProject/skywire-mainnet/pkg/transport" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/snet/snettest" + "github.com/skycoin/skywire/pkg/transport" "github.com/SkycoinProject/dmsg" "github.com/SkycoinProject/dmsg/cipher" diff --git a/pkg/util/pathutil/configpath.go b/pkg/util/pathutil/configpath.go index b809be2fc..29070696b 100644 --- a/pkg/util/pathutil/configpath.go +++ b/pkg/util/pathutil/configpath.go @@ -81,7 +81,7 @@ func VisorDefaults() ConfigPaths { } paths[HomeLoc] = filepath.Join(HomeDir(), ".skycoin/skywire/skywire-config.json") - paths[LocalLoc] = "/usr/local/SkycoinProject/skywire-mainnet/skywire-config.json" + paths[LocalLoc] = "/usr/local/skycoin/skywire/skywire-config.json" return paths } diff --git a/pkg/util/pathutil/util.go b/pkg/util/pathutil/util.go index d3dc14613..aed48e6e9 100644 --- a/pkg/util/pathutil/util.go +++ b/pkg/util/pathutil/util.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/rename" + "github.com/skycoin/skywire/pkg/util/rename" ) const ( diff --git a/pkg/util/updater/updater.go b/pkg/util/updater/updater.go index 275d54500..bd18e9e30 100644 --- a/pkg/util/updater/updater.go +++ b/pkg/util/updater/updater.go @@ -22,9 +22,9 @@ import ( "github.com/mholt/archiver/v3" "github.com/schollz/progressbar/v2" - "github.com/SkycoinProject/skywire-mainnet/pkg/restart" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/rename" + "github.com/skycoin/skywire/pkg/restart" + "github.com/skycoin/skywire/pkg/util/buildinfo" + "github.com/skycoin/skywire/pkg/util/rename" ) const ( diff --git a/pkg/util/updater/updater_test.go b/pkg/util/updater/updater_test.go index 2b1acbd54..61527599c 100644 --- a/pkg/util/updater/updater_test.go +++ b/pkg/util/updater/updater_test.go @@ -20,7 +20,7 @@ func Test_extractLatestVersion(t *testing.T) { }{ { name: "Simple HTML", - buffer: ``, + buffer: ``, want: "v0.1.0", }, { @@ -152,7 +152,7 @@ func Test_fileURL(t *testing.T) { name: "Case 1", version: "v1.2.3", filename: "skywire-visor-v1.2.3-linux-amd64", - want: "https://github.com/SkycoinProject/skywire-mainnet/releases/download/v1.2.3/" + + want: "https://github.com/skycoin/skywire/releases/download/v1.2.3/" + "skywire-visor-v1.2.3-linux-amd64", }, } diff --git a/pkg/visor/config.go b/pkg/visor/config.go index 07d2e7f6e..e796f352f 100644 --- a/pkg/visor/config.go +++ b/pkg/visor/config.go @@ -16,12 +16,12 @@ import ( "github.com/SkycoinProject/dmsg/dmsgpty" "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appcommon" - "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/transport" - trClient "github.com/SkycoinProject/skywire-mainnet/pkg/transport-discovery/client" + "github.com/skycoin/skywire/pkg/app/appcommon" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/snet" + "github.com/skycoin/skywire/pkg/transport" + trClient "github.com/skycoin/skywire/pkg/transport-discovery/client" ) const ( diff --git a/pkg/visor/config_test.go b/pkg/visor/config_test.go index bbb5ba7dd..ed72dc767 100644 --- a/pkg/visor/config_test.go +++ b/pkg/visor/config_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire-mainnet/internal/httpauth" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/skycoin/skywire/internal/httpauth" + "github.com/skycoin/skywire/pkg/routing" ) func TestTransportDiscovery(t *testing.T) { diff --git a/pkg/visor/rpc.go b/pkg/visor/rpc.go index 42c35cf41..b9bf80402 100644 --- a/pkg/visor/rpc.go +++ b/pkg/visor/rpc.go @@ -14,12 +14,12 @@ import ( "github.com/google/uuid" "github.com/sirupsen/logrus" - "github.com/SkycoinProject/skywire-mainnet/pkg/app" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" - "github.com/SkycoinProject/skywire-mainnet/pkg/transport" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/rpcutil" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/updater" + "github.com/skycoin/skywire/pkg/app" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/transport" + "github.com/skycoin/skywire/pkg/util/buildinfo" + "github.com/skycoin/skywire/pkg/util/rpcutil" + "github.com/skycoin/skywire/pkg/util/updater" ) const ( diff --git a/pkg/visor/rpc_client.go b/pkg/visor/rpc_client.go index 49f11be97..568617155 100644 --- a/pkg/visor/rpc_client.go +++ b/pkg/visor/rpc_client.go @@ -14,13 +14,13 @@ import ( "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/google/uuid" - "github.com/SkycoinProject/skywire-mainnet/pkg/app" - "github.com/SkycoinProject/skywire-mainnet/pkg/router" - "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/skywire-mainnet/pkg/util/buildinfo" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/updater" + "github.com/skycoin/skywire/pkg/app" + "github.com/skycoin/skywire/pkg/router" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/snet/snettest" + "github.com/skycoin/skywire/pkg/transport" + "github.com/skycoin/skywire/pkg/util/buildinfo" + "github.com/skycoin/skywire/pkg/util/updater" ) var ( diff --git a/pkg/visor/rpc_client_serve.go b/pkg/visor/rpc_client_serve.go index 6f6f249bc..62f77bd9e 100644 --- a/pkg/visor/rpc_client_serve.go +++ b/pkg/visor/rpc_client_serve.go @@ -8,7 +8,7 @@ import ( "github.com/SkycoinProject/dmsg/netutil" "github.com/sirupsen/logrus" - "github.com/SkycoinProject/skywire-mainnet/pkg/snet" + "github.com/skycoin/skywire/pkg/snet" ) func isDone(ctx context.Context) bool { diff --git a/pkg/visor/rpc_test.go b/pkg/visor/rpc_test.go index 5e81c6ddc..b9a0bbaf7 100644 --- a/pkg/visor/rpc_test.go +++ b/pkg/visor/rpc_test.go @@ -16,12 +16,12 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire-mainnet/internal/testhelpers" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appcommon" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appserver" - "github.com/SkycoinProject/skywire-mainnet/pkg/router" - "github.com/SkycoinProject/skywire-mainnet/pkg/routing" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/pathutil" + "github.com/skycoin/skywire/internal/testhelpers" + "github.com/skycoin/skywire/pkg/app/appcommon" + "github.com/skycoin/skywire/pkg/app/appserver" + "github.com/skycoin/skywire/pkg/router" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/util/pathutil" ) func TestHealth(t *testing.T) { diff --git a/pkg/visor/visor.go b/pkg/visor/visor.go index f38ef0afd..bdb1c779f 100644 --- a/pkg/visor/visor.go +++ b/pkg/visor/visor.go @@ -22,18 +22,18 @@ import ( "github.com/SkycoinProject/dmsg/dmsgpty" "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appcommon" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appnet" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appserver" - "github.com/SkycoinProject/skywire-mainnet/pkg/restart" - "github.com/SkycoinProject/skywire-mainnet/pkg/routefinder/rfclient" - "github.com/SkycoinProject/skywire-mainnet/pkg/router" - "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/transport" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/pathutil" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/updater" + "github.com/skycoin/skywire/pkg/app/appcommon" + "github.com/skycoin/skywire/pkg/app/appnet" + "github.com/skycoin/skywire/pkg/app/appserver" + "github.com/skycoin/skywire/pkg/restart" + "github.com/skycoin/skywire/pkg/routefinder/rfclient" + "github.com/skycoin/skywire/pkg/router" + "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/snet" + "github.com/skycoin/skywire/pkg/transport" + "github.com/skycoin/skywire/pkg/util/pathutil" + "github.com/skycoin/skywire/pkg/util/updater" ) // AppStatus defines running status of an App. diff --git a/pkg/visor/visor_test.go b/pkg/visor/visor_test.go index 85d1b0bbe..81965757a 100644 --- a/pkg/visor/visor_test.go +++ b/pkg/visor/visor_test.go @@ -17,13 +17,13 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire-mainnet/internal/testhelpers" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appcommon" - "github.com/SkycoinProject/skywire-mainnet/pkg/app/appserver" - "github.com/SkycoinProject/skywire-mainnet/pkg/router" - "github.com/SkycoinProject/skywire-mainnet/pkg/snet" - "github.com/SkycoinProject/skywire-mainnet/pkg/transport" - "github.com/SkycoinProject/skywire-mainnet/pkg/util/pathutil" + "github.com/skycoin/skywire/internal/testhelpers" + "github.com/skycoin/skywire/pkg/app/appcommon" + "github.com/skycoin/skywire/pkg/app/appserver" + "github.com/skycoin/skywire/pkg/router" + "github.com/skycoin/skywire/pkg/snet" + "github.com/skycoin/skywire/pkg/transport" + "github.com/skycoin/skywire/pkg/util/pathutil" ) var masterLogger *logging.MasterLogger From e2a1601bc1c44b39dfe080034bd584d05bc8a432 Mon Sep 17 00:00:00 2001 From: Nikita Kryuchkov Date: Mon, 3 Aug 2020 17:21:40 +0300 Subject: [PATCH 3/3] Fix tests Former-commit-id: addff618d6aecef43faf4bcf2d8058cc387ab98b --- pkg/util/updater/updater.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/util/updater/updater.go b/pkg/util/updater/updater.go index bd18e9e30..8d542a5af 100644 --- a/pkg/util/updater/updater.go +++ b/pkg/util/updater/updater.go @@ -28,8 +28,8 @@ import ( ) const ( - owner = "SkycoinProject" - gitProjectName = "skywire-mainnet" + owner = "skycoin" + gitProjectName = "skywire" projectName = "skywire" releaseURL = "https://github.com/" + owner + "/" + gitProjectName + "/releases" urlText = "/" + owner + "/" + gitProjectName + "/releases/tag/"