From 2941695c9f6f576725517a77decd37ce463c9523 Mon Sep 17 00:00:00 2001 From: ivcosla Date: Tue, 17 Sep 2019 13:41:02 +0200 Subject: [PATCH 1/2] moved to SkycoinProject --- Makefile | 6 +- README.md | 4 +- ci_scripts/go_mod_replace.sh | 2 +- ci_scripts/run-internal-tests.sh | 58 +++---- ci_scripts/run-pkg-tests.sh | 146 +++++++++--------- cmd/apps/helloworld/helloworld.go | 6 +- cmd/apps/skychat/chat.go | 8 +- .../therealproxy-client.go | 10 +- cmd/apps/therealproxy/therealproxy.go | 4 +- .../therealssh-client/therealssh-client.go | 6 +- cmd/apps/therealssh/therealssh.go | 6 +- cmd/hypervisor/commands/gen-config.go | 4 +- cmd/hypervisor/commands/root.go | 6 +- cmd/hypervisor/hypervisor.go | 2 +- cmd/messaging-server/commands/root.go | 8 +- cmd/messaging-server/messaging-server.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/node/app.go | 4 +- cmd/skywire-cli/commands/node/gen-config.go | 12 +- cmd/skywire-cli/commands/node/root.go | 4 +- cmd/skywire-cli/commands/node/routes.go | 8 +- cmd/skywire-cli/commands/node/transports.go | 8 +- cmd/skywire-cli/commands/root.go | 8 +- cmd/skywire-cli/commands/rtfind/root.go | 6 +- cmd/skywire-cli/commands/tpdisc/root.go | 8 +- cmd/skywire-cli/internal/internal.go | 4 +- cmd/skywire-cli/skywire-cli.go | 2 +- cmd/skywire-visor/commands/root.go | 6 +- cmd/skywire-visor/skywire-visor.go | 2 +- cmd/therealssh-cli/commands/root.go | 4 +- cmd/therealssh-cli/therealssh-cli.go | 2 +- docs/Tests.Detection-of-unstable-tests.md | 50 +++--- go.mod | 8 +- go.sum | 8 +- internal/httpauth/auth.go | 2 +- internal/httpauth/client.go | 4 +- internal/httpauth/client_test.go | 4 +- internal/therealproxy/client.go | 2 +- internal/therealproxy/server_test.go | 2 +- pkg/app/app.go | 4 +- pkg/app/app_test.go | 8 +- pkg/app/packet.go | 2 +- pkg/app/packet_test.go | 4 +- pkg/httputil/httputil.go | 2 +- pkg/hypervisor/config.go | 6 +- pkg/hypervisor/hypervisor.go | 12 +- pkg/hypervisor/hypervisor_test.go | 2 +- pkg/hypervisor/user.go | 2 +- pkg/hypervisor/user_manager.go | 2 +- pkg/route-finder/client/client.go | 6 +- pkg/route-finder/client/mock.go | 6 +- pkg/router/app_manager.go | 6 +- pkg/router/app_manager_test.go | 10 +- pkg/router/loop_list.go | 2 +- pkg/router/managed_routing_table.go | 2 +- pkg/router/managed_routing_table_test.go | 2 +- pkg/router/port_list.go | 4 +- pkg/router/port_manager.go | 4 +- pkg/router/port_manager_test.go | 6 +- pkg/router/route_manager.go | 6 +- pkg/router/route_manager_test.go | 8 +- pkg/router/router.go | 18 +-- pkg/router/router_test.go | 18 +-- pkg/routing/addr.go | 2 +- pkg/routing/boltdb_routing_table.go | 2 +- pkg/routing/loop.go | 2 +- pkg/routing/route.go | 2 +- pkg/routing/routing_table_test.go | 2 +- pkg/routing/rule.go | 2 +- pkg/routing/rule_test.go | 2 +- pkg/setup/config.go | 2 +- pkg/setup/node.go | 16 +- pkg/setup/node_test.go | 12 +- pkg/setup/protocol.go | 2 +- pkg/therealssh/auth.go | 2 +- pkg/therealssh/auth_test.go | 2 +- pkg/therealssh/channel.go | 4 +- pkg/therealssh/channel_pty_test.go | 4 +- pkg/therealssh/channel_test.go | 6 +- pkg/therealssh/client.go | 6 +- pkg/therealssh/client_test.go | 4 +- pkg/therealssh/dialer.go | 2 +- pkg/therealssh/pty_test.go | 4 +- pkg/therealssh/server.go | 6 +- pkg/therealssh/server_test.go | 6 +- pkg/therealssh/session.go | 2 +- pkg/transport-discovery/client/client.go | 8 +- pkg/transport-discovery/client/client_test.go | 8 +- pkg/transport/discovery.go | 2 +- pkg/transport/discovery_test.go | 4 +- pkg/transport/dmsg/dmsg.go | 24 +-- pkg/transport/dmsg/testing.go | 8 +- pkg/transport/entry.go | 2 +- pkg/transport/entry_test.go | 4 +- pkg/transport/handshake.go | 2 +- pkg/transport/handshake_test.go | 2 +- pkg/transport/log_test.go | 2 +- pkg/transport/managed_transport.go | 8 +- pkg/transport/manager.go | 6 +- pkg/transport/manager_test.go | 10 +- pkg/transport/mock.go | 2 +- pkg/transport/tcp_transport.go | 2 +- pkg/transport/tcp_transport_test.go | 4 +- pkg/transport/transport.go | 4 +- pkg/util/pathutil/configpath.go | 6 +- pkg/util/pathutil/homedir.go | 2 +- pkg/visor/config.go | 12 +- pkg/visor/config_test.go | 6 +- pkg/visor/rpc.go | 6 +- pkg/visor/rpc_client.go | 8 +- pkg/visor/rpc_test.go | 10 +- pkg/visor/visor.go | 20 +-- pkg/visor/visor_test.go | 18 +-- .../github.com/skycoin/dmsg/cipher/cipher.go | 4 +- vendor/github.com/skycoin/dmsg/client.go | 8 +- vendor/github.com/skycoin/dmsg/disc/client.go | 4 +- vendor/github.com/skycoin/dmsg/disc/entry.go | 2 +- .../github.com/skycoin/dmsg/disc/testing.go | 2 +- vendor/github.com/skycoin/dmsg/frame.go | 4 +- vendor/github.com/skycoin/dmsg/go.mod | 4 +- .../github.com/skycoin/dmsg/ioutil/logging.go | 2 +- vendor/github.com/skycoin/dmsg/noise/dh.go | 2 +- vendor/github.com/skycoin/dmsg/noise/net.go | 2 +- vendor/github.com/skycoin/dmsg/noise/noise.go | 4 +- .../skycoin/dmsg/noise/read_writer.go | 4 +- vendor/github.com/skycoin/dmsg/server.go | 8 +- vendor/github.com/skycoin/dmsg/transport.go | 6 +- .../skycoin/skycoin/src/cipher/address.go | 2 +- .../skycoin/skycoin/src/cipher/bitcoin.go | 2 +- .../skycoin/skycoin/src/cipher/crypto.go | 4 +- .../src/cipher/secp256k1-go/secp256k1.go | 2 +- vendor/modules.txt | 26 ++-- 134 files changed, 483 insertions(+), 483 deletions(-) diff --git a/Makefile b/Makefile index 1e2f303b1..44818638d 100644 --- a/Makefile +++ b/Makefile @@ -73,9 +73,9 @@ install-linters: ## Install linters ${OPTS} go get -u golang.org/x/tools/cmd/goimports format: ## Formats the code. Must have goimports installed (use make install-linters). - ${OPTS} goimports -w -local github.com/skycoin/skywire ./pkg - ${OPTS} goimports -w -local github.com/skycoin/skywire ./cmd - ${OPTS} goimports -w -local github.com/skycoin/skywire ./internal + ${OPTS} goimports -w -local github.com/SkycoinProject/skywire ./pkg + ${OPTS} goimports -w -local github.com/SkycoinProject/skywire ./cmd + ${OPTS} goimports -w -local github.com/SkycoinProject/skywire ./internal dep: ## Sorts dependencies ${OPTS} go mod vendor -v diff --git a/README.md b/README.md index 6323a37f8..4dfbd1ac2 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ Skywire requires a version of [golang](https://golang.org/) with [go modules](ht ```bash # Clone. -$ git clone https://github.com/skycoin/skywire +$ git clone https://github.com/SkycoinProject/skywire $ cd skywire $ git checkout mainnet # Build @@ -247,7 +247,7 @@ $ sudo cat /tmp/syslog/messages ## collected logs from NodeA, NodeB, NodeC insta ## Updater -This software comes with an updater, which is located in this repo: . Follow the instructions in the README.md for further information. It can be used with a CLI for now and will be usable with the manager interface. +This software comes with an updater, which is located in this repo: . Follow the instructions in the README.md for further information. It can be used with a CLI for now and will be usable with the manager interface. ## Running skywire in docker containers diff --git a/ci_scripts/go_mod_replace.sh b/ci_scripts/go_mod_replace.sh index b7890cc86..19557c50f 100755 --- a/ci_scripts/go_mod_replace.sh +++ b/ci_scripts/go_mod_replace.sh @@ -9,7 +9,7 @@ action=$1 filename=$2 # Line to comment/uncomment in go.mod -line="replace github.com\/skycoin\/dmsg => ..\/dmsg" +line="replace github.com\/SkycoinProject\/dmsg => ..\/dmsg" function print_usage() { echo $"Usage: $0 (comment|uncomment) " diff --git a/ci_scripts/run-internal-tests.sh b/ci_scripts/run-internal-tests.sh index b15a3d365..619c5db9e 100644 --- a/ci_scripts/run-internal-tests.sh +++ b/ci_scripts/run-internal-tests.sh @@ -1,34 +1,34 @@ # commit a70894c8c4223424151cdff7441b1fb2e6bad309 -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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/therealproxy -run TestProxy >> ./logs/internal/TestProxy.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealproxy -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/therealssh -run TestListAuthorizer >> ./logs/internal/TestListAuthorizer.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/therealssh -run TestFileAuthorizer >> ./logs/internal/TestFileAuthorizer.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/therealssh -run TestChannelServe >> ./logs/internal/TestChannelServe.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/therealssh -run TestChannelSendWrite >> ./logs/internal/TestChannelSendWrite.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/therealssh -run TestChannelRead >> ./logs/internal/TestChannelRead.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/therealssh -run TestChannelRequest >> ./logs/internal/TestChannelRequest.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/therealssh -run TestChannelServeSocket >> ./logs/internal/TestChannelServeSocket.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/therealssh -run TestClientOpenChannel >> ./logs/internal/TestClientOpenChannel.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/therealssh -run TestClientHandleResponse >> ./logs/internal/TestClientHandleResponse.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/therealssh -run TestClientHandleData >> ./logs/internal/TestClientHandleData.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/therealssh -run TestServerOpenChannel >> ./logs/internal/TestServerOpenChannel.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/therealssh -run TestServerHandleRequest >> ./logs/internal/TestServerHandleRequest.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/internal/therealssh -run TestServerHandleData >> ./logs/internal/TestServerHandleData.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestListAuthorizer >> ./logs/internal/TestListAuthorizer.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestFileAuthorizer >> ./logs/internal/TestFileAuthorizer.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestChannelServe >> ./logs/internal/TestChannelServe.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestChannelSendWrite >> ./logs/internal/TestChannelSendWrite.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestChannelRead >> ./logs/internal/TestChannelRead.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestChannelRequest >> ./logs/internal/TestChannelRequest.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestChannelServeSocket >> ./logs/internal/TestChannelServeSocket.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestClientOpenChannel >> ./logs/internal/TestClientOpenChannel.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestClientHandleResponse >> ./logs/internal/TestClientHandleResponse.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestClientHandleData >> ./logs/internal/TestClientHandleData.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestServerOpenChannel >> ./logs/internal/TestServerOpenChannel.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestServerHandleRequest >> ./logs/internal/TestServerHandleRequest.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestServerHandleData >> ./logs/internal/TestServerHandleData.log diff --git a/ci_scripts/run-pkg-tests.sh b/ci_scripts/run-pkg-tests.sh index 96d4c8800..9ab34cf5a 100644 --- a/ci_scripts/run-pkg-tests.sh +++ b/ci_scripts/run-pkg-tests.sh @@ -1,80 +1,80 @@ # commit a70894c8c4223424151cdff7441b1fb2e6bad309 -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/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/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/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/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/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/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/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/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/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/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/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/hypervisor -run TestNewNode >> ./logs/pkg/TestNewNode.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/hypervisor -run TestNewNode >> ./logs/pkg/TestNewNode.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/node -run TestMessagingDiscovery >> ./logs/pkg/TestMessagingDiscovery.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/node -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/node -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/node -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/node -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/node -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/node -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/node -run TestNewNode >> ./logs/pkg/TestNewNode.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/node -run TestNodeStartClose >> ./logs/pkg/TestNodeStartClose.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/node -run TestNodeSpawnApp >> ./logs/pkg/TestNodeSpawnApp.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/node -run TestNodeSpawnAppValidations >> ./logs/pkg/TestNodeSpawnAppValidations.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/node -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/node -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/node -run TestRPC >> ./logs/pkg/TestRPC.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestMessagingDiscovery >> ./logs/pkg/TestMessagingDiscovery.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestTransportDiscovery >> ./logs/pkg/TestTransportDiscovery.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestTransportLogStore >> ./logs/pkg/TestTransportLogStore.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestRoutingTable >> ./logs/pkg/TestRoutingTable.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestAppsConfig >> ./logs/pkg/TestAppsConfig.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestAppsDir >> ./logs/pkg/TestAppsDir.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestLocalDir >> ./logs/pkg/TestLocalDir.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestNewNode >> ./logs/pkg/TestNewNode.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestNodeStartClose >> ./logs/pkg/TestNodeStartClose.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestNodeSpawnApp >> ./logs/pkg/TestNodeSpawnApp.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestNodeSpawnAppValidations >> ./logs/pkg/TestNodeSpawnAppValidations.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestListApps >> ./logs/pkg/TestListApps.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestStartStopApp >> ./logs/pkg/TestStartStopApp.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -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/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 TestAppManagerSetupLoop >> ./logs/pkg/TestAppManagerSetupLoop.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestAppManagerCloseLoop >> ./logs/pkg/TestAppManagerCloseLoop.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 TestRouteManagerRemoveLoopRule >> ./logs/pkg/TestRouteManagerRemoveLoopRule.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 TestRouteManagerConfirmLoop >> ./logs/pkg/TestRouteManagerConfirmLoop.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestRouteManagerLoopClosed >> ./logs/pkg/TestRouteManagerLoopClosed.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 TestRouterSetupLoop >> ./logs/pkg/TestRouterSetupLoop.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestRouterSetupLoopLocal >> ./logs/pkg/TestRouterSetupLoopLocal.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestRouterCloseLoop >> ./logs/pkg/TestRouterCloseLoop.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestRouterCloseLoopOnAppClose >> ./logs/pkg/TestRouterCloseLoopOnAppClose.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/skycoin/skywire/pkg/router -run TestRouterCloseLoopOnRouterClose >> ./logs/pkg/TestRouterCloseLoopOnRouterClose.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/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/pkg/router -run TestAppManagerSetupLoop >> ./logs/pkg/TestAppManagerSetupLoop.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/router -run TestAppManagerCloseLoop >> ./logs/pkg/TestAppManagerCloseLoop.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/skywire/pkg/router -run TestRouteManagerRemoveLoopRule >> ./logs/pkg/TestRouteManagerRemoveLoopRule.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/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/SkycoinProject/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/SkycoinProject/skywire/pkg/router -run TestRouteManagerConfirmLoop >> ./logs/pkg/TestRouteManagerConfirmLoop.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/router -run TestRouteManagerLoopClosed >> ./logs/pkg/TestRouteManagerLoopClosed.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/skywire/pkg/router -run TestRouterSetupLoop >> ./logs/pkg/TestRouterSetupLoop.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/router -run TestRouterSetupLoopLocal >> ./logs/pkg/TestRouterSetupLoopLocal.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/router -run TestRouterCloseLoop >> ./logs/pkg/TestRouterCloseLoop.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/router -run TestRouterCloseLoopOnAppClose >> ./logs/pkg/TestRouterCloseLoopOnAppClose.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/router -run TestRouterCloseLoopOnRouterClose >> ./logs/pkg/TestRouterCloseLoopOnRouterClose.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/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/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/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/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 +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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 6bd4e94ab..7846695db 100644 --- a/cmd/apps/helloworld/helloworld.go +++ b/cmd/apps/helloworld/helloworld.go @@ -7,10 +7,10 @@ import ( "log" "os" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" - "github.com/skycoin/skywire/pkg/app" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/app" + "github.com/SkycoinProject/skywire/pkg/routing" ) func main() { diff --git a/cmd/apps/skychat/chat.go b/cmd/apps/skychat/chat.go index 4e8eb994b..fb8754f26 100644 --- a/cmd/apps/skychat/chat.go +++ b/cmd/apps/skychat/chat.go @@ -15,11 +15,11 @@ import ( "sync" "time" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" - "github.com/skycoin/skywire/internal/netutil" - "github.com/skycoin/skywire/pkg/app" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/internal/netutil" + "github.com/SkycoinProject/skywire/pkg/app" + "github.com/SkycoinProject/skywire/pkg/routing" ) var addr = flag.String("addr", ":8000", "address to bind") diff --git a/cmd/apps/therealproxy-client/therealproxy-client.go b/cmd/apps/therealproxy-client/therealproxy-client.go index 26366ea4f..84c75e580 100644 --- a/cmd/apps/therealproxy-client/therealproxy-client.go +++ b/cmd/apps/therealproxy-client/therealproxy-client.go @@ -9,12 +9,12 @@ import ( "net" "time" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" - "github.com/skycoin/skywire/internal/netutil" - "github.com/skycoin/skywire/internal/therealproxy" - "github.com/skycoin/skywire/pkg/app" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/internal/netutil" + "github.com/SkycoinProject/skywire/internal/therealproxy" + "github.com/SkycoinProject/skywire/pkg/app" + "github.com/SkycoinProject/skywire/pkg/routing" ) const socksPort = 3 diff --git a/cmd/apps/therealproxy/therealproxy.go b/cmd/apps/therealproxy/therealproxy.go index f3f1fb038..b5c853274 100644 --- a/cmd/apps/therealproxy/therealproxy.go +++ b/cmd/apps/therealproxy/therealproxy.go @@ -7,8 +7,8 @@ import ( "flag" "log" - "github.com/skycoin/skywire/internal/therealproxy" - "github.com/skycoin/skywire/pkg/app" + "github.com/SkycoinProject/skywire/internal/therealproxy" + "github.com/SkycoinProject/skywire/pkg/app" ) func main() { diff --git a/cmd/apps/therealssh-client/therealssh-client.go b/cmd/apps/therealssh-client/therealssh-client.go index 88c547b98..5658ad959 100644 --- a/cmd/apps/therealssh-client/therealssh-client.go +++ b/cmd/apps/therealssh-client/therealssh-client.go @@ -9,10 +9,10 @@ import ( "net/http" "github.com/sirupsen/logrus" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" - "github.com/skycoin/skywire/pkg/app" - ssh "github.com/skycoin/skywire/pkg/therealssh" + "github.com/SkycoinProject/skywire/pkg/app" + ssh "github.com/SkycoinProject/skywire/pkg/therealssh" ) func main() { diff --git a/cmd/apps/therealssh/therealssh.go b/cmd/apps/therealssh/therealssh.go index 59e244e8a..8409d486c 100644 --- a/cmd/apps/therealssh/therealssh.go +++ b/cmd/apps/therealssh/therealssh.go @@ -9,10 +9,10 @@ import ( "github.com/mitchellh/go-homedir" "github.com/sirupsen/logrus" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" - "github.com/skycoin/skywire/pkg/app" - ssh "github.com/skycoin/skywire/pkg/therealssh" + "github.com/SkycoinProject/skywire/pkg/app" + ssh "github.com/SkycoinProject/skywire/pkg/therealssh" ) func main() { diff --git a/cmd/hypervisor/commands/gen-config.go b/cmd/hypervisor/commands/gen-config.go index 7ece3102f..813f421cc 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/skycoin/skywire/pkg/hypervisor" - "github.com/skycoin/skywire/pkg/util/pathutil" + "github.com/SkycoinProject/skywire/pkg/hypervisor" + "github.com/SkycoinProject/skywire/pkg/util/pathutil" ) var ( diff --git a/cmd/hypervisor/commands/root.go b/cmd/hypervisor/commands/root.go index 2e77d3683..698d70375 100644 --- a/cmd/hypervisor/commands/root.go +++ b/cmd/hypervisor/commands/root.go @@ -6,11 +6,11 @@ import ( "net/http" "os" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" "github.com/spf13/cobra" - "github.com/skycoin/skywire/pkg/hypervisor" - "github.com/skycoin/skywire/pkg/util/pathutil" + "github.com/SkycoinProject/skywire/pkg/hypervisor" + "github.com/SkycoinProject/skywire/pkg/util/pathutil" ) const configEnv = "SW_HYPERVISOR_CONFIG" diff --git a/cmd/hypervisor/hypervisor.go b/cmd/hypervisor/hypervisor.go index b3f5d88d2..380ccb2b1 100644 --- a/cmd/hypervisor/hypervisor.go +++ b/cmd/hypervisor/hypervisor.go @@ -3,7 +3,7 @@ skywire hypervisor */ package main -import "github.com/skycoin/skywire/cmd/hypervisor/commands" +import "github.com/SkycoinProject/skywire/cmd/hypervisor/commands" func main() { commands.Execute() diff --git a/cmd/messaging-server/commands/root.go b/cmd/messaging-server/commands/root.go index d4d6674c7..b5fefff01 100644 --- a/cmd/messaging-server/commands/root.go +++ b/cmd/messaging-server/commands/root.go @@ -13,10 +13,10 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" logrussyslog "github.com/sirupsen/logrus/hooks/syslog" - "github.com/skycoin/dmsg" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/dmsg/disc" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/dmsg" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/dmsg/disc" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" "github.com/spf13/cobra" ) diff --git a/cmd/messaging-server/messaging-server.go b/cmd/messaging-server/messaging-server.go index 9b40d7141..d7c0ba577 100644 --- a/cmd/messaging-server/messaging-server.go +++ b/cmd/messaging-server/messaging-server.go @@ -1,6 +1,6 @@ package main -import "github.com/skycoin/skywire/cmd/messaging-server/commands" +import "github.com/SkycoinProject/skywire/cmd/messaging-server/commands" func main() { commands.Execute() diff --git a/cmd/setup-node/commands/root.go b/cmd/setup-node/commands/root.go index 7de9a7384..1e6a1c19d 100644 --- a/cmd/setup-node/commands/root.go +++ b/cmd/setup-node/commands/root.go @@ -12,11 +12,11 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" logrussyslog "github.com/sirupsen/logrus/hooks/syslog" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" "github.com/spf13/cobra" - "github.com/skycoin/skywire/pkg/metrics" - "github.com/skycoin/skywire/pkg/setup" + "github.com/SkycoinProject/skywire/pkg/metrics" + "github.com/SkycoinProject/skywire/pkg/setup" ) var ( diff --git a/cmd/setup-node/setup-node.go b/cmd/setup-node/setup-node.go index bd5a86d97..f64c1f6df 100644 --- a/cmd/setup-node/setup-node.go +++ b/cmd/setup-node/setup-node.go @@ -1,6 +1,6 @@ package main -import "github.com/skycoin/skywire/cmd/setup-node/commands" +import "github.com/SkycoinProject/skywire/cmd/setup-node/commands" func main() { commands.Execute() diff --git a/cmd/skywire-cli/commands/mdisc/root.go b/cmd/skywire-cli/commands/mdisc/root.go index 1ad525398..fca7df79f 100644 --- a/cmd/skywire-cli/commands/mdisc/root.go +++ b/cmd/skywire-cli/commands/mdisc/root.go @@ -7,10 +7,10 @@ import ( "text/tabwriter" "time" - "github.com/skycoin/dmsg/disc" + "github.com/SkycoinProject/dmsg/disc" "github.com/spf13/cobra" - "github.com/skycoin/skywire/cmd/skywire-cli/internal" + "github.com/SkycoinProject/skywire/cmd/skywire-cli/internal" ) var mdAddr string diff --git a/cmd/skywire-cli/commands/node/app.go b/cmd/skywire-cli/commands/node/app.go index 00f267fd0..473138f87 100644 --- a/cmd/skywire-cli/commands/node/app.go +++ b/cmd/skywire-cli/commands/node/app.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/cobra" - "github.com/skycoin/skywire/cmd/skywire-cli/internal" - "github.com/skycoin/skywire/pkg/visor" + "github.com/SkycoinProject/skywire/cmd/skywire-cli/internal" + "github.com/SkycoinProject/skywire/pkg/visor" ) func init() { diff --git a/cmd/skywire-cli/commands/node/gen-config.go b/cmd/skywire-cli/commands/node/gen-config.go index ab132ea19..0b084d74a 100644 --- a/cmd/skywire-cli/commands/node/gen-config.go +++ b/cmd/skywire-cli/commands/node/gen-config.go @@ -6,11 +6,11 @@ import ( "path/filepath" "time" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" "github.com/spf13/cobra" - "github.com/skycoin/skywire/pkg/util/pathutil" - "github.com/skycoin/skywire/pkg/visor" + "github.com/SkycoinProject/skywire/pkg/util/pathutil" + "github.com/SkycoinProject/skywire/pkg/visor" ) func init() { @@ -68,9 +68,9 @@ func homeConfig() *visor.Config { func localConfig() *visor.Config { c := defaultConfig() - c.AppsPath = "/usr/local/skycoin/skywire/apps" - c.Transport.LogStore.Location = "/usr/local/skycoin/skywire/transport_logs" - c.Routing.Table.Location = "/usr/local/skycoin/skywire/routing.db" + c.AppsPath = "/usr/local/SkycoinProject/skywire/apps" + c.Transport.LogStore.Location = "/usr/local/SkycoinProject/skywire/transport_logs" + c.Routing.Table.Location = "/usr/local/SkycoinProject/skywire/routing.db" return c } diff --git a/cmd/skywire-cli/commands/node/root.go b/cmd/skywire-cli/commands/node/root.go index 75d29467a..d11eb982f 100644 --- a/cmd/skywire-cli/commands/node/root.go +++ b/cmd/skywire-cli/commands/node/root.go @@ -3,10 +3,10 @@ package node import ( "net/rpc" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" "github.com/spf13/cobra" - "github.com/skycoin/skywire/pkg/visor" + "github.com/SkycoinProject/skywire/pkg/visor" ) var log = logging.MustGetLogger("skywire-cli") diff --git a/cmd/skywire-cli/commands/node/routes.go b/cmd/skywire-cli/commands/node/routes.go index 0d8012ce5..7e5141e41 100644 --- a/cmd/skywire-cli/commands/node/routes.go +++ b/cmd/skywire-cli/commands/node/routes.go @@ -11,10 +11,10 @@ import ( "github.com/spf13/cobra" - "github.com/skycoin/skywire/cmd/skywire-cli/internal" - "github.com/skycoin/skywire/pkg/router" - "github.com/skycoin/skywire/pkg/routing" - "github.com/skycoin/skywire/pkg/visor" + "github.com/SkycoinProject/skywire/cmd/skywire-cli/internal" + "github.com/SkycoinProject/skywire/pkg/router" + "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/visor" ) func init() { diff --git a/cmd/skywire-cli/commands/node/transports.go b/cmd/skywire-cli/commands/node/transports.go index 43b198ba8..a410c26b8 100644 --- a/cmd/skywire-cli/commands/node/transports.go +++ b/cmd/skywire-cli/commands/node/transports.go @@ -7,12 +7,12 @@ import ( "text/tabwriter" "time" - "github.com/skycoin/dmsg" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg" + "github.com/SkycoinProject/dmsg/cipher" "github.com/spf13/cobra" - "github.com/skycoin/skywire/cmd/skywire-cli/internal" - "github.com/skycoin/skywire/pkg/visor" + "github.com/SkycoinProject/skywire/cmd/skywire-cli/internal" + "github.com/SkycoinProject/skywire/pkg/visor" ) func init() { diff --git a/cmd/skywire-cli/commands/root.go b/cmd/skywire-cli/commands/root.go index 2c03ffb3d..3c0562469 100644 --- a/cmd/skywire-cli/commands/root.go +++ b/cmd/skywire-cli/commands/root.go @@ -5,10 +5,10 @@ import ( "github.com/spf13/cobra" - "github.com/skycoin/skywire/cmd/skywire-cli/commands/mdisc" - "github.com/skycoin/skywire/cmd/skywire-cli/commands/node" - "github.com/skycoin/skywire/cmd/skywire-cli/commands/rtfind" - "github.com/skycoin/skywire/cmd/skywire-cli/commands/tpdisc" + "github.com/SkycoinProject/skywire/cmd/skywire-cli/commands/mdisc" + "github.com/SkycoinProject/skywire/cmd/skywire-cli/commands/node" + "github.com/SkycoinProject/skywire/cmd/skywire-cli/commands/rtfind" + "github.com/SkycoinProject/skywire/cmd/skywire-cli/commands/tpdisc" ) var rootCmd = &cobra.Command{ diff --git a/cmd/skywire-cli/commands/rtfind/root.go b/cmd/skywire-cli/commands/rtfind/root.go index 719b76ef9..a1623fddc 100644 --- a/cmd/skywire-cli/commands/rtfind/root.go +++ b/cmd/skywire-cli/commands/rtfind/root.go @@ -4,11 +4,11 @@ import ( "fmt" "time" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" "github.com/spf13/cobra" - "github.com/skycoin/skywire/cmd/skywire-cli/internal" - "github.com/skycoin/skywire/pkg/route-finder/client" + "github.com/SkycoinProject/skywire/cmd/skywire-cli/internal" + "github.com/SkycoinProject/skywire/pkg/route-finder/client" ) var frAddr string diff --git a/cmd/skywire-cli/commands/tpdisc/root.go b/cmd/skywire-cli/commands/tpdisc/root.go index 295b400f4..6fe45d58f 100644 --- a/cmd/skywire-cli/commands/tpdisc/root.go +++ b/cmd/skywire-cli/commands/tpdisc/root.go @@ -9,12 +9,12 @@ import ( "time" "github.com/google/uuid" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" "github.com/spf13/cobra" - "github.com/skycoin/skywire/cmd/skywire-cli/internal" - "github.com/skycoin/skywire/pkg/transport" - "github.com/skycoin/skywire/pkg/transport-discovery/client" + "github.com/SkycoinProject/skywire/cmd/skywire-cli/internal" + "github.com/SkycoinProject/skywire/pkg/transport" + "github.com/SkycoinProject/skywire/pkg/transport-discovery/client" ) var ( diff --git a/cmd/skywire-cli/internal/internal.go b/cmd/skywire-cli/internal/internal.go index 839bd3129..8b25341d9 100644 --- a/cmd/skywire-cli/internal/internal.go +++ b/cmd/skywire-cli/internal/internal.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/google/uuid" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" ) var log = logging.MustGetLogger("skywire-cli") diff --git a/cmd/skywire-cli/skywire-cli.go b/cmd/skywire-cli/skywire-cli.go index 0d2da60de..5e3a89c34 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/skycoin/skywire/cmd/skywire-cli/commands" + "github.com/SkycoinProject/skywire/cmd/skywire-cli/commands" ) func main() { diff --git a/cmd/skywire-visor/commands/root.go b/cmd/skywire-visor/commands/root.go index e07395451..2501c2438 100644 --- a/cmd/skywire-visor/commands/root.go +++ b/cmd/skywire-visor/commands/root.go @@ -19,11 +19,11 @@ import ( "github.com/pkg/profile" logrussyslog "github.com/sirupsen/logrus/hooks/syslog" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" "github.com/spf13/cobra" - "github.com/skycoin/skywire/pkg/util/pathutil" - "github.com/skycoin/skywire/pkg/visor" + "github.com/SkycoinProject/skywire/pkg/util/pathutil" + "github.com/SkycoinProject/skywire/pkg/visor" ) const configEnv = "SW_CONFIG" diff --git a/cmd/skywire-visor/skywire-visor.go b/cmd/skywire-visor/skywire-visor.go index d4aa990b7..5a49f330b 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/skycoin/skywire/cmd/skywire-visor/commands" + "github.com/SkycoinProject/skywire/cmd/skywire-visor/commands" ) func main() { diff --git a/cmd/therealssh-cli/commands/root.go b/cmd/therealssh-cli/commands/root.go index 84d6a91d2..e64b533a6 100644 --- a/cmd/therealssh-cli/commands/root.go +++ b/cmd/therealssh-cli/commands/root.go @@ -14,11 +14,11 @@ import ( "time" "github.com/creack/pty" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" "github.com/spf13/cobra" "golang.org/x/crypto/ssh/terminal" - ssh "github.com/skycoin/skywire/pkg/therealssh" + ssh "github.com/SkycoinProject/skywire/pkg/therealssh" ) var ( diff --git a/cmd/therealssh-cli/therealssh-cli.go b/cmd/therealssh-cli/therealssh-cli.go index 56dd20d10..c45136644 100644 --- a/cmd/therealssh-cli/therealssh-cli.go +++ b/cmd/therealssh-cli/therealssh-cli.go @@ -4,7 +4,7 @@ CLI for SSH app package main import ( - "github.com/skycoin/skywire/cmd/therealssh-cli/commands" + "github.com/SkycoinProject/skywire/cmd/therealssh-cli/commands" ) func main() { diff --git a/docs/Tests.Detection-of-unstable-tests.md b/docs/Tests.Detection-of-unstable-tests.md index 1d3a9c0e2..8f2581d0a 100644 --- a/docs/Tests.Detection-of-unstable-tests.md +++ b/docs/Tests.Detection-of-unstable-tests.md @@ -21,15 +21,15 @@ You will get output similar to: ```text TestClient -ok github.com/skycoin/skywire/internal/httpauth 0.043s -? github.com/skycoin/skywire/internal/httputil [no test files] +ok github.com/SkycoinProject/skywire/internal/httpauth 0.043s +? github.com/SkycoinProject/skywire/internal/httputil [no test files] TestAckReadWriter TestAckReadWriterCRCFailure TestAckReadWriterFlushOnClose TestAckReadWriterPartialRead TestAckReadWriterReadError TestLenReadWriter -ok github.com/skycoin/skywire/internal/ioutil 0.049s +ok github.com/SkycoinProject/skywire/internal/ioutil 0.049s ``` Filter lines with `[no test files]`. @@ -37,14 +37,14 @@ Filter lines with `[no test files]`. Transform this output to: ```bash -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/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/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/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/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/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/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/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/internal/ioutil -run TestLenReadWriter >>./logs/internal/TestLenReadWriter.log ``` Notes: @@ -79,10 +79,10 @@ If you see something like: ```sh $ grep "FAIL" ./logs/pkg/*.log -# ./logs/pkg/TestClientConnectInitialServers.log:FAIL github.com/skycoin/skywire/pkg/messaging 300.838s -# ./logs/pkg/TestClientConnectInitialServers.log:FAIL github.com/skycoin/skywire/pkg/messaging 300.849s -# ./logs/pkg/TestClientConnectInitialServers.log:FAIL github.com/skycoin/skywire/pkg/messaging 300.844s -# ./logs/pkg/TestClientConnectInitialServers.log:FAIL github.com/skycoin/skywire/pkg/messaging 300.849s +# ./logs/pkg/TestClientConnectInitialServers.log:FAIL github.com/SkycoinProject/skywire/pkg/messaging 300.838s +# ./logs/pkg/TestClientConnectInitialServers.log:FAIL github.com/SkycoinProject/skywire/pkg/messaging 300.849s +# ./logs/pkg/TestClientConnectInitialServers.log:FAIL github.com/SkycoinProject/skywire/pkg/messaging 300.844s +# ./logs/pkg/TestClientConnectInitialServers.log:FAIL github.com/SkycoinProject/skywire/pkg/messaging 300.849s ``` (note 300s for FAILs) @@ -91,12 +91,12 @@ And: ```sh $ grep "coverage" ./logs/pkg/TestClientConnectInitialServers.log -# ok github.com/skycoin/skywire/pkg/messaging 3.049s coverage: 39.5% of statements +# ok github.com/SkycoinProject/skywire/pkg/messaging 3.049s coverage: 39.5% of statements # coverage: 38.0% of statements -# ok github.com/skycoin/skywire/pkg/messaging 3.072s coverage: 39.5% of statements -# ok github.com/skycoin/skywire/pkg/messaging 3.073s coverage: 39.5% of statements -# ok github.com/skycoin/skywire/pkg/messaging 3.071s coverage: 39.5% of statements -# ok github.com/skycoin/skywire/pkg/messaging 3.050s coverage: 39.5% of statements +# ok github.com/SkycoinProject/skywire/pkg/messaging 3.072s coverage: 39.5% of statements +# ok github.com/SkycoinProject/skywire/pkg/messaging 3.073s coverage: 39.5% of statements +# ok github.com/SkycoinProject/skywire/pkg/messaging 3.071s coverage: 39.5% of statements +# ok github.com/SkycoinProject/skywire/pkg/messaging 3.050s coverage: 39.5% of statements # coverage: 38.0% of statements ``` @@ -129,11 +129,11 @@ Temporary solution: test was moved to `./pkg/messaging/client_test.go` and tagge ```sh $ grep coverage ./logs/internal/*.log # ./logs/internal/TestReadWriterConcurrentTCP.log -# 1:ok github.com/skycoin/skywire/internal/noise 1.545s coverage: 0.0% of statements -# 2:ok github.com/skycoin/skywire/internal/noise 1.427s coverage: 0.0% of statements -# 3:ok github.com/skycoin/skywire/internal/noise 1.429s coverage: 0.0% of statements -# 4:ok github.com/skycoin/skywire/internal/noise 1.429s coverage: 0.0% of statements -# 5:ok github.com/skycoin/skywire/internal/noise 1.436s coverage: 0.0% of statements +# 1:ok github.com/SkycoinProject/skywire/internal/noise 1.545s coverage: 0.0% of statements +# 2:ok github.com/SkycoinProject/skywire/internal/noise 1.427s coverage: 0.0% of statements +# 3:ok github.com/SkycoinProject/skywire/internal/noise 1.429s coverage: 0.0% of statements +# 4:ok github.com/SkycoinProject/skywire/internal/noise 1.429s coverage: 0.0% of statements +# 5:ok github.com/SkycoinProject/skywire/internal/noise 1.436s coverage: 0.0% of statements ``` Note 0.0% coverage diff --git a/go.mod b/go.mod index 849ed6757..b42a521b1 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/skycoin/skywire +module github.com/SkycoinProject/skywire go 1.12 @@ -16,8 +16,8 @@ require ( github.com/prometheus/client_golang v1.0.0 github.com/prometheus/common v0.4.1 github.com/sirupsen/logrus v1.4.2 - github.com/skycoin/dmsg v0.0.0-20190805065636-70f4c32a994f - github.com/skycoin/skycoin v0.26.0 + github.com/SkycoinProject/dmsg v0.0.0-20190805065636-70f4c32a994f + github.com/SkycoinProject/SkycoinProject v0.26.0 github.com/spf13/cobra v0.0.5 github.com/stretchr/testify v1.3.0 go.etcd.io/bbolt v1.3.3 @@ -28,4 +28,4 @@ require ( ) // Uncomment for tests with alternate branches of 'dmsg' -//replace github.com/skycoin/dmsg => ../dmsg +//replace github.com/SkycoinProject/dmsg => ../dmsg diff --git a/go.sum b/go.sum index 9a133695e..59277a77a 100644 --- a/go.sum +++ b/go.sum @@ -88,10 +88,10 @@ github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/skycoin/dmsg v0.0.0-20190805065636-70f4c32a994f h1:WWjaxOXoj6oYelm67MNtJbg51HQALjKAyhs2WAHgpZs= -github.com/skycoin/dmsg v0.0.0-20190805065636-70f4c32a994f/go.mod h1:obZYZp8eKR7Xqz+KNhJdUE6Gvp6rEXbDO8YTlW2YXgU= -github.com/skycoin/skycoin v0.26.0 h1:xDxe2r8AclMntZ550Y/vUQgwgLtwrf9Wu5UYiYcN5/o= -github.com/skycoin/skycoin v0.26.0/go.mod h1:78nHjQzd8KG0jJJVL/j0xMmrihXi70ti63fh8vXScJw= +github.com/SkycoinProject/dmsg v0.0.0-20190805065636-70f4c32a994f h1:WWjaxOXoj6oYelm67MNtJbg51HQALjKAyhs2WAHgpZs= +github.com/SkycoinProject/dmsg v0.0.0-20190805065636-70f4c32a994f/go.mod h1:obZYZp8eKR7Xqz+KNhJdUE6Gvp6rEXbDO8YTlW2YXgU= +github.com/SkycoinProject/SkycoinProject v0.26.0 h1:xDxe2r8AclMntZ550Y/vUQgwgLtwrf9Wu5UYiYcN5/o= +github.com/SkycoinProject/SkycoinProject v0.26.0/go.mod h1:78nHjQzd8KG0jJJVL/j0xMmrihXi70ti63fh8vXScJw= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= diff --git a/internal/httpauth/auth.go b/internal/httpauth/auth.go index a3417faca..c742e387f 100644 --- a/internal/httpauth/auth.go +++ b/internal/httpauth/auth.go @@ -6,7 +6,7 @@ import ( "net/http" "strconv" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" ) // Nonce is used to sign requests in order to avoid replay attack diff --git a/internal/httpauth/client.go b/internal/httpauth/client.go index 3a6625585..00e30b14b 100644 --- a/internal/httpauth/client.go +++ b/internal/httpauth/client.go @@ -14,8 +14,8 @@ import ( "strings" "sync/atomic" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" ) const ( diff --git a/internal/httpauth/client_test.go b/internal/httpauth/client_test.go index cd74a577b..eb6fabec7 100644 --- a/internal/httpauth/client_test.go +++ b/internal/httpauth/client_test.go @@ -12,8 +12,8 @@ import ( "strconv" "testing" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/therealproxy/client.go b/internal/therealproxy/client.go index c7f6efbf9..5740e111f 100644 --- a/internal/therealproxy/client.go +++ b/internal/therealproxy/client.go @@ -6,7 +6,7 @@ import ( "net" "github.com/hashicorp/yamux" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" ) var log = logging.MustGetLogger("therealproxy") diff --git a/internal/therealproxy/server_test.go b/internal/therealproxy/server_test.go index 1fd51ab46..4262b6607 100644 --- a/internal/therealproxy/server_test.go +++ b/internal/therealproxy/server_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/net/nettest" diff --git a/pkg/app/app.go b/pkg/app/app.go index e2be01015..0eae87118 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -14,9 +14,9 @@ import ( "path/filepath" "sync" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/routing" ) const ( diff --git a/pkg/app/app_test.go b/pkg/app/app_test.go index 54759563a..74a8c513a 100644 --- a/pkg/app/app_test.go +++ b/pkg/app/app_test.go @@ -9,13 +9,13 @@ import ( "testing" "time" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire/internal/testhelpers" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/internal/testhelpers" + "github.com/SkycoinProject/skywire/pkg/routing" ) func TestMain(m *testing.M) { diff --git a/pkg/app/packet.go b/pkg/app/packet.go index f77ada615..c8ee58f4e 100644 --- a/pkg/app/packet.go +++ b/pkg/app/packet.go @@ -1,6 +1,6 @@ package app -import "github.com/skycoin/skywire/pkg/routing" +import "github.com/SkycoinProject/skywire/pkg/routing" // Packet represents message exchanged between App and Node. type Packet struct { diff --git a/pkg/app/packet_test.go b/pkg/app/packet_test.go index 7990a166b..11ac0f0d0 100644 --- a/pkg/app/packet_test.go +++ b/pkg/app/packet_test.go @@ -3,9 +3,9 @@ package app import ( "fmt" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/routing" ) func ExamplePacket() { diff --git a/pkg/httputil/httputil.go b/pkg/httputil/httputil.go index 30b796a17..3c57e4190 100644 --- a/pkg/httputil/httputil.go +++ b/pkg/httputil/httputil.go @@ -8,7 +8,7 @@ import ( "net/http" "github.com/gorilla/handlers" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" ) var log = logging.MustGetLogger("httputil") diff --git a/pkg/hypervisor/config.go b/pkg/hypervisor/config.go index 0e82b9145..3e9c601a8 100644 --- a/pkg/hypervisor/config.go +++ b/pkg/hypervisor/config.go @@ -8,9 +8,9 @@ import ( "path/filepath" "time" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" - "github.com/skycoin/skywire/pkg/util/pathutil" + "github.com/SkycoinProject/skywire/pkg/util/pathutil" ) // Key allows a byte slice to be marshaled or unmarshaled from a hex string. @@ -76,7 +76,7 @@ func GenerateHomeConfig() Config { // GenerateLocalConfig generates a config with default values and uses db from shared folder. func GenerateLocalConfig() Config { c := makeConfig() - c.DBPath = "/usr/local/skycoin/hypervisor/users.db" + c.DBPath = "/usr/local/SkycoinProject/hypervisor/users.db" return c } diff --git a/pkg/hypervisor/hypervisor.go b/pkg/hypervisor/hypervisor.go index d7203b5b6..b7f69327d 100644 --- a/pkg/hypervisor/hypervisor.go +++ b/pkg/hypervisor/hypervisor.go @@ -16,13 +16,13 @@ import ( "github.com/go-chi/chi" "github.com/go-chi/chi/middleware" "github.com/google/uuid" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/dmsg/noise" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/dmsg/noise" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" - "github.com/skycoin/skywire/pkg/httputil" - "github.com/skycoin/skywire/pkg/routing" - "github.com/skycoin/skywire/pkg/visor" + "github.com/SkycoinProject/skywire/pkg/httputil" + "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/visor" ) var ( diff --git a/pkg/hypervisor/hypervisor_test.go b/pkg/hypervisor/hypervisor_test.go index 74becc374..aabad6fcc 100644 --- a/pkg/hypervisor/hypervisor_test.go +++ b/pkg/hypervisor/hypervisor_test.go @@ -13,7 +13,7 @@ import ( "strings" "testing" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/hypervisor/user.go b/pkg/hypervisor/user.go index 7237a20ef..898eb48ea 100644 --- a/pkg/hypervisor/user.go +++ b/pkg/hypervisor/user.go @@ -8,7 +8,7 @@ import ( "regexp" "time" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" "go.etcd.io/bbolt" ) diff --git a/pkg/hypervisor/user_manager.go b/pkg/hypervisor/user_manager.go index cee03b559..09ee85c12 100644 --- a/pkg/hypervisor/user_manager.go +++ b/pkg/hypervisor/user_manager.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/gorilla/securecookie" - "github.com/skycoin/skywire/pkg/httputil" + "github.com/SkycoinProject/skywire/pkg/httputil" ) const ( diff --git a/pkg/route-finder/client/client.go b/pkg/route-finder/client/client.go index 6fa5b5335..7aa8e7715 100644 --- a/pkg/route-finder/client/client.go +++ b/pkg/route-finder/client/client.go @@ -11,10 +11,10 @@ import ( "strings" "time" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/routing" ) const defaultContextTimeout = 10 * time.Second diff --git a/pkg/route-finder/client/mock.go b/pkg/route-finder/client/mock.go index 3184b2b91..f13e15222 100644 --- a/pkg/route-finder/client/mock.go +++ b/pkg/route-finder/client/mock.go @@ -1,10 +1,10 @@ package client import ( - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" - "github.com/skycoin/skywire/pkg/routing" - "github.com/skycoin/skywire/pkg/transport" + "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/transport" ) // MockClient implements mock route finder client. diff --git a/pkg/router/app_manager.go b/pkg/router/app_manager.go index e2decc11f..4b9d07593 100644 --- a/pkg/router/app_manager.go +++ b/pkg/router/app_manager.go @@ -6,10 +6,10 @@ import ( "errors" "time" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" - "github.com/skycoin/skywire/pkg/app" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/app" + "github.com/SkycoinProject/skywire/pkg/routing" ) const supportedProtocolVersion = "0.0.1" diff --git a/pkg/router/app_manager_test.go b/pkg/router/app_manager_test.go index 3133eee35..cd16f6e18 100644 --- a/pkg/router/app_manager_test.go +++ b/pkg/router/app_manager_test.go @@ -5,14 +5,14 @@ import ( "net" "testing" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire/internal/testhelpers" - "github.com/skycoin/skywire/pkg/app" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/internal/testhelpers" + "github.com/SkycoinProject/skywire/pkg/app" + "github.com/SkycoinProject/skywire/pkg/routing" ) func TestAppManagerInit(t *testing.T) { diff --git a/pkg/router/loop_list.go b/pkg/router/loop_list.go index 4a4ad08ba..5e0f15dba 100644 --- a/pkg/router/loop_list.go +++ b/pkg/router/loop_list.go @@ -5,7 +5,7 @@ import ( "github.com/google/uuid" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/routing" ) type loop struct { diff --git a/pkg/router/managed_routing_table.go b/pkg/router/managed_routing_table.go index 91362f1b5..570c078fa 100644 --- a/pkg/router/managed_routing_table.go +++ b/pkg/router/managed_routing_table.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/routing" ) var routeKeepalive = 10 * time.Minute // interval to keep active expired routes diff --git a/pkg/router/managed_routing_table_test.go b/pkg/router/managed_routing_table_test.go index 0d0de7579..7ff02f706 100644 --- a/pkg/router/managed_routing_table_test.go +++ b/pkg/router/managed_routing_table_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/routing" ) func TestManagedRoutingTableCleanup(t *testing.T) { diff --git a/pkg/router/port_list.go b/pkg/router/port_list.go index 5652d8de6..3bdd76816 100644 --- a/pkg/router/port_list.go +++ b/pkg/router/port_list.go @@ -4,8 +4,8 @@ import ( "math" "sync" - "github.com/skycoin/skywire/pkg/app" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/app" + "github.com/SkycoinProject/skywire/pkg/routing" ) type portBind struct { diff --git a/pkg/router/port_manager.go b/pkg/router/port_manager.go index 87dcab4eb..fe4ae4648 100644 --- a/pkg/router/port_manager.go +++ b/pkg/router/port_manager.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/skycoin/skywire/pkg/app" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/app" + "github.com/SkycoinProject/skywire/pkg/routing" ) type portManager struct { diff --git a/pkg/router/port_manager_test.go b/pkg/router/port_manager_test.go index 9a548ce99..6213a36cc 100644 --- a/pkg/router/port_manager_test.go +++ b/pkg/router/port_manager_test.go @@ -5,12 +5,12 @@ import ( "sort" "testing" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire/pkg/app" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/app" + "github.com/SkycoinProject/skywire/pkg/routing" ) func TestPortManager(t *testing.T) { diff --git a/pkg/router/route_manager.go b/pkg/router/route_manager.go index a7d8a7fa3..1d49b4085 100644 --- a/pkg/router/route_manager.go +++ b/pkg/router/route_manager.go @@ -7,10 +7,10 @@ import ( "io" "time" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" - "github.com/skycoin/skywire/pkg/routing" - "github.com/skycoin/skywire/pkg/setup" + "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/setup" ) type setupCallbacks struct { diff --git a/pkg/router/route_manager_test.go b/pkg/router/route_manager_test.go index 80f2372ae..d8b8f09d5 100644 --- a/pkg/router/route_manager_test.go +++ b/pkg/router/route_manager_test.go @@ -7,13 +7,13 @@ import ( "time" "github.com/google/uuid" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire/pkg/routing" - "github.com/skycoin/skywire/pkg/setup" + "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/setup" ) func TestRouteManagerGetRule(t *testing.T) { diff --git a/pkg/router/router.go b/pkg/router/router.go index 248edd6f5..1af27631f 100644 --- a/pkg/router/router.go +++ b/pkg/router/router.go @@ -10,15 +10,15 @@ import ( "sync" "time" - "github.com/skycoin/dmsg" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/skycoin/src/util/logging" - - "github.com/skycoin/skywire/pkg/app" - routeFinder "github.com/skycoin/skywire/pkg/route-finder/client" - "github.com/skycoin/skywire/pkg/routing" - "github.com/skycoin/skywire/pkg/setup" - "github.com/skycoin/skywire/pkg/transport" + "github.com/SkycoinProject/dmsg" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" + + "github.com/SkycoinProject/skywire/pkg/app" + routeFinder "github.com/SkycoinProject/skywire/pkg/route-finder/client" + "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/setup" + "github.com/SkycoinProject/skywire/pkg/transport" ) const ( diff --git a/pkg/router/router_test.go b/pkg/router/router_test.go index 766c5192e..b54c0aac6 100644 --- a/pkg/router/router_test.go +++ b/pkg/router/router_test.go @@ -10,18 +10,18 @@ import ( "time" "github.com/sirupsen/logrus" - "github.com/skycoin/dmsg" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/dmsg" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire/internal/testhelpers" - "github.com/skycoin/skywire/pkg/app" - routeFinder "github.com/skycoin/skywire/pkg/route-finder/client" - "github.com/skycoin/skywire/pkg/routing" - "github.com/skycoin/skywire/pkg/setup" - "github.com/skycoin/skywire/pkg/transport" + "github.com/SkycoinProject/skywire/internal/testhelpers" + "github.com/SkycoinProject/skywire/pkg/app" + routeFinder "github.com/SkycoinProject/skywire/pkg/route-finder/client" + "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/setup" + "github.com/SkycoinProject/skywire/pkg/transport" ) func TestMain(m *testing.M) { diff --git a/pkg/routing/addr.go b/pkg/routing/addr.go index ff72a137d..c41e230c3 100644 --- a/pkg/routing/addr.go +++ b/pkg/routing/addr.go @@ -3,7 +3,7 @@ package routing import ( "fmt" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" ) // Port is a network port number diff --git a/pkg/routing/boltdb_routing_table.go b/pkg/routing/boltdb_routing_table.go index 1e85ea6a9..1ecd3879b 100644 --- a/pkg/routing/boltdb_routing_table.go +++ b/pkg/routing/boltdb_routing_table.go @@ -6,7 +6,7 @@ import ( "fmt" "math" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" "go.etcd.io/bbolt" ) diff --git a/pkg/routing/loop.go b/pkg/routing/loop.go index 5fc8fc097..1f1d09044 100644 --- a/pkg/routing/loop.go +++ b/pkg/routing/loop.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" ) // Loop defines a loop over a pair of addresses. diff --git a/pkg/routing/route.go b/pkg/routing/route.go index 86a962748..ec2de3907 100644 --- a/pkg/routing/route.go +++ b/pkg/routing/route.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/google/uuid" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" ) // Hop defines a route hop between 2 nodes. diff --git a/pkg/routing/routing_table_test.go b/pkg/routing/routing_table_test.go index a0459c99f..eeeaf46d5 100644 --- a/pkg/routing/routing_table_test.go +++ b/pkg/routing/routing_table_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/google/uuid" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/routing/rule.go b/pkg/routing/rule.go index 49d555750..e996b6c09 100644 --- a/pkg/routing/rule.go +++ b/pkg/routing/rule.go @@ -7,7 +7,7 @@ import ( "time" "github.com/google/uuid" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" ) // RuleHeaderSize represents the base size of a rule. diff --git a/pkg/routing/rule_test.go b/pkg/routing/rule_test.go index 2e8432c1b..5554bed6b 100644 --- a/pkg/routing/rule_test.go +++ b/pkg/routing/rule_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/google/uuid" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" "github.com/stretchr/testify/assert" ) diff --git a/pkg/setup/config.go b/pkg/setup/config.go index ccb4ddad3..e33c4b3b3 100644 --- a/pkg/setup/config.go +++ b/pkg/setup/config.go @@ -3,7 +3,7 @@ package setup import ( "time" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" ) // Various timeouts for setup node. diff --git a/pkg/setup/node.go b/pkg/setup/node.go index b5d16164c..29943651c 100644 --- a/pkg/setup/node.go +++ b/pkg/setup/node.go @@ -7,14 +7,14 @@ import ( "fmt" "time" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/dmsg/disc" - "github.com/skycoin/skycoin/src/util/logging" - - "github.com/skycoin/skywire/pkg/metrics" - "github.com/skycoin/skywire/pkg/routing" - "github.com/skycoin/skywire/pkg/transport" - "github.com/skycoin/skywire/pkg/transport/dmsg" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/dmsg/disc" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" + + "github.com/SkycoinProject/skywire/pkg/metrics" + "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/transport" + "github.com/SkycoinProject/skywire/pkg/transport/dmsg" ) // Hop is a wrapper around transport hop to add functionality diff --git a/pkg/setup/node_test.go b/pkg/setup/node_test.go index a46ebad16..e6178c106 100644 --- a/pkg/setup/node_test.go +++ b/pkg/setup/node_test.go @@ -11,16 +11,16 @@ import ( "time" "github.com/google/uuid" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/dmsg/disc" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/dmsg/disc" "github.com/stretchr/testify/require" "golang.org/x/net/nettest" - "github.com/skycoin/skywire/pkg/metrics" - "github.com/skycoin/skywire/pkg/routing" - "github.com/skycoin/skywire/pkg/transport/dmsg" + "github.com/SkycoinProject/skywire/pkg/metrics" + "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/transport/dmsg" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" ) func TestMain(m *testing.M) { diff --git a/pkg/setup/protocol.go b/pkg/setup/protocol.go index 6532a7e63..05ca56c9c 100644 --- a/pkg/setup/protocol.go +++ b/pkg/setup/protocol.go @@ -9,7 +9,7 @@ import ( "fmt" "io" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/routing" ) // PacketType defines type of a setup packet diff --git a/pkg/therealssh/auth.go b/pkg/therealssh/auth.go index 45cfd8fde..99fcbc4a6 100644 --- a/pkg/therealssh/auth.go +++ b/pkg/therealssh/auth.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" ) // Authorizer defines interface for authorization providers. diff --git a/pkg/therealssh/auth_test.go b/pkg/therealssh/auth_test.go index 8871d2452..2dd2d3791 100644 --- a/pkg/therealssh/auth_test.go +++ b/pkg/therealssh/auth_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" "github.com/stretchr/testify/require" ) diff --git a/pkg/therealssh/channel.go b/pkg/therealssh/channel.go index a6e129a0f..a9356edfd 100644 --- a/pkg/therealssh/channel.go +++ b/pkg/therealssh/channel.go @@ -13,9 +13,9 @@ import ( "sync" "github.com/creack/pty" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/routing" ) // Port reserved for SSH app diff --git a/pkg/therealssh/channel_pty_test.go b/pkg/therealssh/channel_pty_test.go index e255d1d1e..8af93976c 100644 --- a/pkg/therealssh/channel_pty_test.go +++ b/pkg/therealssh/channel_pty_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/routing" ) func TestChannelServe(t *testing.T) { diff --git a/pkg/therealssh/channel_test.go b/pkg/therealssh/channel_test.go index f05a7323b..33058d735 100644 --- a/pkg/therealssh/channel_test.go +++ b/pkg/therealssh/channel_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire/internal/testhelpers" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/internal/testhelpers" + "github.com/SkycoinProject/skywire/pkg/routing" ) func TestChannelSendWrite(t *testing.T) { diff --git a/pkg/therealssh/client.go b/pkg/therealssh/client.go index 86a5207d8..456e0a5cc 100644 --- a/pkg/therealssh/client.go +++ b/pkg/therealssh/client.go @@ -11,10 +11,10 @@ import ( "time" "github.com/creack/pty" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" - "github.com/skycoin/skywire/internal/netutil" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/internal/netutil" + "github.com/SkycoinProject/skywire/pkg/routing" ) var r = netutil.NewRetrier(50*time.Millisecond, 5, 2) diff --git a/pkg/therealssh/client_test.go b/pkg/therealssh/client_test.go index 9402246f7..a981188ea 100644 --- a/pkg/therealssh/client_test.go +++ b/pkg/therealssh/client_test.go @@ -5,11 +5,11 @@ import ( "net" "testing" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/routing" ) func TestClientOpenChannel(t *testing.T) { diff --git a/pkg/therealssh/dialer.go b/pkg/therealssh/dialer.go index 7e5da3a9b..46706f4cc 100644 --- a/pkg/therealssh/dialer.go +++ b/pkg/therealssh/dialer.go @@ -3,7 +3,7 @@ package therealssh import ( "net" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/routing" ) // dialer dials to a remote node. diff --git a/pkg/therealssh/pty_test.go b/pkg/therealssh/pty_test.go index 053cf9a15..c6560bb8e 100644 --- a/pkg/therealssh/pty_test.go +++ b/pkg/therealssh/pty_test.go @@ -10,10 +10,10 @@ import ( "testing" "github.com/creack/pty" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/routing" ) func TestRunRPC(t *testing.T) { diff --git a/pkg/therealssh/server.go b/pkg/therealssh/server.go index 1602d5c15..7baed9a3b 100644 --- a/pkg/therealssh/server.go +++ b/pkg/therealssh/server.go @@ -7,10 +7,10 @@ import ( "io" "net" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/routing" ) // CommandType represents global protocol messages. diff --git a/pkg/therealssh/server_test.go b/pkg/therealssh/server_test.go index 1c9f2b65e..e6dca0225 100644 --- a/pkg/therealssh/server_test.go +++ b/pkg/therealssh/server_test.go @@ -6,12 +6,12 @@ import ( "os" "testing" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/routing" ) func TestMain(m *testing.M) { diff --git a/pkg/therealssh/session.go b/pkg/therealssh/session.go index 06bd1bd3c..0abb2ecc3 100644 --- a/pkg/therealssh/session.go +++ b/pkg/therealssh/session.go @@ -11,7 +11,7 @@ import ( "syscall" "github.com/creack/pty" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" ) var log = logging.MustGetLogger("therealssh") diff --git a/pkg/transport-discovery/client/client.go b/pkg/transport-discovery/client/client.go index 02c0f967d..532746861 100644 --- a/pkg/transport-discovery/client/client.go +++ b/pkg/transport-discovery/client/client.go @@ -12,11 +12,11 @@ import ( "net/http" "github.com/google/uuid" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" - "github.com/skycoin/skywire/internal/httpauth" - "github.com/skycoin/skywire/pkg/transport" + "github.com/SkycoinProject/skywire/internal/httpauth" + "github.com/SkycoinProject/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 c231a0880..f5855a8cb 100644 --- a/pkg/transport-discovery/client/client_test.go +++ b/pkg/transport-discovery/client/client_test.go @@ -11,13 +11,13 @@ import ( "sync" "testing" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire/internal/httpauth" - "github.com/skycoin/skywire/pkg/transport" + "github.com/SkycoinProject/skywire/internal/httpauth" + "github.com/SkycoinProject/skywire/pkg/transport" ) func TestMain(m *testing.M) { diff --git a/pkg/transport/discovery.go b/pkg/transport/discovery.go index 682503678..4d88c0227 100644 --- a/pkg/transport/discovery.go +++ b/pkg/transport/discovery.go @@ -7,7 +7,7 @@ import ( "time" "github.com/google/uuid" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" ) // DiscoveryClient performs Transport discovery operations. diff --git a/pkg/transport/discovery_test.go b/pkg/transport/discovery_test.go index de633dd8d..cd016ee05 100644 --- a/pkg/transport/discovery_test.go +++ b/pkg/transport/discovery_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" - "github.com/skycoin/skywire/pkg/transport" + "github.com/SkycoinProject/skywire/pkg/transport" ) func TestNewDiscoveryMock(t *testing.T) { diff --git a/pkg/transport/dmsg/dmsg.go b/pkg/transport/dmsg/dmsg.go index d3d95466f..1701e5823 100644 --- a/pkg/transport/dmsg/dmsg.go +++ b/pkg/transport/dmsg/dmsg.go @@ -5,16 +5,16 @@ import ( "net" "time" - "github.com/skycoin/dmsg" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/dmsg/disc" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/dmsg" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/dmsg/disc" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" - "github.com/skycoin/skywire/pkg/transport" + "github.com/SkycoinProject/skywire/pkg/transport" ) const ( - // Type is a wrapper type for "github.com/skycoin/dmsg".Type + // Type is a wrapper type for "github.com/SkycoinProject/dmsg".Type Type = dmsg.Type ) @@ -35,32 +35,32 @@ func NewServer(pk cipher.PubKey, sk cipher.SecKey, addr string, l net.Listener, return dmsg.NewServer(pk, sk, addr, l, dc) } -// ClientOption is a wrapper type for "github.com/skycoin/dmsg".ClientOption +// ClientOption is a wrapper type for "github.com/SkycoinProject/dmsg".ClientOption type ClientOption = dmsg.ClientOption -// Client is a wrapper type for "github.com/skycoin/dmsg".Client +// Client is a wrapper type for "github.com/SkycoinProject/dmsg".Client type Client struct { *dmsg.Client } -// NewClient is a wrapper type for "github.com/skycoin/dmsg".NewClient +// NewClient is a wrapper type for "github.com/SkycoinProject/dmsg".NewClient func NewClient(pk cipher.PubKey, sk cipher.SecKey, dc disc.APIClient, opts ...ClientOption) *Client { return &Client{ Client: dmsg.NewClient(pk, sk, dc, opts...), } } -// Accept is a wrapper type for "github.com/skycoin/dmsg".Accept +// Accept is a wrapper type for "github.com/SkycoinProject/dmsg".Accept func (c *Client) Accept(ctx context.Context) (transport.Transport, error) { return c.Client.Accept(ctx) } -// Dial is a wrapper type for "github.com/skycoin/dmsg".Dial +// Dial is a wrapper type for "github.com/SkycoinProject/dmsg".Dial func (c *Client) Dial(ctx context.Context, remote cipher.PubKey) (transport.Transport, error) { return c.Client.Dial(ctx, remote) } -// SetLogger is a wrapper type for "github.com/skycoin/dmsg".SetLogger +// SetLogger is a wrapper type for "github.com/SkycoinProject/dmsg".SetLogger func SetLogger(log *logging.Logger) ClientOption { return dmsg.SetLogger(log) } diff --git a/pkg/transport/dmsg/testing.go b/pkg/transport/dmsg/testing.go index a681035af..04629c7fc 100644 --- a/pkg/transport/dmsg/testing.go +++ b/pkg/transport/dmsg/testing.go @@ -5,10 +5,10 @@ import ( "fmt" "testing" - "github.com/skycoin/dmsg" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/dmsg/disc" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/dmsg" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/dmsg/disc" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" "github.com/stretchr/testify/require" "golang.org/x/net/nettest" ) diff --git a/pkg/transport/entry.go b/pkg/transport/entry.go index 1c4dd0fe6..2ddd3595c 100644 --- a/pkg/transport/entry.go +++ b/pkg/transport/entry.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/google/uuid" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" ) // Entry is the unsigned representation of a Transport. diff --git a/pkg/transport/entry_test.go b/pkg/transport/entry_test.go index bcc91ad68..70fb72918 100644 --- a/pkg/transport/entry_test.go +++ b/pkg/transport/entry_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" - "github.com/skycoin/skywire/pkg/transport" + "github.com/SkycoinProject/skywire/pkg/transport" ) func TestNewEntry(t *testing.T) { diff --git a/pkg/transport/handshake.go b/pkg/transport/handshake.go index aa590bb5b..b62593af1 100644 --- a/pkg/transport/handshake.go +++ b/pkg/transport/handshake.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" ) func makeEntry(pk1, pk2 cipher.PubKey, tpType string) Entry { diff --git a/pkg/transport/handshake_test.go b/pkg/transport/handshake_test.go index 134346224..bc0d4da79 100644 --- a/pkg/transport/handshake_test.go +++ b/pkg/transport/handshake_test.go @@ -6,7 +6,7 @@ import ( "net" "testing" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" "github.com/stretchr/testify/require" ) diff --git a/pkg/transport/log_test.go b/pkg/transport/log_test.go index ad0cdce10..3bc17ef66 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/skycoin/skywire/pkg/transport" + "github.com/SkycoinProject/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 5f97a5f88..826810e6d 100644 --- a/pkg/transport/managed_transport.go +++ b/pkg/transport/managed_transport.go @@ -9,11 +9,11 @@ import ( "sync/atomic" "time" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/routing" - "github.com/skycoin/dmsg" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/dmsg" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" ) const logWriteInterval = time.Second * 3 diff --git a/pkg/transport/manager.go b/pkg/transport/manager.go index f63311074..bf984856c 100644 --- a/pkg/transport/manager.go +++ b/pkg/transport/manager.go @@ -7,11 +7,11 @@ import ( "strings" "sync" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/routing" "github.com/google/uuid" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" ) // ManagerConfig configures a Manager. diff --git a/pkg/transport/manager_test.go b/pkg/transport/manager_test.go index 0d01dc90d..3702dc53e 100644 --- a/pkg/transport/manager_test.go +++ b/pkg/transport/manager_test.go @@ -8,14 +8,14 @@ import ( "testing" "time" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" - "github.com/skycoin/skywire/pkg/routing" - "github.com/skycoin/skywire/pkg/transport" - "github.com/skycoin/skywire/pkg/transport/dmsg" + "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/transport" + "github.com/SkycoinProject/skywire/pkg/transport/dmsg" "github.com/google/uuid" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/transport/mock.go b/pkg/transport/mock.go index f57360629..5b6f308aa 100644 --- a/pkg/transport/mock.go +++ b/pkg/transport/mock.go @@ -7,7 +7,7 @@ import ( "net" "time" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" ) // ErrTransportCommunicationTimeout represent timeout error for a mock transport. diff --git a/pkg/transport/tcp_transport.go b/pkg/transport/tcp_transport.go index e5d112fc5..39bff4d27 100644 --- a/pkg/transport/tcp_transport.go +++ b/pkg/transport/tcp_transport.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" ) // ErrUnknownRemote returned for connection attempts for remotes diff --git a/pkg/transport/tcp_transport_test.go b/pkg/transport/tcp_transport_test.go index 97919889c..33cdd3311 100644 --- a/pkg/transport/tcp_transport_test.go +++ b/pkg/transport/tcp_transport_test.go @@ -8,11 +8,11 @@ import ( "os" "testing" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire/pkg/transport" + "github.com/SkycoinProject/skywire/pkg/transport" ) func TestTCPFactory(t *testing.T) { diff --git a/pkg/transport/transport.go b/pkg/transport/transport.go index ee35cf75b..d12d64ca4 100644 --- a/pkg/transport/transport.go +++ b/pkg/transport/transport.go @@ -9,8 +9,8 @@ import ( "time" "github.com/google/uuid" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" ) var log = logging.MustGetLogger("transport") diff --git a/pkg/util/pathutil/configpath.go b/pkg/util/pathutil/configpath.go index 591ba23da..5142e9290 100644 --- a/pkg/util/pathutil/configpath.go +++ b/pkg/util/pathutil/configpath.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" ) var log = logging.MustGetLogger("pathutil") @@ -78,7 +78,7 @@ func NodeDefaults() ConfigPaths { paths[WorkingDirLoc] = filepath.Join(wd, "skywire-config.json") } paths[HomeLoc] = filepath.Join(HomeDir(), ".skycoin/skywire/skywire-config.json") - paths[LocalLoc] = "/usr/local/skycoin/skywire/skywire-config.json" + paths[LocalLoc] = "/usr/local/SkycoinProject/skywire/skywire-config.json" return paths } @@ -89,7 +89,7 @@ func HypervisorDefaults() ConfigPaths { paths[WorkingDirLoc] = filepath.Join(wd, "hypervisor-config.json") } paths[HomeLoc] = filepath.Join(HomeDir(), ".skycoin/hypervisor/hypervisor-config.json") - paths[LocalLoc] = "/usr/local/skycoin/hypervisor/hypervisor-config.json" + paths[LocalLoc] = "/usr/local/SkycoinProject/hypervisor/hypervisor-config.json" return paths } diff --git a/pkg/util/pathutil/homedir.go b/pkg/util/pathutil/homedir.go index b814615c0..454afc0da 100644 --- a/pkg/util/pathutil/homedir.go +++ b/pkg/util/pathutil/homedir.go @@ -7,7 +7,7 @@ import ( "path/filepath" "runtime" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" ) // HomeDir obtains the path to the user's home directory via ENVs. diff --git a/pkg/visor/config.go b/pkg/visor/config.go index bb8210424..cbecbadca 100644 --- a/pkg/visor/config.go +++ b/pkg/visor/config.go @@ -8,13 +8,13 @@ import ( "path/filepath" "time" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/dmsg/disc" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/dmsg/disc" - "github.com/skycoin/skywire/pkg/routing" - "github.com/skycoin/skywire/pkg/transport" - trClient "github.com/skycoin/skywire/pkg/transport-discovery/client" - "github.com/skycoin/skywire/pkg/transport/dmsg" + "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/transport" + trClient "github.com/SkycoinProject/skywire/pkg/transport-discovery/client" + "github.com/SkycoinProject/skywire/pkg/transport/dmsg" ) // Config defines configuration parameters for Node. diff --git a/pkg/visor/config_test.go b/pkg/visor/config_test.go index 0a278bdf4..d85b4c8c5 100644 --- a/pkg/visor/config_test.go +++ b/pkg/visor/config_test.go @@ -10,12 +10,12 @@ import ( "testing" "time" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire/internal/httpauth" - "github.com/skycoin/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/internal/httpauth" + "github.com/SkycoinProject/skywire/pkg/routing" ) func TestMessagingDiscovery(t *testing.T) { diff --git a/pkg/visor/rpc.go b/pkg/visor/rpc.go index 701a1ff1f..c734605a9 100644 --- a/pkg/visor/rpc.go +++ b/pkg/visor/rpc.go @@ -6,10 +6,10 @@ import ( "time" "github.com/google/uuid" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" - "github.com/skycoin/skywire/pkg/routing" - "github.com/skycoin/skywire/pkg/transport" + "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/transport" ) const ( diff --git a/pkg/visor/rpc_client.go b/pkg/visor/rpc_client.go index a0dfcadc5..66be44ea4 100644 --- a/pkg/visor/rpc_client.go +++ b/pkg/visor/rpc_client.go @@ -9,11 +9,11 @@ import ( "time" "github.com/google/uuid" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" - "github.com/skycoin/skywire/pkg/routing" - "github.com/skycoin/skywire/pkg/transport" + "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/transport" ) // RPCClient represents a RPC Client implementation. diff --git a/pkg/visor/rpc_test.go b/pkg/visor/rpc_test.go index 3f151ea60..ff20ccdfe 100644 --- a/pkg/visor/rpc_test.go +++ b/pkg/visor/rpc_test.go @@ -9,14 +9,14 @@ import ( "testing" "time" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire/pkg/routing" - "github.com/skycoin/skywire/pkg/transport" - "github.com/skycoin/skywire/pkg/util/pathutil" + "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/transport" + "github.com/SkycoinProject/skywire/pkg/util/pathutil" ) func TestListApps(t *testing.T) { diff --git a/pkg/visor/visor.go b/pkg/visor/visor.go index 5806fd810..e21a37ee3 100644 --- a/pkg/visor/visor.go +++ b/pkg/visor/visor.go @@ -19,16 +19,16 @@ import ( "syscall" "time" - "github.com/skycoin/dmsg/noise" - "github.com/skycoin/skycoin/src/util/logging" - - "github.com/skycoin/skywire/pkg/app" - routeFinder "github.com/skycoin/skywire/pkg/route-finder/client" - "github.com/skycoin/skywire/pkg/router" - "github.com/skycoin/skywire/pkg/routing" - "github.com/skycoin/skywire/pkg/transport" - "github.com/skycoin/skywire/pkg/transport/dmsg" - "github.com/skycoin/skywire/pkg/util/pathutil" + "github.com/SkycoinProject/dmsg/noise" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" + + "github.com/SkycoinProject/skywire/pkg/app" + routeFinder "github.com/SkycoinProject/skywire/pkg/route-finder/client" + "github.com/SkycoinProject/skywire/pkg/router" + "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/transport" + "github.com/SkycoinProject/skywire/pkg/transport/dmsg" + "github.com/SkycoinProject/skywire/pkg/util/pathutil" ) var log = logging.MustGetLogger("node") diff --git a/pkg/visor/visor_test.go b/pkg/visor/visor_test.go index f9a76c98a..b3c407db0 100644 --- a/pkg/visor/visor_test.go +++ b/pkg/visor/visor_test.go @@ -14,18 +14,18 @@ import ( "testing" "time" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/dmsg/disc" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/dmsg/disc" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire/internal/httpauth" - "github.com/skycoin/skywire/pkg/app" - "github.com/skycoin/skywire/pkg/routing" - "github.com/skycoin/skywire/pkg/transport" - "github.com/skycoin/skywire/pkg/transport/dmsg" - "github.com/skycoin/skywire/pkg/util/pathutil" + "github.com/SkycoinProject/skywire/internal/httpauth" + "github.com/SkycoinProject/skywire/pkg/app" + "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire/pkg/transport" + "github.com/SkycoinProject/skywire/pkg/transport/dmsg" + "github.com/SkycoinProject/skywire/pkg/util/pathutil" ) var masterLogger *logging.MasterLogger diff --git a/vendor/github.com/skycoin/dmsg/cipher/cipher.go b/vendor/github.com/skycoin/dmsg/cipher/cipher.go index 86f567538..9c22b344b 100644 --- a/vendor/github.com/skycoin/dmsg/cipher/cipher.go +++ b/vendor/github.com/skycoin/dmsg/cipher/cipher.go @@ -1,5 +1,5 @@ // Package cipher implements common golang encoding interfaces for -// github.com/skycoin/skycoin/src/cipher +// github.com/SkycoinProject/SkycoinProject/src/cipher package cipher import ( @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/skycoin/skycoin/src/cipher" + "github.com/SkycoinProject/SkycoinProject/src/cipher" ) func init() { diff --git a/vendor/github.com/skycoin/dmsg/client.go b/vendor/github.com/skycoin/dmsg/client.go index 8e6a20fed..13282e14f 100644 --- a/vendor/github.com/skycoin/dmsg/client.go +++ b/vendor/github.com/skycoin/dmsg/client.go @@ -9,11 +9,11 @@ import ( "time" "github.com/sirupsen/logrus" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/dmsg/disc" - "github.com/skycoin/dmsg/noise" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/dmsg/disc" + "github.com/SkycoinProject/dmsg/noise" ) var log = logging.MustGetLogger("dmsg") diff --git a/vendor/github.com/skycoin/dmsg/disc/client.go b/vendor/github.com/skycoin/dmsg/disc/client.go index 9f3d4c2ad..624426147 100644 --- a/vendor/github.com/skycoin/dmsg/disc/client.go +++ b/vendor/github.com/skycoin/dmsg/disc/client.go @@ -11,9 +11,9 @@ import ( "sync" "time" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" ) var log = logging.MustGetLogger("disc") diff --git a/vendor/github.com/skycoin/dmsg/disc/entry.go b/vendor/github.com/skycoin/dmsg/disc/entry.go index afebaabcd..bdeafb528 100644 --- a/vendor/github.com/skycoin/dmsg/disc/entry.go +++ b/vendor/github.com/skycoin/dmsg/disc/entry.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" ) const currentVersion = "0.0.1" diff --git a/vendor/github.com/skycoin/dmsg/disc/testing.go b/vendor/github.com/skycoin/dmsg/disc/testing.go index dd2eeab9d..8dc40964c 100644 --- a/vendor/github.com/skycoin/dmsg/disc/testing.go +++ b/vendor/github.com/skycoin/dmsg/disc/testing.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" ) // MockClient is an APIClient mock. The mock doesn't reply with the same errors as the diff --git a/vendor/github.com/skycoin/dmsg/frame.go b/vendor/github.com/skycoin/dmsg/frame.go index 78e10edf5..d00833647 100644 --- a/vendor/github.com/skycoin/dmsg/frame.go +++ b/vendor/github.com/skycoin/dmsg/frame.go @@ -8,9 +8,9 @@ import ( "sync/atomic" "time" - "github.com/skycoin/dmsg/ioutil" + "github.com/SkycoinProject/dmsg/ioutil" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" ) const ( diff --git a/vendor/github.com/skycoin/dmsg/go.mod b/vendor/github.com/skycoin/dmsg/go.mod index a24455c1f..2e573d695 100644 --- a/vendor/github.com/skycoin/dmsg/go.mod +++ b/vendor/github.com/skycoin/dmsg/go.mod @@ -1,4 +1,4 @@ -module github.com/skycoin/dmsg +module github.com/SkycoinProject/dmsg go 1.12 @@ -9,7 +9,7 @@ require ( github.com/mattn/go-colorable v0.1.2 // indirect github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect github.com/sirupsen/logrus v1.4.2 - github.com/skycoin/skycoin v0.26.0 + github.com/SkycoinProject/SkycoinProject v0.26.0 github.com/stretchr/testify v1.3.0 golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4 // indirect golang.org/x/net v0.0.0-20190620200207-3b0461eec859 diff --git a/vendor/github.com/skycoin/dmsg/ioutil/logging.go b/vendor/github.com/skycoin/dmsg/ioutil/logging.go index 71c97a40e..6a904fe71 100644 --- a/vendor/github.com/skycoin/dmsg/ioutil/logging.go +++ b/vendor/github.com/skycoin/dmsg/ioutil/logging.go @@ -1,7 +1,7 @@ package ioutil import ( - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" ) var log = logging.MustGetLogger("ioutil") diff --git a/vendor/github.com/skycoin/dmsg/noise/dh.go b/vendor/github.com/skycoin/dmsg/noise/dh.go index 6da7ab693..e627bc095 100644 --- a/vendor/github.com/skycoin/dmsg/noise/dh.go +++ b/vendor/github.com/skycoin/dmsg/noise/dh.go @@ -4,7 +4,7 @@ import ( "io" "github.com/flynn/noise" - "github.com/skycoin/skycoin/src/cipher" + "github.com/SkycoinProject/SkycoinProject/src/cipher" ) // Secp256k1 implements `noise.DHFunc`. diff --git a/vendor/github.com/skycoin/dmsg/noise/net.go b/vendor/github.com/skycoin/dmsg/noise/net.go index e065daff6..5759a77f8 100644 --- a/vendor/github.com/skycoin/dmsg/noise/net.go +++ b/vendor/github.com/skycoin/dmsg/noise/net.go @@ -11,7 +11,7 @@ import ( "github.com/flynn/noise" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" ) var ( diff --git a/vendor/github.com/skycoin/dmsg/noise/noise.go b/vendor/github.com/skycoin/dmsg/noise/noise.go index 3b36cdf79..e9121a7a5 100644 --- a/vendor/github.com/skycoin/dmsg/noise/noise.go +++ b/vendor/github.com/skycoin/dmsg/noise/noise.go @@ -4,11 +4,11 @@ import ( "crypto/rand" "encoding/binary" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" "github.com/flynn/noise" - "github.com/skycoin/dmsg/cipher" + "github.com/SkycoinProject/dmsg/cipher" ) var noiseLogger = logging.MustGetLogger("noise") // TODO: initialize properly or remove diff --git a/vendor/github.com/skycoin/dmsg/noise/read_writer.go b/vendor/github.com/skycoin/dmsg/noise/read_writer.go index 0a17acf5a..355f1cfbe 100644 --- a/vendor/github.com/skycoin/dmsg/noise/read_writer.go +++ b/vendor/github.com/skycoin/dmsg/noise/read_writer.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/dmsg/ioutil" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/dmsg/ioutil" ) // ReadWriter implements noise encrypted read writer. diff --git a/vendor/github.com/skycoin/dmsg/server.go b/vendor/github.com/skycoin/dmsg/server.go index 4433b65cd..92f492cc3 100644 --- a/vendor/github.com/skycoin/dmsg/server.go +++ b/vendor/github.com/skycoin/dmsg/server.go @@ -9,11 +9,11 @@ import ( "sync/atomic" "time" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/dmsg/disc" - "github.com/skycoin/dmsg/noise" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/dmsg/disc" + "github.com/SkycoinProject/dmsg/noise" ) // ErrListenerAlreadyWrappedToNoise occurs when the provided net.Listener is already wrapped with noise.Listener diff --git a/vendor/github.com/skycoin/dmsg/transport.go b/vendor/github.com/skycoin/dmsg/transport.go index 734983de9..8bfdd573f 100644 --- a/vendor/github.com/skycoin/dmsg/transport.go +++ b/vendor/github.com/skycoin/dmsg/transport.go @@ -8,10 +8,10 @@ import ( "net" "sync" - "github.com/skycoin/skycoin/src/util/logging" + "github.com/SkycoinProject/SkycoinProject/src/util/logging" - "github.com/skycoin/dmsg/cipher" - "github.com/skycoin/dmsg/ioutil" + "github.com/SkycoinProject/dmsg/cipher" + "github.com/SkycoinProject/dmsg/ioutil" ) // Errors related to REQUEST frames. diff --git a/vendor/github.com/skycoin/skycoin/src/cipher/address.go b/vendor/github.com/skycoin/skycoin/src/cipher/address.go index b5d93275b..9693d3356 100644 --- a/vendor/github.com/skycoin/skycoin/src/cipher/address.go +++ b/vendor/github.com/skycoin/skycoin/src/cipher/address.go @@ -4,7 +4,7 @@ import ( "errors" "log" - "github.com/skycoin/skycoin/src/cipher/base58" + "github.com/SkycoinProject/SkycoinProject/src/cipher/base58" ) var ( diff --git a/vendor/github.com/skycoin/skycoin/src/cipher/bitcoin.go b/vendor/github.com/skycoin/skycoin/src/cipher/bitcoin.go index e601d5a2c..769ae6989 100644 --- a/vendor/github.com/skycoin/skycoin/src/cipher/bitcoin.go +++ b/vendor/github.com/skycoin/skycoin/src/cipher/bitcoin.go @@ -5,7 +5,7 @@ import ( "errors" "log" - "github.com/skycoin/skycoin/src/cipher/base58" + "github.com/SkycoinProject/SkycoinProject/src/cipher/base58" ) var ( diff --git a/vendor/github.com/skycoin/skycoin/src/cipher/crypto.go b/vendor/github.com/skycoin/skycoin/src/cipher/crypto.go index 94499df00..6c0e31a31 100644 --- a/vendor/github.com/skycoin/skycoin/src/cipher/crypto.go +++ b/vendor/github.com/skycoin/skycoin/src/cipher/crypto.go @@ -24,8 +24,8 @@ import ( "log" "time" - "github.com/skycoin/skycoin/src/cipher/ripemd160" - secp256k1 "github.com/skycoin/skycoin/src/cipher/secp256k1-go" + "github.com/SkycoinProject/SkycoinProject/src/cipher/ripemd160" + secp256k1 "github.com/SkycoinProject/SkycoinProject/src/cipher/secp256k1-go" ) var ( diff --git a/vendor/github.com/skycoin/skycoin/src/cipher/secp256k1-go/secp256k1.go b/vendor/github.com/skycoin/skycoin/src/cipher/secp256k1-go/secp256k1.go index f4b8fa93d..de8947815 100644 --- a/vendor/github.com/skycoin/skycoin/src/cipher/secp256k1-go/secp256k1.go +++ b/vendor/github.com/skycoin/skycoin/src/cipher/secp256k1-go/secp256k1.go @@ -9,7 +9,7 @@ import ( "encoding/hex" "log" - secp "github.com/skycoin/skycoin/src/cipher/secp256k1-go/secp256k1-go2" + secp "github.com/SkycoinProject/SkycoinProject/src/cipher/secp256k1-go/secp256k1-go2" ) // DebugPrint enable debug print statements diff --git a/vendor/modules.txt b/vendor/modules.txt index ed78a2a16..442ed25b5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -62,19 +62,19 @@ github.com/prometheus/procfs/internal/fs # github.com/sirupsen/logrus v1.4.2 github.com/sirupsen/logrus github.com/sirupsen/logrus/hooks/syslog -# github.com/skycoin/dmsg v0.0.0-20190805065636-70f4c32a994f -github.com/skycoin/dmsg/cipher -github.com/skycoin/dmsg -github.com/skycoin/dmsg/disc -github.com/skycoin/dmsg/noise -github.com/skycoin/dmsg/ioutil -# github.com/skycoin/skycoin v0.26.0 -github.com/skycoin/skycoin/src/util/logging -github.com/skycoin/skycoin/src/cipher -github.com/skycoin/skycoin/src/cipher/base58 -github.com/skycoin/skycoin/src/cipher/ripemd160 -github.com/skycoin/skycoin/src/cipher/secp256k1-go -github.com/skycoin/skycoin/src/cipher/secp256k1-go/secp256k1-go2 +# github.com/SkycoinProject/dmsg v0.0.0-20190805065636-70f4c32a994f +github.com/SkycoinProject/dmsg/cipher +github.com/SkycoinProject/dmsg +github.com/SkycoinProject/dmsg/disc +github.com/SkycoinProject/dmsg/noise +github.com/SkycoinProject/dmsg/ioutil +# github.com/SkycoinProject/SkycoinProject v0.26.0 +github.com/SkycoinProject/SkycoinProject/src/util/logging +github.com/SkycoinProject/SkycoinProject/src/cipher +github.com/SkycoinProject/SkycoinProject/src/cipher/base58 +github.com/SkycoinProject/SkycoinProject/src/cipher/ripemd160 +github.com/SkycoinProject/SkycoinProject/src/cipher/secp256k1-go +github.com/SkycoinProject/SkycoinProject/src/cipher/secp256k1-go/secp256k1-go2 # github.com/spf13/cobra v0.0.5 github.com/spf13/cobra # github.com/spf13/pflag v1.0.3 From 5856b4263ce28095c38e39a9d9b06c22a2abeefc Mon Sep 17 00:00:00 2001 From: ivcosla Date: Wed, 18 Sep 2019 01:32:29 +0200 Subject: [PATCH 2/2] imported SkycoinProject dmsg, builds and pass tests --- ci_scripts/run-internal-tests.sh | 58 +++---- ci_scripts/run-pkg-tests.sh | 146 +++++++++--------- cmd/apps/helloworld/helloworld.go | 4 +- cmd/apps/skychat/chat.go | 6 +- .../therealproxy-client.go | 8 +- cmd/apps/therealproxy/therealproxy.go | 4 +- .../therealssh-client/therealssh-client.go | 6 +- cmd/apps/therealssh/therealssh.go | 6 +- cmd/hypervisor/commands/gen-config.go | 4 +- cmd/hypervisor/commands/root.go | 6 +- cmd/hypervisor/hypervisor.go | 2 +- cmd/messaging-server/commands/root.go | 2 +- cmd/messaging-server/messaging-server.go | 2 +- cmd/setup-node/commands/root.go | 6 +- cmd/setup-node/setup-node.go | 2 +- cmd/skywire-cli/commands/mdisc/root.go | 2 +- cmd/skywire-cli/commands/node/app.go | 4 +- cmd/skywire-cli/commands/node/gen-config.go | 10 +- cmd/skywire-cli/commands/node/root.go | 4 +- cmd/skywire-cli/commands/node/routes.go | 8 +- cmd/skywire-cli/commands/node/transports.go | 4 +- cmd/skywire-cli/commands/root.go | 8 +- cmd/skywire-cli/commands/rtfind/root.go | 4 +- cmd/skywire-cli/commands/tpdisc/root.go | 6 +- cmd/skywire-cli/internal/internal.go | 2 +- cmd/skywire-cli/skywire-cli.go | 2 +- cmd/skywire-visor/commands/root.go | 6 +- cmd/skywire-visor/skywire-visor.go | 2 +- cmd/therealssh-cli/commands/root.go | 2 +- cmd/therealssh-cli/therealssh-cli.go | 2 +- docs/Tests.Detection-of-unstable-tests.md | 50 +++--- go.mod | 6 +- go.sum | 15 +- internal/httpauth/client.go | 2 +- internal/httpauth/client_test.go | 2 +- internal/therealproxy/client.go | 2 +- internal/therealproxy/server_test.go | 2 +- pkg/app/app.go | 4 +- pkg/app/app_test.go | 6 +- pkg/app/packet.go | 2 +- pkg/app/packet_test.go | 2 +- pkg/httputil/httputil.go | 2 +- pkg/hypervisor/config.go | 2 +- pkg/hypervisor/hypervisor.go | 8 +- pkg/hypervisor/hypervisor_test.go | 2 +- pkg/hypervisor/user_manager.go | 2 +- pkg/route-finder/client/client.go | 4 +- pkg/route-finder/client/mock.go | 4 +- pkg/router/app_manager.go | 6 +- pkg/router/app_manager_test.go | 8 +- pkg/router/loop_list.go | 2 +- pkg/router/managed_routing_table.go | 2 +- pkg/router/managed_routing_table_test.go | 2 +- pkg/router/port_list.go | 4 +- pkg/router/port_manager.go | 4 +- pkg/router/port_manager_test.go | 4 +- pkg/router/route_manager.go | 6 +- pkg/router/route_manager_test.go | 6 +- pkg/router/router.go | 12 +- pkg/router/router_test.go | 14 +- pkg/routing/boltdb_routing_table.go | 2 +- pkg/routing/routing_table_test.go | 2 +- pkg/setup/node.go | 10 +- pkg/setup/node_test.go | 8 +- pkg/setup/protocol.go | 2 +- pkg/therealssh/channel.go | 2 +- pkg/therealssh/channel_pty_test.go | 2 +- pkg/therealssh/channel_test.go | 4 +- pkg/therealssh/client.go | 4 +- pkg/therealssh/client_test.go | 2 +- pkg/therealssh/dialer.go | 2 +- pkg/therealssh/pty_test.go | 2 +- pkg/therealssh/server.go | 4 +- pkg/therealssh/server_test.go | 4 +- pkg/therealssh/session.go | 2 +- pkg/transport-discovery/client/client.go | 6 +- pkg/transport-discovery/client/client_test.go | 6 +- pkg/transport/discovery_test.go | 2 +- pkg/transport/dmsg/dmsg.go | 4 +- pkg/transport/dmsg/testing.go | 2 +- pkg/transport/entry_test.go | 2 +- pkg/transport/log_test.go | 2 +- pkg/transport/managed_transport.go | 4 +- pkg/transport/manager.go | 4 +- pkg/transport/manager_test.go | 8 +- pkg/transport/tcp_transport_test.go | 2 +- pkg/transport/transport.go | 2 +- pkg/util/pathutil/configpath.go | 4 +- pkg/visor/config.go | 8 +- pkg/visor/config_test.go | 4 +- pkg/visor/rpc.go | 4 +- pkg/visor/rpc_client.go | 6 +- pkg/visor/rpc_test.go | 8 +- pkg/visor/visor.go | 18 +-- pkg/visor/visor_test.go | 14 +- .../dmsg/.gitignore | 0 .../dmsg/.golangci.yml | 0 .../dmsg/.travis.yml | 0 .../{skycoin => SkycoinProject}/dmsg/Makefile | 2 +- .../dmsg/README.md | 0 .../dmsg/TESTING.md | 0 .../dmsg/cipher/cipher.go | 4 +- .../dmsg/client.go | 2 +- .../dmsg/disc/client.go | 2 +- .../dmsg/disc/entry.go | 0 .../dmsg/disc/http_message.go | 0 .../dmsg/disc/testing.go | 0 .../{skycoin => SkycoinProject}/dmsg/frame.go | 0 .../{skycoin => SkycoinProject}/dmsg/go.mod | 5 +- .../{skycoin => SkycoinProject}/dmsg/go.sum | 10 +- .../dmsg/ioutil/ack_waiter.go | 0 .../dmsg/ioutil/atomic_bool.go | 0 .../dmsg/ioutil/buf_read.go | 0 .../dmsg/ioutil/logging.go | 2 +- .../dmsg/noise/dh.go | 2 +- .../dmsg/noise/net.go | 0 .../dmsg/noise/noise.go | 2 +- .../dmsg/noise/read_writer.go | 0 .../dmsg/server.go | 2 +- .../dmsg/testing.go | 0 .../dmsg/transport.go | 2 +- .../skycoin/src/cipher/address.go | 2 +- .../skycoin/src/cipher/bitcoin.go | 2 +- .../skycoin/src/cipher/crypto.go | 4 +- .../skycoin/src/cipher/hash.go | 0 .../skycoin/src/util/logging/formatter.go | 0 .../skycoin/src/util/logging/hooks.go | 0 .../skycoin/src/util/logging/logger.go | 0 .../skycoin/src/util/logging/logging.go | 0 .../src/cipher/secp256k1-go/secp256k1.go | 2 +- vendor/modules.txt | 27 ++-- 131 files changed, 375 insertions(+), 374 deletions(-) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/.gitignore (100%) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/.golangci.yml (100%) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/.travis.yml (100%) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/Makefile (95%) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/README.md (100%) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/TESTING.md (100%) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/cipher/cipher.go (98%) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/client.go (99%) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/disc/client.go (98%) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/disc/entry.go (100%) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/disc/http_message.go (100%) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/disc/testing.go (100%) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/frame.go (100%) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/go.mod (81%) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/go.sum (84%) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/ioutil/ack_waiter.go (100%) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/ioutil/atomic_bool.go (100%) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/ioutil/buf_read.go (100%) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/ioutil/logging.go (53%) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/noise/dh.go (92%) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/noise/net.go (100%) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/noise/noise.go (98%) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/noise/read_writer.go (100%) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/server.go (99%) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/testing.go (100%) rename vendor/github.com/{skycoin => SkycoinProject}/dmsg/transport.go (99%) rename vendor/github.com/{skycoin => SkycoinProject}/skycoin/src/cipher/address.go (98%) rename vendor/github.com/{skycoin => SkycoinProject}/skycoin/src/cipher/bitcoin.go (98%) rename vendor/github.com/{skycoin => SkycoinProject}/skycoin/src/cipher/crypto.go (99%) rename vendor/github.com/{skycoin => SkycoinProject}/skycoin/src/cipher/hash.go (100%) rename vendor/github.com/{skycoin => SkycoinProject}/skycoin/src/util/logging/formatter.go (100%) rename vendor/github.com/{skycoin => SkycoinProject}/skycoin/src/util/logging/hooks.go (100%) rename vendor/github.com/{skycoin => SkycoinProject}/skycoin/src/util/logging/logger.go (100%) rename vendor/github.com/{skycoin => SkycoinProject}/skycoin/src/util/logging/logging.go (100%) diff --git a/ci_scripts/run-internal-tests.sh b/ci_scripts/run-internal-tests.sh index 619c5db9e..57be9caf4 100644 --- a/ci_scripts/run-internal-tests.sh +++ b/ci_scripts/run-internal-tests.sh @@ -1,34 +1,34 @@ # commit a70894c8c4223424151cdff7441b1fb2e6bad309 -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/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/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/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/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/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/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/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/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/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/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/SkycoinProject/skywire/internal/therealproxy -run TestProxy >> ./logs/internal/TestProxy.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/therealproxy -run TestProxy >> ./logs/internal/TestProxy.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestListAuthorizer >> ./logs/internal/TestListAuthorizer.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestFileAuthorizer >> ./logs/internal/TestFileAuthorizer.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestChannelServe >> ./logs/internal/TestChannelServe.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestChannelSendWrite >> ./logs/internal/TestChannelSendWrite.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestChannelRead >> ./logs/internal/TestChannelRead.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestChannelRequest >> ./logs/internal/TestChannelRequest.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestChannelServeSocket >> ./logs/internal/TestChannelServeSocket.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestClientOpenChannel >> ./logs/internal/TestClientOpenChannel.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestClientHandleResponse >> ./logs/internal/TestClientHandleResponse.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestClientHandleData >> ./logs/internal/TestClientHandleData.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestServerOpenChannel >> ./logs/internal/TestServerOpenChannel.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestServerHandleRequest >> ./logs/internal/TestServerHandleRequest.log -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/internal/therealssh -run TestServerHandleData >> ./logs/internal/TestServerHandleData.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/therealssh -run TestListAuthorizer >> ./logs/internal/TestListAuthorizer.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/therealssh -run TestFileAuthorizer >> ./logs/internal/TestFileAuthorizer.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/therealssh -run TestChannelServe >> ./logs/internal/TestChannelServe.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/therealssh -run TestChannelSendWrite >> ./logs/internal/TestChannelSendWrite.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/therealssh -run TestChannelRead >> ./logs/internal/TestChannelRead.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/therealssh -run TestChannelRequest >> ./logs/internal/TestChannelRequest.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/therealssh -run TestChannelServeSocket >> ./logs/internal/TestChannelServeSocket.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/therealssh -run TestClientOpenChannel >> ./logs/internal/TestClientOpenChannel.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/therealssh -run TestClientHandleResponse >> ./logs/internal/TestClientHandleResponse.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/therealssh -run TestClientHandleData >> ./logs/internal/TestClientHandleData.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/therealssh -run TestServerOpenChannel >> ./logs/internal/TestServerOpenChannel.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/therealssh -run TestServerHandleRequest >> ./logs/internal/TestServerHandleRequest.log +go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/internal/therealssh -run TestServerHandleData >> ./logs/internal/TestServerHandleData.log diff --git a/ci_scripts/run-pkg-tests.sh b/ci_scripts/run-pkg-tests.sh index 9ab34cf5a..f365da7be 100644 --- a/ci_scripts/run-pkg-tests.sh +++ b/ci_scripts/run-pkg-tests.sh @@ -1,80 +1,80 @@ # commit a70894c8c4223424151cdff7441b1fb2e6bad309 -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/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/SkycoinProject/skywire/pkg/hypervisor -run TestNewNode >> ./logs/pkg/TestNewNode.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/hypervisor -run TestNewNode >> ./logs/pkg/TestNewNode.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestMessagingDiscovery >> ./logs/pkg/TestMessagingDiscovery.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestTransportDiscovery >> ./logs/pkg/TestTransportDiscovery.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestTransportLogStore >> ./logs/pkg/TestTransportLogStore.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestRoutingTable >> ./logs/pkg/TestRoutingTable.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestAppsConfig >> ./logs/pkg/TestAppsConfig.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestAppsDir >> ./logs/pkg/TestAppsDir.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestLocalDir >> ./logs/pkg/TestLocalDir.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestNewNode >> ./logs/pkg/TestNewNode.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestNodeStartClose >> ./logs/pkg/TestNodeStartClose.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestNodeSpawnApp >> ./logs/pkg/TestNodeSpawnApp.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestNodeSpawnAppValidations >> ./logs/pkg/TestNodeSpawnAppValidations.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestListApps >> ./logs/pkg/TestListApps.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -run TestStartStopApp >> ./logs/pkg/TestStartStopApp.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/node -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/node -run TestMessagingDiscovery >> ./logs/pkg/TestMessagingDiscovery.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/node -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/node -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/node -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/node -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/node -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/node -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/node -run TestNewNode >> ./logs/pkg/TestNewNode.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/node -run TestNodeStartClose >> ./logs/pkg/TestNodeStartClose.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/node -run TestNodeSpawnApp >> ./logs/pkg/TestNodeSpawnApp.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/node -run TestNodeSpawnAppValidations >> ./logs/pkg/TestNodeSpawnAppValidations.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/node -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/node -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/node -run TestRPC >> ./logs/pkg/TestRPC.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/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/SkycoinProject/skywire/pkg/router -run TestAppManagerSetupLoop >> ./logs/pkg/TestAppManagerSetupLoop.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/router -run TestAppManagerCloseLoop >> ./logs/pkg/TestAppManagerCloseLoop.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/skywire/pkg/router -run TestRouteManagerRemoveLoopRule >> ./logs/pkg/TestRouteManagerRemoveLoopRule.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/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/SkycoinProject/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/SkycoinProject/skywire/pkg/router -run TestRouteManagerConfirmLoop >> ./logs/pkg/TestRouteManagerConfirmLoop.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/router -run TestRouteManagerLoopClosed >> ./logs/pkg/TestRouteManagerLoopClosed.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/skywire/pkg/router -run TestRouterSetupLoop >> ./logs/pkg/TestRouterSetupLoop.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/router -run TestRouterSetupLoopLocal >> ./logs/pkg/TestRouterSetupLoopLocal.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/router -run TestRouterCloseLoop >> ./logs/pkg/TestRouterCloseLoop.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/router -run TestRouterCloseLoopOnAppClose >> ./logs/pkg/TestRouterCloseLoopOnAppClose.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire/pkg/router -run TestRouterCloseLoopOnRouterClose >> ./logs/pkg/TestRouterCloseLoopOnRouterClose.log -go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/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/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 TestAppManagerSetupLoop >> ./logs/pkg/TestAppManagerSetupLoop.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestAppManagerCloseLoop >> ./logs/pkg/TestAppManagerCloseLoop.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 TestRouteManagerRemoveLoopRule >> ./logs/pkg/TestRouteManagerRemoveLoopRule.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 TestRouteManagerConfirmLoop >> ./logs/pkg/TestRouteManagerConfirmLoop.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestRouteManagerLoopClosed >> ./logs/pkg/TestRouteManagerLoopClosed.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 TestRouterSetupLoop >> ./logs/pkg/TestRouterSetupLoop.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestRouterSetupLoopLocal >> ./logs/pkg/TestRouterSetupLoopLocal.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestRouterCloseLoop >> ./logs/pkg/TestRouterCloseLoop.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestRouterCloseLoopOnAppClose >> ./logs/pkg/TestRouterCloseLoopOnAppClose.log +go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/router -run TestRouterCloseLoopOnRouterClose >> ./logs/pkg/TestRouterCloseLoopOnRouterClose.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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/SkycoinProject/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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 diff --git a/cmd/apps/helloworld/helloworld.go b/cmd/apps/helloworld/helloworld.go index 7846695db..226186995 100644 --- a/cmd/apps/helloworld/helloworld.go +++ b/cmd/apps/helloworld/helloworld.go @@ -9,8 +9,8 @@ import ( "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/skywire/pkg/app" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/app" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) func main() { diff --git a/cmd/apps/skychat/chat.go b/cmd/apps/skychat/chat.go index fb8754f26..0f9c8e649 100644 --- a/cmd/apps/skychat/chat.go +++ b/cmd/apps/skychat/chat.go @@ -17,9 +17,9 @@ import ( "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/skywire/internal/netutil" - "github.com/SkycoinProject/skywire/pkg/app" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/internal/netutil" + "github.com/SkycoinProject/skywire-mainnet/pkg/app" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) var addr = flag.String("addr", ":8000", "address to bind") diff --git a/cmd/apps/therealproxy-client/therealproxy-client.go b/cmd/apps/therealproxy-client/therealproxy-client.go index 84c75e580..93ebb2bfe 100644 --- a/cmd/apps/therealproxy-client/therealproxy-client.go +++ b/cmd/apps/therealproxy-client/therealproxy-client.go @@ -11,10 +11,10 @@ import ( "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/skywire/internal/netutil" - "github.com/SkycoinProject/skywire/internal/therealproxy" - "github.com/SkycoinProject/skywire/pkg/app" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/internal/netutil" + "github.com/SkycoinProject/skywire-mainnet/internal/therealproxy" + "github.com/SkycoinProject/skywire-mainnet/pkg/app" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) const socksPort = 3 diff --git a/cmd/apps/therealproxy/therealproxy.go b/cmd/apps/therealproxy/therealproxy.go index b5c853274..4e0965072 100644 --- a/cmd/apps/therealproxy/therealproxy.go +++ b/cmd/apps/therealproxy/therealproxy.go @@ -7,8 +7,8 @@ import ( "flag" "log" - "github.com/SkycoinProject/skywire/internal/therealproxy" - "github.com/SkycoinProject/skywire/pkg/app" + "github.com/SkycoinProject/skywire-mainnet/internal/therealproxy" + "github.com/SkycoinProject/skywire-mainnet/pkg/app" ) func main() { diff --git a/cmd/apps/therealssh-client/therealssh-client.go b/cmd/apps/therealssh-client/therealssh-client.go index 5658ad959..11e1b41d8 100644 --- a/cmd/apps/therealssh-client/therealssh-client.go +++ b/cmd/apps/therealssh-client/therealssh-client.go @@ -9,10 +9,10 @@ import ( "net/http" "github.com/sirupsen/logrus" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire/pkg/app" - ssh "github.com/SkycoinProject/skywire/pkg/therealssh" + "github.com/SkycoinProject/skywire-mainnet/pkg/app" + ssh "github.com/SkycoinProject/skywire-mainnet/pkg/therealssh" ) func main() { diff --git a/cmd/apps/therealssh/therealssh.go b/cmd/apps/therealssh/therealssh.go index 8409d486c..781f6dde4 100644 --- a/cmd/apps/therealssh/therealssh.go +++ b/cmd/apps/therealssh/therealssh.go @@ -9,10 +9,10 @@ import ( "github.com/mitchellh/go-homedir" "github.com/sirupsen/logrus" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire/pkg/app" - ssh "github.com/SkycoinProject/skywire/pkg/therealssh" + "github.com/SkycoinProject/skywire-mainnet/pkg/app" + ssh "github.com/SkycoinProject/skywire-mainnet/pkg/therealssh" ) func main() { diff --git a/cmd/hypervisor/commands/gen-config.go b/cmd/hypervisor/commands/gen-config.go index 813f421cc..4956e04e1 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/pkg/hypervisor" - "github.com/SkycoinProject/skywire/pkg/util/pathutil" + "github.com/SkycoinProject/skywire-mainnet/pkg/hypervisor" + "github.com/SkycoinProject/skywire-mainnet/pkg/util/pathutil" ) var ( diff --git a/cmd/hypervisor/commands/root.go b/cmd/hypervisor/commands/root.go index 698d70375..eb1982f87 100644 --- a/cmd/hypervisor/commands/root.go +++ b/cmd/hypervisor/commands/root.go @@ -6,11 +6,11 @@ import ( "net/http" "os" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/spf13/cobra" - "github.com/SkycoinProject/skywire/pkg/hypervisor" - "github.com/SkycoinProject/skywire/pkg/util/pathutil" + "github.com/SkycoinProject/skywire-mainnet/pkg/hypervisor" + "github.com/SkycoinProject/skywire-mainnet/pkg/util/pathutil" ) const configEnv = "SW_HYPERVISOR_CONFIG" diff --git a/cmd/hypervisor/hypervisor.go b/cmd/hypervisor/hypervisor.go index 380ccb2b1..cde4e7977 100644 --- a/cmd/hypervisor/hypervisor.go +++ b/cmd/hypervisor/hypervisor.go @@ -3,7 +3,7 @@ skywire hypervisor */ package main -import "github.com/SkycoinProject/skywire/cmd/hypervisor/commands" +import "github.com/SkycoinProject/skywire-mainnet/cmd/hypervisor/commands" func main() { commands.Execute() diff --git a/cmd/messaging-server/commands/root.go b/cmd/messaging-server/commands/root.go index b5fefff01..9a4017c59 100644 --- a/cmd/messaging-server/commands/root.go +++ b/cmd/messaging-server/commands/root.go @@ -16,7 +16,7 @@ import ( "github.com/SkycoinProject/dmsg" "github.com/SkycoinProject/dmsg/cipher" "github.com/SkycoinProject/dmsg/disc" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/spf13/cobra" ) diff --git a/cmd/messaging-server/messaging-server.go b/cmd/messaging-server/messaging-server.go index d7c0ba577..4db968bea 100644 --- a/cmd/messaging-server/messaging-server.go +++ b/cmd/messaging-server/messaging-server.go @@ -1,6 +1,6 @@ package main -import "github.com/SkycoinProject/skywire/cmd/messaging-server/commands" +import "github.com/SkycoinProject/skywire-mainnet/cmd/messaging-server/commands" func main() { commands.Execute() diff --git a/cmd/setup-node/commands/root.go b/cmd/setup-node/commands/root.go index 1e6a1c19d..98013074c 100644 --- a/cmd/setup-node/commands/root.go +++ b/cmd/setup-node/commands/root.go @@ -12,11 +12,11 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" logrussyslog "github.com/sirupsen/logrus/hooks/syslog" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/spf13/cobra" - "github.com/SkycoinProject/skywire/pkg/metrics" - "github.com/SkycoinProject/skywire/pkg/setup" + "github.com/SkycoinProject/skywire-mainnet/pkg/metrics" + "github.com/SkycoinProject/skywire-mainnet/pkg/setup" ) var ( diff --git a/cmd/setup-node/setup-node.go b/cmd/setup-node/setup-node.go index f64c1f6df..e882d663e 100644 --- a/cmd/setup-node/setup-node.go +++ b/cmd/setup-node/setup-node.go @@ -1,6 +1,6 @@ package main -import "github.com/SkycoinProject/skywire/cmd/setup-node/commands" +import "github.com/SkycoinProject/skywire-mainnet/cmd/setup-node/commands" func main() { commands.Execute() diff --git a/cmd/skywire-cli/commands/mdisc/root.go b/cmd/skywire-cli/commands/mdisc/root.go index fca7df79f..b500045f0 100644 --- a/cmd/skywire-cli/commands/mdisc/root.go +++ b/cmd/skywire-cli/commands/mdisc/root.go @@ -10,7 +10,7 @@ import ( "github.com/SkycoinProject/dmsg/disc" "github.com/spf13/cobra" - "github.com/SkycoinProject/skywire/cmd/skywire-cli/internal" + "github.com/SkycoinProject/skywire-mainnet/cmd/skywire-cli/internal" ) var mdAddr string diff --git a/cmd/skywire-cli/commands/node/app.go b/cmd/skywire-cli/commands/node/app.go index 473138f87..fee30857a 100644 --- a/cmd/skywire-cli/commands/node/app.go +++ b/cmd/skywire-cli/commands/node/app.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/cobra" - "github.com/SkycoinProject/skywire/cmd/skywire-cli/internal" - "github.com/SkycoinProject/skywire/pkg/visor" + "github.com/SkycoinProject/skywire-mainnet/cmd/skywire-cli/internal" + "github.com/SkycoinProject/skywire-mainnet/pkg/visor" ) func init() { diff --git a/cmd/skywire-cli/commands/node/gen-config.go b/cmd/skywire-cli/commands/node/gen-config.go index 0b084d74a..75659e03e 100644 --- a/cmd/skywire-cli/commands/node/gen-config.go +++ b/cmd/skywire-cli/commands/node/gen-config.go @@ -9,8 +9,8 @@ import ( "github.com/SkycoinProject/dmsg/cipher" "github.com/spf13/cobra" - "github.com/SkycoinProject/skywire/pkg/util/pathutil" - "github.com/SkycoinProject/skywire/pkg/visor" + "github.com/SkycoinProject/skywire-mainnet/pkg/util/pathutil" + "github.com/SkycoinProject/skywire-mainnet/pkg/visor" ) func init() { @@ -68,9 +68,9 @@ func homeConfig() *visor.Config { func localConfig() *visor.Config { c := defaultConfig() - c.AppsPath = "/usr/local/SkycoinProject/skywire/apps" - c.Transport.LogStore.Location = "/usr/local/SkycoinProject/skywire/transport_logs" - c.Routing.Table.Location = "/usr/local/SkycoinProject/skywire/routing.db" + c.AppsPath = "/usr/local/SkycoinProject/skywire-mainnet/apps" + c.Transport.LogStore.Location = "/usr/local/SkycoinProject/skywire-mainnet/transport_logs" + c.Routing.Table.Location = "/usr/local/SkycoinProject/skywire-mainnet/routing.db" return c } diff --git a/cmd/skywire-cli/commands/node/root.go b/cmd/skywire-cli/commands/node/root.go index d11eb982f..f75085c7a 100644 --- a/cmd/skywire-cli/commands/node/root.go +++ b/cmd/skywire-cli/commands/node/root.go @@ -3,10 +3,10 @@ package node import ( "net/rpc" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/spf13/cobra" - "github.com/SkycoinProject/skywire/pkg/visor" + "github.com/SkycoinProject/skywire-mainnet/pkg/visor" ) var log = logging.MustGetLogger("skywire-cli") diff --git a/cmd/skywire-cli/commands/node/routes.go b/cmd/skywire-cli/commands/node/routes.go index 7e5141e41..63c1426db 100644 --- a/cmd/skywire-cli/commands/node/routes.go +++ b/cmd/skywire-cli/commands/node/routes.go @@ -11,10 +11,10 @@ import ( "github.com/spf13/cobra" - "github.com/SkycoinProject/skywire/cmd/skywire-cli/internal" - "github.com/SkycoinProject/skywire/pkg/router" - "github.com/SkycoinProject/skywire/pkg/routing" - "github.com/SkycoinProject/skywire/pkg/visor" + "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/SkycoinProject/skywire-mainnet/pkg/visor" ) func init() { diff --git a/cmd/skywire-cli/commands/node/transports.go b/cmd/skywire-cli/commands/node/transports.go index a410c26b8..d6c4fc375 100644 --- a/cmd/skywire-cli/commands/node/transports.go +++ b/cmd/skywire-cli/commands/node/transports.go @@ -11,8 +11,8 @@ import ( "github.com/SkycoinProject/dmsg/cipher" "github.com/spf13/cobra" - "github.com/SkycoinProject/skywire/cmd/skywire-cli/internal" - "github.com/SkycoinProject/skywire/pkg/visor" + "github.com/SkycoinProject/skywire-mainnet/cmd/skywire-cli/internal" + "github.com/SkycoinProject/skywire-mainnet/pkg/visor" ) func init() { diff --git a/cmd/skywire-cli/commands/root.go b/cmd/skywire-cli/commands/root.go index 3c0562469..ba2a9774c 100644 --- a/cmd/skywire-cli/commands/root.go +++ b/cmd/skywire-cli/commands/root.go @@ -5,10 +5,10 @@ import ( "github.com/spf13/cobra" - "github.com/SkycoinProject/skywire/cmd/skywire-cli/commands/mdisc" - "github.com/SkycoinProject/skywire/cmd/skywire-cli/commands/node" - "github.com/SkycoinProject/skywire/cmd/skywire-cli/commands/rtfind" - "github.com/SkycoinProject/skywire/cmd/skywire-cli/commands/tpdisc" + "github.com/SkycoinProject/skywire-mainnet/cmd/skywire-cli/commands/mdisc" + "github.com/SkycoinProject/skywire-mainnet/cmd/skywire-cli/commands/node" + "github.com/SkycoinProject/skywire-mainnet/cmd/skywire-cli/commands/rtfind" + "github.com/SkycoinProject/skywire-mainnet/cmd/skywire-cli/commands/tpdisc" ) var rootCmd = &cobra.Command{ diff --git a/cmd/skywire-cli/commands/rtfind/root.go b/cmd/skywire-cli/commands/rtfind/root.go index a1623fddc..a05f9502d 100644 --- a/cmd/skywire-cli/commands/rtfind/root.go +++ b/cmd/skywire-cli/commands/rtfind/root.go @@ -7,8 +7,8 @@ import ( "github.com/SkycoinProject/dmsg/cipher" "github.com/spf13/cobra" - "github.com/SkycoinProject/skywire/cmd/skywire-cli/internal" - "github.com/SkycoinProject/skywire/pkg/route-finder/client" + "github.com/SkycoinProject/skywire-mainnet/cmd/skywire-cli/internal" + "github.com/SkycoinProject/skywire-mainnet/pkg/route-finder/client" ) var frAddr string diff --git a/cmd/skywire-cli/commands/tpdisc/root.go b/cmd/skywire-cli/commands/tpdisc/root.go index 6fe45d58f..129220e09 100644 --- a/cmd/skywire-cli/commands/tpdisc/root.go +++ b/cmd/skywire-cli/commands/tpdisc/root.go @@ -12,9 +12,9 @@ import ( "github.com/SkycoinProject/dmsg/cipher" "github.com/spf13/cobra" - "github.com/SkycoinProject/skywire/cmd/skywire-cli/internal" - "github.com/SkycoinProject/skywire/pkg/transport" - "github.com/SkycoinProject/skywire/pkg/transport-discovery/client" + "github.com/SkycoinProject/skywire-mainnet/cmd/skywire-cli/internal" + "github.com/SkycoinProject/skywire-mainnet/pkg/transport" + "github.com/SkycoinProject/skywire-mainnet/pkg/transport-discovery/client" ) var ( diff --git a/cmd/skywire-cli/internal/internal.go b/cmd/skywire-cli/internal/internal.go index 8b25341d9..783c35bd4 100644 --- a/cmd/skywire-cli/internal/internal.go +++ b/cmd/skywire-cli/internal/internal.go @@ -5,7 +5,7 @@ import ( "github.com/google/uuid" "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" ) var log = logging.MustGetLogger("skywire-cli") diff --git a/cmd/skywire-cli/skywire-cli.go b/cmd/skywire-cli/skywire-cli.go index 5e3a89c34..66d50e0a3 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/cmd/skywire-cli/commands" + "github.com/SkycoinProject/skywire-mainnet/cmd/skywire-cli/commands" ) func main() { diff --git a/cmd/skywire-visor/commands/root.go b/cmd/skywire-visor/commands/root.go index 2501c2438..a4bda640d 100644 --- a/cmd/skywire-visor/commands/root.go +++ b/cmd/skywire-visor/commands/root.go @@ -19,11 +19,11 @@ import ( "github.com/pkg/profile" logrussyslog "github.com/sirupsen/logrus/hooks/syslog" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/spf13/cobra" - "github.com/SkycoinProject/skywire/pkg/util/pathutil" - "github.com/SkycoinProject/skywire/pkg/visor" + "github.com/SkycoinProject/skywire-mainnet/pkg/util/pathutil" + "github.com/SkycoinProject/skywire-mainnet/pkg/visor" ) const configEnv = "SW_CONFIG" diff --git a/cmd/skywire-visor/skywire-visor.go b/cmd/skywire-visor/skywire-visor.go index 5a49f330b..282da4c41 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/cmd/skywire-visor/commands" + "github.com/SkycoinProject/skywire-mainnet/cmd/skywire-visor/commands" ) func main() { diff --git a/cmd/therealssh-cli/commands/root.go b/cmd/therealssh-cli/commands/root.go index e64b533a6..d4c8b54f0 100644 --- a/cmd/therealssh-cli/commands/root.go +++ b/cmd/therealssh-cli/commands/root.go @@ -18,7 +18,7 @@ import ( "github.com/spf13/cobra" "golang.org/x/crypto/ssh/terminal" - ssh "github.com/SkycoinProject/skywire/pkg/therealssh" + ssh "github.com/SkycoinProject/skywire-mainnet/pkg/therealssh" ) var ( diff --git a/cmd/therealssh-cli/therealssh-cli.go b/cmd/therealssh-cli/therealssh-cli.go index c45136644..410fcf4ec 100644 --- a/cmd/therealssh-cli/therealssh-cli.go +++ b/cmd/therealssh-cli/therealssh-cli.go @@ -4,7 +4,7 @@ CLI for SSH app package main import ( - "github.com/SkycoinProject/skywire/cmd/therealssh-cli/commands" + "github.com/SkycoinProject/skywire-mainnet/cmd/therealssh-cli/commands" ) func main() { diff --git a/docs/Tests.Detection-of-unstable-tests.md b/docs/Tests.Detection-of-unstable-tests.md index 8f2581d0a..ba93b2e11 100644 --- a/docs/Tests.Detection-of-unstable-tests.md +++ b/docs/Tests.Detection-of-unstable-tests.md @@ -21,15 +21,15 @@ You will get output similar to: ```text TestClient -ok github.com/SkycoinProject/skywire/internal/httpauth 0.043s -? github.com/SkycoinProject/skywire/internal/httputil [no test files] +ok github.com/SkycoinProject/skywire-mainnet/internal/httpauth 0.043s +? github.com/SkycoinProject/skywire-mainnet/internal/httputil [no test files] TestAckReadWriter TestAckReadWriterCRCFailure TestAckReadWriterFlushOnClose TestAckReadWriterPartialRead TestAckReadWriterReadError TestLenReadWriter -ok github.com/SkycoinProject/skywire/internal/ioutil 0.049s +ok github.com/SkycoinProject/skywire-mainnet/internal/ioutil 0.049s ``` Filter lines with `[no test files]`. @@ -37,14 +37,14 @@ Filter lines with `[no test files]`. Transform this output to: ```bash -go clean -testcache &>/dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/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/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/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/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/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/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/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/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 ``` Notes: @@ -79,10 +79,10 @@ If you see something like: ```sh $ grep "FAIL" ./logs/pkg/*.log -# ./logs/pkg/TestClientConnectInitialServers.log:FAIL github.com/SkycoinProject/skywire/pkg/messaging 300.838s -# ./logs/pkg/TestClientConnectInitialServers.log:FAIL github.com/SkycoinProject/skywire/pkg/messaging 300.849s -# ./logs/pkg/TestClientConnectInitialServers.log:FAIL github.com/SkycoinProject/skywire/pkg/messaging 300.844s -# ./logs/pkg/TestClientConnectInitialServers.log:FAIL github.com/SkycoinProject/skywire/pkg/messaging 300.849s +# ./logs/pkg/TestClientConnectInitialServers.log:FAIL github.com/SkycoinProject/skywire-mainnet/pkg/messaging 300.838s +# ./logs/pkg/TestClientConnectInitialServers.log:FAIL github.com/SkycoinProject/skywire-mainnet/pkg/messaging 300.849s +# ./logs/pkg/TestClientConnectInitialServers.log:FAIL github.com/SkycoinProject/skywire-mainnet/pkg/messaging 300.844s +# ./logs/pkg/TestClientConnectInitialServers.log:FAIL github.com/SkycoinProject/skywire-mainnet/pkg/messaging 300.849s ``` (note 300s for FAILs) @@ -91,12 +91,12 @@ And: ```sh $ grep "coverage" ./logs/pkg/TestClientConnectInitialServers.log -# ok github.com/SkycoinProject/skywire/pkg/messaging 3.049s coverage: 39.5% of statements +# ok github.com/SkycoinProject/skywire-mainnet/pkg/messaging 3.049s coverage: 39.5% of statements # coverage: 38.0% of statements -# ok github.com/SkycoinProject/skywire/pkg/messaging 3.072s coverage: 39.5% of statements -# ok github.com/SkycoinProject/skywire/pkg/messaging 3.073s coverage: 39.5% of statements -# ok github.com/SkycoinProject/skywire/pkg/messaging 3.071s coverage: 39.5% of statements -# ok github.com/SkycoinProject/skywire/pkg/messaging 3.050s coverage: 39.5% of statements +# ok github.com/SkycoinProject/skywire-mainnet/pkg/messaging 3.072s coverage: 39.5% of statements +# ok github.com/SkycoinProject/skywire-mainnet/pkg/messaging 3.073s coverage: 39.5% of statements +# ok github.com/SkycoinProject/skywire-mainnet/pkg/messaging 3.071s coverage: 39.5% of statements +# ok github.com/SkycoinProject/skywire-mainnet/pkg/messaging 3.050s coverage: 39.5% of statements # coverage: 38.0% of statements ``` @@ -129,11 +129,11 @@ Temporary solution: test was moved to `./pkg/messaging/client_test.go` and tagge ```sh $ grep coverage ./logs/internal/*.log # ./logs/internal/TestReadWriterConcurrentTCP.log -# 1:ok github.com/SkycoinProject/skywire/internal/noise 1.545s coverage: 0.0% of statements -# 2:ok github.com/SkycoinProject/skywire/internal/noise 1.427s coverage: 0.0% of statements -# 3:ok github.com/SkycoinProject/skywire/internal/noise 1.429s coverage: 0.0% of statements -# 4:ok github.com/SkycoinProject/skywire/internal/noise 1.429s coverage: 0.0% of statements -# 5:ok github.com/SkycoinProject/skywire/internal/noise 1.436s coverage: 0.0% of statements +# 1:ok github.com/SkycoinProject/skywire-mainnet/internal/noise 1.545s coverage: 0.0% of statements +# 2:ok github.com/SkycoinProject/skywire-mainnet/internal/noise 1.427s coverage: 0.0% of statements +# 3:ok github.com/SkycoinProject/skywire-mainnet/internal/noise 1.429s coverage: 0.0% of statements +# 4:ok github.com/SkycoinProject/skywire-mainnet/internal/noise 1.429s coverage: 0.0% of statements +# 5:ok github.com/SkycoinProject/skywire-mainnet/internal/noise 1.436s coverage: 0.0% of statements ``` Note 0.0% coverage diff --git a/go.mod b/go.mod index b42a521b1..ad35fc248 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,10 @@ -module github.com/SkycoinProject/skywire +module github.com/SkycoinProject/skywire-mainnet go 1.12 require ( + github.com/SkycoinProject/dmsg v0.0.0-20190917230949-27f4fd2f25fb + github.com/SkycoinProject/skycoin v0.26.0 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 github.com/creack/pty v1.1.7 github.com/go-chi/chi v4.0.2+incompatible @@ -16,8 +18,6 @@ require ( github.com/prometheus/client_golang v1.0.0 github.com/prometheus/common v0.4.1 github.com/sirupsen/logrus v1.4.2 - github.com/SkycoinProject/dmsg v0.0.0-20190805065636-70f4c32a994f - github.com/SkycoinProject/SkycoinProject v0.26.0 github.com/spf13/cobra v0.0.5 github.com/stretchr/testify v1.3.0 go.etcd.io/bbolt v1.3.3 diff --git a/go.sum b/go.sum index 59277a77a..0c1b09f1d 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,12 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/SkycoinProject/SkycoinProject v0.26.0 h1:xDxe2r8AclMntZ550Y/vUQgwgLtwrf9Wu5UYiYcN5/o= +github.com/SkycoinProject/SkycoinProject v0.26.0/go.mod h1:78nHjQzd8KG0jJJVL/j0xMmrihXi70ti63fh8vXScJw= +github.com/SkycoinProject/dmsg v0.0.0-20190805065636-70f4c32a994f h1:WWjaxOXoj6oYelm67MNtJbg51HQALjKAyhs2WAHgpZs= +github.com/SkycoinProject/dmsg v0.0.0-20190805065636-70f4c32a994f/go.mod h1:obZYZp8eKR7Xqz+KNhJdUE6Gvp6rEXbDO8YTlW2YXgU= +github.com/SkycoinProject/dmsg v0.0.0-20190917230949-27f4fd2f25fb h1:bAKk+ypvaiD5YuIkOmWhh2FJVX2XQpJPR4TgQKsYD8Y= +github.com/SkycoinProject/dmsg v0.0.0-20190917230949-27f4fd2f25fb/go.mod h1:FwzixIUE0zAT9J1cfWU5WsN9JiI49oQ6dHlNZcpq23s= +github.com/SkycoinProject/skycoin v0.26.0 h1:8/ZRZb2VM2DM4YTIitRJMZ3Yo/3H1FFmbCMx5o6ekmA= +github.com/SkycoinProject/skycoin v0.26.0/go.mod h1:xqPLOKh5B6GBZlGA7B5IJfQmCy7mwimD9NlqxR3gMXo= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZqLG4oE62mJzwPIB8+Tee4RNCL9ulrY= @@ -43,6 +51,7 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -88,10 +97,8 @@ github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/SkycoinProject/dmsg v0.0.0-20190805065636-70f4c32a994f h1:WWjaxOXoj6oYelm67MNtJbg51HQALjKAyhs2WAHgpZs= -github.com/SkycoinProject/dmsg v0.0.0-20190805065636-70f4c32a994f/go.mod h1:obZYZp8eKR7Xqz+KNhJdUE6Gvp6rEXbDO8YTlW2YXgU= -github.com/SkycoinProject/SkycoinProject v0.26.0 h1:xDxe2r8AclMntZ550Y/vUQgwgLtwrf9Wu5UYiYcN5/o= -github.com/SkycoinProject/SkycoinProject v0.26.0/go.mod h1:78nHjQzd8KG0jJJVL/j0xMmrihXi70ti63fh8vXScJw= +github.com/skycoin/skycoin v0.26.0 h1:xDxe2r8AclMntZ550Y/vUQgwgLtwrf9Wu5UYiYcN5/o= +github.com/skycoin/skycoin v0.26.0/go.mod h1:78nHjQzd8KG0jJJVL/j0xMmrihXi70ti63fh8vXScJw= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= diff --git a/internal/httpauth/client.go b/internal/httpauth/client.go index 00e30b14b..88739a1d3 100644 --- a/internal/httpauth/client.go +++ b/internal/httpauth/client.go @@ -15,7 +15,7 @@ import ( "sync/atomic" "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" ) const ( diff --git a/internal/httpauth/client_test.go b/internal/httpauth/client_test.go index eb6fabec7..2b0ed48df 100644 --- a/internal/httpauth/client_test.go +++ b/internal/httpauth/client_test.go @@ -13,7 +13,7 @@ import ( "testing" "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/therealproxy/client.go b/internal/therealproxy/client.go index 5740e111f..4756eff2a 100644 --- a/internal/therealproxy/client.go +++ b/internal/therealproxy/client.go @@ -6,7 +6,7 @@ import ( "net" "github.com/hashicorp/yamux" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" ) var log = logging.MustGetLogger("therealproxy") diff --git a/internal/therealproxy/server_test.go b/internal/therealproxy/server_test.go index 4262b6607..00e564af7 100644 --- a/internal/therealproxy/server_test.go +++ b/internal/therealproxy/server_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/net/nettest" diff --git a/pkg/app/app.go b/pkg/app/app.go index 0eae87118..c874e4aba 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -14,9 +14,9 @@ import ( "path/filepath" "sync" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) const ( diff --git a/pkg/app/app_test.go b/pkg/app/app_test.go index 74a8c513a..034dfbe0a 100644 --- a/pkg/app/app_test.go +++ b/pkg/app/app_test.go @@ -10,12 +10,12 @@ import ( "time" "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire/internal/testhelpers" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/internal/testhelpers" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) func TestMain(m *testing.M) { diff --git a/pkg/app/packet.go b/pkg/app/packet.go index c8ee58f4e..539d26438 100644 --- a/pkg/app/packet.go +++ b/pkg/app/packet.go @@ -1,6 +1,6 @@ package app -import "github.com/SkycoinProject/skywire/pkg/routing" +import "github.com/SkycoinProject/skywire-mainnet/pkg/routing" // Packet represents message exchanged between App and Node. type Packet struct { diff --git a/pkg/app/packet_test.go b/pkg/app/packet_test.go index 11ac0f0d0..b9d5d8f4e 100644 --- a/pkg/app/packet_test.go +++ b/pkg/app/packet_test.go @@ -5,7 +5,7 @@ import ( "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) func ExamplePacket() { diff --git a/pkg/httputil/httputil.go b/pkg/httputil/httputil.go index 3c57e4190..8dcb7fcd7 100644 --- a/pkg/httputil/httputil.go +++ b/pkg/httputil/httputil.go @@ -8,7 +8,7 @@ import ( "net/http" "github.com/gorilla/handlers" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" ) var log = logging.MustGetLogger("httputil") diff --git a/pkg/hypervisor/config.go b/pkg/hypervisor/config.go index 3e9c601a8..b49dad3b5 100644 --- a/pkg/hypervisor/config.go +++ b/pkg/hypervisor/config.go @@ -10,7 +10,7 @@ import ( "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/skywire/pkg/util/pathutil" + "github.com/SkycoinProject/skywire-mainnet/pkg/util/pathutil" ) // Key allows a byte slice to be marshaled or unmarshaled from a hex string. diff --git a/pkg/hypervisor/hypervisor.go b/pkg/hypervisor/hypervisor.go index b7f69327d..f0bdf762a 100644 --- a/pkg/hypervisor/hypervisor.go +++ b/pkg/hypervisor/hypervisor.go @@ -18,11 +18,11 @@ import ( "github.com/google/uuid" "github.com/SkycoinProject/dmsg/cipher" "github.com/SkycoinProject/dmsg/noise" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire/pkg/httputil" - "github.com/SkycoinProject/skywire/pkg/routing" - "github.com/SkycoinProject/skywire/pkg/visor" + "github.com/SkycoinProject/skywire-mainnet/pkg/httputil" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/visor" ) var ( diff --git a/pkg/hypervisor/hypervisor_test.go b/pkg/hypervisor/hypervisor_test.go index aabad6fcc..a5f181e53 100644 --- a/pkg/hypervisor/hypervisor_test.go +++ b/pkg/hypervisor/hypervisor_test.go @@ -13,7 +13,7 @@ import ( "strings" "testing" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/hypervisor/user_manager.go b/pkg/hypervisor/user_manager.go index 09ee85c12..733657c94 100644 --- a/pkg/hypervisor/user_manager.go +++ b/pkg/hypervisor/user_manager.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/gorilla/securecookie" - "github.com/SkycoinProject/skywire/pkg/httputil" + "github.com/SkycoinProject/skywire-mainnet/pkg/httputil" ) const ( diff --git a/pkg/route-finder/client/client.go b/pkg/route-finder/client/client.go index 7aa8e7715..a096a953a 100644 --- a/pkg/route-finder/client/client.go +++ b/pkg/route-finder/client/client.go @@ -12,9 +12,9 @@ import ( "time" "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) const defaultContextTimeout = 10 * time.Second diff --git a/pkg/route-finder/client/mock.go b/pkg/route-finder/client/mock.go index f13e15222..0ebdba97e 100644 --- a/pkg/route-finder/client/mock.go +++ b/pkg/route-finder/client/mock.go @@ -3,8 +3,8 @@ package client import ( "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/skywire/pkg/routing" - "github.com/SkycoinProject/skywire/pkg/transport" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/transport" ) // MockClient implements mock route finder client. diff --git a/pkg/router/app_manager.go b/pkg/router/app_manager.go index 4b9d07593..50d9413d7 100644 --- a/pkg/router/app_manager.go +++ b/pkg/router/app_manager.go @@ -6,10 +6,10 @@ import ( "errors" "time" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire/pkg/app" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/app" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) const supportedProtocolVersion = "0.0.1" diff --git a/pkg/router/app_manager_test.go b/pkg/router/app_manager_test.go index cd16f6e18..87d6cf694 100644 --- a/pkg/router/app_manager_test.go +++ b/pkg/router/app_manager_test.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire/internal/testhelpers" - "github.com/SkycoinProject/skywire/pkg/app" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/internal/testhelpers" + "github.com/SkycoinProject/skywire-mainnet/pkg/app" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) func TestAppManagerInit(t *testing.T) { diff --git a/pkg/router/loop_list.go b/pkg/router/loop_list.go index 5e0f15dba..a435399ea 100644 --- a/pkg/router/loop_list.go +++ b/pkg/router/loop_list.go @@ -5,7 +5,7 @@ import ( "github.com/google/uuid" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) type loop struct { diff --git a/pkg/router/managed_routing_table.go b/pkg/router/managed_routing_table.go index 570c078fa..7003cb6cf 100644 --- a/pkg/router/managed_routing_table.go +++ b/pkg/router/managed_routing_table.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) var routeKeepalive = 10 * time.Minute // interval to keep active expired routes diff --git a/pkg/router/managed_routing_table_test.go b/pkg/router/managed_routing_table_test.go index 7ff02f706..4629a7c1d 100644 --- a/pkg/router/managed_routing_table_test.go +++ b/pkg/router/managed_routing_table_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) func TestManagedRoutingTableCleanup(t *testing.T) { diff --git a/pkg/router/port_list.go b/pkg/router/port_list.go index 3bdd76816..98447ccda 100644 --- a/pkg/router/port_list.go +++ b/pkg/router/port_list.go @@ -4,8 +4,8 @@ import ( "math" "sync" - "github.com/SkycoinProject/skywire/pkg/app" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/app" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) type portBind struct { diff --git a/pkg/router/port_manager.go b/pkg/router/port_manager.go index fe4ae4648..c2c2a84b0 100644 --- a/pkg/router/port_manager.go +++ b/pkg/router/port_manager.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/SkycoinProject/skywire/pkg/app" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/app" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) type portManager struct { diff --git a/pkg/router/port_manager_test.go b/pkg/router/port_manager_test.go index 6213a36cc..bd9eb184c 100644 --- a/pkg/router/port_manager_test.go +++ b/pkg/router/port_manager_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire/pkg/app" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/app" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) func TestPortManager(t *testing.T) { diff --git a/pkg/router/route_manager.go b/pkg/router/route_manager.go index 1d49b4085..41282f49e 100644 --- a/pkg/router/route_manager.go +++ b/pkg/router/route_manager.go @@ -7,10 +7,10 @@ import ( "io" "time" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire/pkg/routing" - "github.com/SkycoinProject/skywire/pkg/setup" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/setup" ) type setupCallbacks struct { diff --git a/pkg/router/route_manager_test.go b/pkg/router/route_manager_test.go index d8b8f09d5..ad79cbeb7 100644 --- a/pkg/router/route_manager_test.go +++ b/pkg/router/route_manager_test.go @@ -8,12 +8,12 @@ import ( "github.com/google/uuid" "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire/pkg/routing" - "github.com/SkycoinProject/skywire/pkg/setup" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/setup" ) func TestRouteManagerGetRule(t *testing.T) { diff --git a/pkg/router/router.go b/pkg/router/router.go index 1af27631f..f6d1aa377 100644 --- a/pkg/router/router.go +++ b/pkg/router/router.go @@ -12,13 +12,13 @@ import ( "github.com/SkycoinProject/dmsg" "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire/pkg/app" - routeFinder "github.com/SkycoinProject/skywire/pkg/route-finder/client" - "github.com/SkycoinProject/skywire/pkg/routing" - "github.com/SkycoinProject/skywire/pkg/setup" - "github.com/SkycoinProject/skywire/pkg/transport" + "github.com/SkycoinProject/skywire-mainnet/pkg/app" + routeFinder "github.com/SkycoinProject/skywire-mainnet/pkg/route-finder/client" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/setup" + "github.com/SkycoinProject/skywire-mainnet/pkg/transport" ) const ( diff --git a/pkg/router/router_test.go b/pkg/router/router_test.go index b54c0aac6..9fb9b2872 100644 --- a/pkg/router/router_test.go +++ b/pkg/router/router_test.go @@ -12,16 +12,16 @@ import ( "github.com/sirupsen/logrus" "github.com/SkycoinProject/dmsg" "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire/internal/testhelpers" - "github.com/SkycoinProject/skywire/pkg/app" - routeFinder "github.com/SkycoinProject/skywire/pkg/route-finder/client" - "github.com/SkycoinProject/skywire/pkg/routing" - "github.com/SkycoinProject/skywire/pkg/setup" - "github.com/SkycoinProject/skywire/pkg/transport" + "github.com/SkycoinProject/skywire-mainnet/internal/testhelpers" + "github.com/SkycoinProject/skywire-mainnet/pkg/app" + routeFinder "github.com/SkycoinProject/skywire-mainnet/pkg/route-finder/client" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/setup" + "github.com/SkycoinProject/skywire-mainnet/pkg/transport" ) func TestMain(m *testing.M) { diff --git a/pkg/routing/boltdb_routing_table.go b/pkg/routing/boltdb_routing_table.go index 1ecd3879b..b2ecca811 100644 --- a/pkg/routing/boltdb_routing_table.go +++ b/pkg/routing/boltdb_routing_table.go @@ -6,7 +6,7 @@ import ( "fmt" "math" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" "go.etcd.io/bbolt" ) diff --git a/pkg/routing/routing_table_test.go b/pkg/routing/routing_table_test.go index eeeaf46d5..5b17ded4e 100644 --- a/pkg/routing/routing_table_test.go +++ b/pkg/routing/routing_table_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/google/uuid" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/setup/node.go b/pkg/setup/node.go index 29943651c..0dd22ea8e 100644 --- a/pkg/setup/node.go +++ b/pkg/setup/node.go @@ -9,12 +9,12 @@ import ( "github.com/SkycoinProject/dmsg/cipher" "github.com/SkycoinProject/dmsg/disc" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire/pkg/metrics" - "github.com/SkycoinProject/skywire/pkg/routing" - "github.com/SkycoinProject/skywire/pkg/transport" - "github.com/SkycoinProject/skywire/pkg/transport/dmsg" + "github.com/SkycoinProject/skywire-mainnet/pkg/metrics" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/transport" + "github.com/SkycoinProject/skywire-mainnet/pkg/transport/dmsg" ) // Hop is a wrapper around transport hop to add functionality diff --git a/pkg/setup/node_test.go b/pkg/setup/node_test.go index e6178c106..cc762b8ca 100644 --- a/pkg/setup/node_test.go +++ b/pkg/setup/node_test.go @@ -16,11 +16,11 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/net/nettest" - "github.com/SkycoinProject/skywire/pkg/metrics" - "github.com/SkycoinProject/skywire/pkg/routing" - "github.com/SkycoinProject/skywire/pkg/transport/dmsg" + "github.com/SkycoinProject/skywire-mainnet/pkg/metrics" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/transport/dmsg" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" ) func TestMain(m *testing.M) { diff --git a/pkg/setup/protocol.go b/pkg/setup/protocol.go index 05ca56c9c..466bd87e9 100644 --- a/pkg/setup/protocol.go +++ b/pkg/setup/protocol.go @@ -9,7 +9,7 @@ import ( "fmt" "io" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) // PacketType defines type of a setup packet diff --git a/pkg/therealssh/channel.go b/pkg/therealssh/channel.go index a9356edfd..a5ef85ae3 100644 --- a/pkg/therealssh/channel.go +++ b/pkg/therealssh/channel.go @@ -15,7 +15,7 @@ import ( "github.com/creack/pty" "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) // Port reserved for SSH app diff --git a/pkg/therealssh/channel_pty_test.go b/pkg/therealssh/channel_pty_test.go index 8af93976c..a5721f810 100644 --- a/pkg/therealssh/channel_pty_test.go +++ b/pkg/therealssh/channel_pty_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) func TestChannelServe(t *testing.T) { diff --git a/pkg/therealssh/channel_test.go b/pkg/therealssh/channel_test.go index 33058d735..9fffed7eb 100644 --- a/pkg/therealssh/channel_test.go +++ b/pkg/therealssh/channel_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire/internal/testhelpers" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/internal/testhelpers" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) func TestChannelSendWrite(t *testing.T) { diff --git a/pkg/therealssh/client.go b/pkg/therealssh/client.go index 456e0a5cc..4b1428b40 100644 --- a/pkg/therealssh/client.go +++ b/pkg/therealssh/client.go @@ -13,8 +13,8 @@ import ( "github.com/creack/pty" "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/skywire/internal/netutil" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/internal/netutil" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) var r = netutil.NewRetrier(50*time.Millisecond, 5, 2) diff --git a/pkg/therealssh/client_test.go b/pkg/therealssh/client_test.go index a981188ea..c0a437c8d 100644 --- a/pkg/therealssh/client_test.go +++ b/pkg/therealssh/client_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) func TestClientOpenChannel(t *testing.T) { diff --git a/pkg/therealssh/dialer.go b/pkg/therealssh/dialer.go index 46706f4cc..d49c78889 100644 --- a/pkg/therealssh/dialer.go +++ b/pkg/therealssh/dialer.go @@ -3,7 +3,7 @@ package therealssh import ( "net" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) // dialer dials to a remote node. diff --git a/pkg/therealssh/pty_test.go b/pkg/therealssh/pty_test.go index c6560bb8e..9de66e91e 100644 --- a/pkg/therealssh/pty_test.go +++ b/pkg/therealssh/pty_test.go @@ -13,7 +13,7 @@ import ( "github.com/SkycoinProject/dmsg/cipher" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) func TestRunRPC(t *testing.T) { diff --git a/pkg/therealssh/server.go b/pkg/therealssh/server.go index 7baed9a3b..e9fbf09d6 100644 --- a/pkg/therealssh/server.go +++ b/pkg/therealssh/server.go @@ -8,9 +8,9 @@ import ( "net" "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) // CommandType represents global protocol messages. diff --git a/pkg/therealssh/server_test.go b/pkg/therealssh/server_test.go index e6dca0225..4c22d53dc 100644 --- a/pkg/therealssh/server_test.go +++ b/pkg/therealssh/server_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) func TestMain(m *testing.M) { diff --git a/pkg/therealssh/session.go b/pkg/therealssh/session.go index 0abb2ecc3..1e230699c 100644 --- a/pkg/therealssh/session.go +++ b/pkg/therealssh/session.go @@ -11,7 +11,7 @@ import ( "syscall" "github.com/creack/pty" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" ) var log = logging.MustGetLogger("therealssh") diff --git a/pkg/transport-discovery/client/client.go b/pkg/transport-discovery/client/client.go index 532746861..a2e315278 100644 --- a/pkg/transport-discovery/client/client.go +++ b/pkg/transport-discovery/client/client.go @@ -13,10 +13,10 @@ import ( "github.com/google/uuid" "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire/internal/httpauth" - "github.com/SkycoinProject/skywire/pkg/transport" + "github.com/SkycoinProject/skywire-mainnet/internal/httpauth" + "github.com/SkycoinProject/skywire-mainnet/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 f5855a8cb..cb2f66da3 100644 --- a/pkg/transport-discovery/client/client_test.go +++ b/pkg/transport-discovery/client/client_test.go @@ -12,12 +12,12 @@ import ( "testing" "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire/internal/httpauth" - "github.com/SkycoinProject/skywire/pkg/transport" + "github.com/SkycoinProject/skywire-mainnet/internal/httpauth" + "github.com/SkycoinProject/skywire-mainnet/pkg/transport" ) func TestMain(m *testing.M) { diff --git a/pkg/transport/discovery_test.go b/pkg/transport/discovery_test.go index cd016ee05..0d9a810b6 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/pkg/transport" + "github.com/SkycoinProject/skywire-mainnet/pkg/transport" ) func TestNewDiscoveryMock(t *testing.T) { diff --git a/pkg/transport/dmsg/dmsg.go b/pkg/transport/dmsg/dmsg.go index 1701e5823..43b5dc1ec 100644 --- a/pkg/transport/dmsg/dmsg.go +++ b/pkg/transport/dmsg/dmsg.go @@ -8,9 +8,9 @@ import ( "github.com/SkycoinProject/dmsg" "github.com/SkycoinProject/dmsg/cipher" "github.com/SkycoinProject/dmsg/disc" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire/pkg/transport" + "github.com/SkycoinProject/skywire-mainnet/pkg/transport" ) const ( diff --git a/pkg/transport/dmsg/testing.go b/pkg/transport/dmsg/testing.go index 04629c7fc..f2916c220 100644 --- a/pkg/transport/dmsg/testing.go +++ b/pkg/transport/dmsg/testing.go @@ -8,7 +8,7 @@ import ( "github.com/SkycoinProject/dmsg" "github.com/SkycoinProject/dmsg/cipher" "github.com/SkycoinProject/dmsg/disc" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/stretchr/testify/require" "golang.org/x/net/nettest" ) diff --git a/pkg/transport/entry_test.go b/pkg/transport/entry_test.go index 70fb72918..06e5fb39e 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/pkg/transport" + "github.com/SkycoinProject/skywire-mainnet/pkg/transport" ) func TestNewEntry(t *testing.T) { diff --git a/pkg/transport/log_test.go b/pkg/transport/log_test.go index 3bc17ef66..45e166b8f 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/pkg/transport" + "github.com/SkycoinProject/skywire-mainnet/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 826810e6d..dee7c73e3 100644 --- a/pkg/transport/managed_transport.go +++ b/pkg/transport/managed_transport.go @@ -9,11 +9,11 @@ import ( "sync/atomic" "time" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" "github.com/SkycoinProject/dmsg" "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" ) const logWriteInterval = time.Second * 3 diff --git a/pkg/transport/manager.go b/pkg/transport/manager.go index bf984856c..2b21dfb2a 100644 --- a/pkg/transport/manager.go +++ b/pkg/transport/manager.go @@ -7,11 +7,11 @@ import ( "strings" "sync" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" "github.com/google/uuid" "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" ) // ManagerConfig configures a Manager. diff --git a/pkg/transport/manager_test.go b/pkg/transport/manager_test.go index 3702dc53e..78e51656a 100644 --- a/pkg/transport/manager_test.go +++ b/pkg/transport/manager_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire/pkg/routing" - "github.com/SkycoinProject/skywire/pkg/transport" - "github.com/SkycoinProject/skywire/pkg/transport/dmsg" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/transport" + "github.com/SkycoinProject/skywire-mainnet/pkg/transport/dmsg" "github.com/google/uuid" "github.com/SkycoinProject/dmsg/cipher" diff --git a/pkg/transport/tcp_transport_test.go b/pkg/transport/tcp_transport_test.go index 33cdd3311..7a627c4b8 100644 --- a/pkg/transport/tcp_transport_test.go +++ b/pkg/transport/tcp_transport_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire/pkg/transport" + "github.com/SkycoinProject/skywire-mainnet/pkg/transport" ) func TestTCPFactory(t *testing.T) { diff --git a/pkg/transport/transport.go b/pkg/transport/transport.go index d12d64ca4..e48d30069 100644 --- a/pkg/transport/transport.go +++ b/pkg/transport/transport.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" ) var log = logging.MustGetLogger("transport") diff --git a/pkg/util/pathutil/configpath.go b/pkg/util/pathutil/configpath.go index 5142e9290..823e675df 100644 --- a/pkg/util/pathutil/configpath.go +++ b/pkg/util/pathutil/configpath.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" ) var log = logging.MustGetLogger("pathutil") @@ -78,7 +78,7 @@ func NodeDefaults() ConfigPaths { paths[WorkingDirLoc] = filepath.Join(wd, "skywire-config.json") } paths[HomeLoc] = filepath.Join(HomeDir(), ".skycoin/skywire/skywire-config.json") - paths[LocalLoc] = "/usr/local/SkycoinProject/skywire/skywire-config.json" + paths[LocalLoc] = "/usr/local/SkycoinProject/skywire-mainnet/skywire-config.json" return paths } diff --git a/pkg/visor/config.go b/pkg/visor/config.go index cbecbadca..a5a138b29 100644 --- a/pkg/visor/config.go +++ b/pkg/visor/config.go @@ -11,10 +11,10 @@ import ( "github.com/SkycoinProject/dmsg/cipher" "github.com/SkycoinProject/dmsg/disc" - "github.com/SkycoinProject/skywire/pkg/routing" - "github.com/SkycoinProject/skywire/pkg/transport" - trClient "github.com/SkycoinProject/skywire/pkg/transport-discovery/client" - "github.com/SkycoinProject/skywire/pkg/transport/dmsg" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/transport" + trClient "github.com/SkycoinProject/skywire-mainnet/pkg/transport-discovery/client" + "github.com/SkycoinProject/skywire-mainnet/pkg/transport/dmsg" ) // Config defines configuration parameters for Node. diff --git a/pkg/visor/config_test.go b/pkg/visor/config_test.go index d85b4c8c5..1c6345f44 100644 --- a/pkg/visor/config_test.go +++ b/pkg/visor/config_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire/internal/httpauth" - "github.com/SkycoinProject/skywire/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/internal/httpauth" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" ) func TestMessagingDiscovery(t *testing.T) { diff --git a/pkg/visor/rpc.go b/pkg/visor/rpc.go index c734605a9..87aae80e7 100644 --- a/pkg/visor/rpc.go +++ b/pkg/visor/rpc.go @@ -8,8 +8,8 @@ import ( "github.com/google/uuid" "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/skywire/pkg/routing" - "github.com/SkycoinProject/skywire/pkg/transport" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/transport" ) const ( diff --git a/pkg/visor/rpc_client.go b/pkg/visor/rpc_client.go index 66be44ea4..94b710ac4 100644 --- a/pkg/visor/rpc_client.go +++ b/pkg/visor/rpc_client.go @@ -10,10 +10,10 @@ import ( "github.com/google/uuid" "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire/pkg/routing" - "github.com/SkycoinProject/skywire/pkg/transport" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/transport" ) // RPCClient represents a RPC Client implementation. diff --git a/pkg/visor/rpc_test.go b/pkg/visor/rpc_test.go index ff20ccdfe..d9539e04f 100644 --- a/pkg/visor/rpc_test.go +++ b/pkg/visor/rpc_test.go @@ -10,13 +10,13 @@ import ( "time" "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire/pkg/routing" - "github.com/SkycoinProject/skywire/pkg/transport" - "github.com/SkycoinProject/skywire/pkg/util/pathutil" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/transport" + "github.com/SkycoinProject/skywire-mainnet/pkg/util/pathutil" ) func TestListApps(t *testing.T) { diff --git a/pkg/visor/visor.go b/pkg/visor/visor.go index e21a37ee3..be9631c18 100644 --- a/pkg/visor/visor.go +++ b/pkg/visor/visor.go @@ -20,15 +20,15 @@ import ( "time" "github.com/SkycoinProject/dmsg/noise" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" - - "github.com/SkycoinProject/skywire/pkg/app" - routeFinder "github.com/SkycoinProject/skywire/pkg/route-finder/client" - "github.com/SkycoinProject/skywire/pkg/router" - "github.com/SkycoinProject/skywire/pkg/routing" - "github.com/SkycoinProject/skywire/pkg/transport" - "github.com/SkycoinProject/skywire/pkg/transport/dmsg" - "github.com/SkycoinProject/skywire/pkg/util/pathutil" + "github.com/SkycoinProject/skycoin/src/util/logging" + + "github.com/SkycoinProject/skywire-mainnet/pkg/app" + routeFinder "github.com/SkycoinProject/skywire-mainnet/pkg/route-finder/client" + "github.com/SkycoinProject/skywire-mainnet/pkg/router" + "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/transport" + "github.com/SkycoinProject/skywire-mainnet/pkg/transport/dmsg" + "github.com/SkycoinProject/skywire-mainnet/pkg/util/pathutil" ) var log = logging.MustGetLogger("node") diff --git a/pkg/visor/visor_test.go b/pkg/visor/visor_test.go index b3c407db0..4c8506b41 100644 --- a/pkg/visor/visor_test.go +++ b/pkg/visor/visor_test.go @@ -16,16 +16,16 @@ import ( "github.com/SkycoinProject/dmsg/cipher" "github.com/SkycoinProject/dmsg/disc" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire/internal/httpauth" - "github.com/SkycoinProject/skywire/pkg/app" - "github.com/SkycoinProject/skywire/pkg/routing" - "github.com/SkycoinProject/skywire/pkg/transport" - "github.com/SkycoinProject/skywire/pkg/transport/dmsg" - "github.com/SkycoinProject/skywire/pkg/util/pathutil" + "github.com/SkycoinProject/skywire-mainnet/internal/httpauth" + "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/transport/dmsg" + "github.com/SkycoinProject/skywire-mainnet/pkg/util/pathutil" ) var masterLogger *logging.MasterLogger diff --git a/vendor/github.com/skycoin/dmsg/.gitignore b/vendor/github.com/SkycoinProject/dmsg/.gitignore similarity index 100% rename from vendor/github.com/skycoin/dmsg/.gitignore rename to vendor/github.com/SkycoinProject/dmsg/.gitignore diff --git a/vendor/github.com/skycoin/dmsg/.golangci.yml b/vendor/github.com/SkycoinProject/dmsg/.golangci.yml similarity index 100% rename from vendor/github.com/skycoin/dmsg/.golangci.yml rename to vendor/github.com/SkycoinProject/dmsg/.golangci.yml diff --git a/vendor/github.com/skycoin/dmsg/.travis.yml b/vendor/github.com/SkycoinProject/dmsg/.travis.yml similarity index 100% rename from vendor/github.com/skycoin/dmsg/.travis.yml rename to vendor/github.com/SkycoinProject/dmsg/.travis.yml diff --git a/vendor/github.com/skycoin/dmsg/Makefile b/vendor/github.com/SkycoinProject/dmsg/Makefile similarity index 95% rename from vendor/github.com/skycoin/dmsg/Makefile rename to vendor/github.com/SkycoinProject/dmsg/Makefile index f7ee1e651..c9c376c6c 100644 --- a/vendor/github.com/skycoin/dmsg/Makefile +++ b/vendor/github.com/SkycoinProject/dmsg/Makefile @@ -27,7 +27,7 @@ install-linters: ## Install linters ${OPTS} go get -u golang.org/x/tools/cmd/goimports format: ## Formats the code. Must have goimports installed (use make install-linters). - ${OPTS} goimports -w -local github.com/skycoin/dmsg . + ${OPTS} goimports -w -local github.com/SkycoinProject/dmsg . dep: ## Sorts dependencies ${OPTS} go mod download diff --git a/vendor/github.com/skycoin/dmsg/README.md b/vendor/github.com/SkycoinProject/dmsg/README.md similarity index 100% rename from vendor/github.com/skycoin/dmsg/README.md rename to vendor/github.com/SkycoinProject/dmsg/README.md diff --git a/vendor/github.com/skycoin/dmsg/TESTING.md b/vendor/github.com/SkycoinProject/dmsg/TESTING.md similarity index 100% rename from vendor/github.com/skycoin/dmsg/TESTING.md rename to vendor/github.com/SkycoinProject/dmsg/TESTING.md diff --git a/vendor/github.com/skycoin/dmsg/cipher/cipher.go b/vendor/github.com/SkycoinProject/dmsg/cipher/cipher.go similarity index 98% rename from vendor/github.com/skycoin/dmsg/cipher/cipher.go rename to vendor/github.com/SkycoinProject/dmsg/cipher/cipher.go index 9c22b344b..c62f6d1a7 100644 --- a/vendor/github.com/skycoin/dmsg/cipher/cipher.go +++ b/vendor/github.com/SkycoinProject/dmsg/cipher/cipher.go @@ -1,5 +1,5 @@ // Package cipher implements common golang encoding interfaces for -// github.com/SkycoinProject/SkycoinProject/src/cipher +// github.com/SkycoinProject/skycoin/src/cipher package cipher import ( @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/SkycoinProject/SkycoinProject/src/cipher" + "github.com/SkycoinProject/skycoin/src/cipher" ) func init() { diff --git a/vendor/github.com/skycoin/dmsg/client.go b/vendor/github.com/SkycoinProject/dmsg/client.go similarity index 99% rename from vendor/github.com/skycoin/dmsg/client.go rename to vendor/github.com/SkycoinProject/dmsg/client.go index 13282e14f..2fdc6136f 100644 --- a/vendor/github.com/skycoin/dmsg/client.go +++ b/vendor/github.com/SkycoinProject/dmsg/client.go @@ -9,7 +9,7 @@ import ( "time" "github.com/sirupsen/logrus" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/SkycoinProject/dmsg/cipher" "github.com/SkycoinProject/dmsg/disc" diff --git a/vendor/github.com/skycoin/dmsg/disc/client.go b/vendor/github.com/SkycoinProject/dmsg/disc/client.go similarity index 98% rename from vendor/github.com/skycoin/dmsg/disc/client.go rename to vendor/github.com/SkycoinProject/dmsg/disc/client.go index 624426147..a7238320f 100644 --- a/vendor/github.com/skycoin/dmsg/disc/client.go +++ b/vendor/github.com/SkycoinProject/dmsg/disc/client.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/SkycoinProject/dmsg/cipher" ) diff --git a/vendor/github.com/skycoin/dmsg/disc/entry.go b/vendor/github.com/SkycoinProject/dmsg/disc/entry.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/disc/entry.go rename to vendor/github.com/SkycoinProject/dmsg/disc/entry.go diff --git a/vendor/github.com/skycoin/dmsg/disc/http_message.go b/vendor/github.com/SkycoinProject/dmsg/disc/http_message.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/disc/http_message.go rename to vendor/github.com/SkycoinProject/dmsg/disc/http_message.go diff --git a/vendor/github.com/skycoin/dmsg/disc/testing.go b/vendor/github.com/SkycoinProject/dmsg/disc/testing.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/disc/testing.go rename to vendor/github.com/SkycoinProject/dmsg/disc/testing.go diff --git a/vendor/github.com/skycoin/dmsg/frame.go b/vendor/github.com/SkycoinProject/dmsg/frame.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/frame.go rename to vendor/github.com/SkycoinProject/dmsg/frame.go diff --git a/vendor/github.com/skycoin/dmsg/go.mod b/vendor/github.com/SkycoinProject/dmsg/go.mod similarity index 81% rename from vendor/github.com/skycoin/dmsg/go.mod rename to vendor/github.com/SkycoinProject/dmsg/go.mod index 2e573d695..7efd7a29d 100644 --- a/vendor/github.com/skycoin/dmsg/go.mod +++ b/vendor/github.com/SkycoinProject/dmsg/go.mod @@ -3,18 +3,17 @@ module github.com/SkycoinProject/dmsg go 1.12 require ( + github.com/SkycoinProject/skycoin v0.26.0 github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6 github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect github.com/kr/pretty v0.1.0 // indirect github.com/mattn/go-colorable v0.1.2 // indirect github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect github.com/sirupsen/logrus v1.4.2 - github.com/SkycoinProject/SkycoinProject v0.26.0 + github.com/skycoin/skycoin v0.26.0 // indirect github.com/stretchr/testify v1.3.0 golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4 // indirect golang.org/x/net v0.0.0-20190620200207-3b0461eec859 golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb // indirect - golang.org/x/text v0.3.2 // indirect - golang.org/x/tools v0.0.0-20190627182818-9947fec5c3ab // indirect gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect ) diff --git a/vendor/github.com/skycoin/dmsg/go.sum b/vendor/github.com/SkycoinProject/dmsg/go.sum similarity index 84% rename from vendor/github.com/skycoin/dmsg/go.sum rename to vendor/github.com/SkycoinProject/dmsg/go.sum index c6a730a9e..9bd02b3dd 100644 --- a/vendor/github.com/skycoin/dmsg/go.sum +++ b/vendor/github.com/SkycoinProject/dmsg/go.sum @@ -1,9 +1,10 @@ +github.com/SkycoinProject/skycoin v0.26.0 h1:8/ZRZb2VM2DM4YTIitRJMZ3Yo/3H1FFmbCMx5o6ekmA= +github.com/SkycoinProject/skycoin v0.26.0/go.mod h1:xqPLOKh5B6GBZlGA7B5IJfQmCy7mwimD9NlqxR3gMXo= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6 h1:u/UEqS66A5ckRmS4yNpjmVH56sVtS/RfclBAYocb4as= github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6/go.mod h1:1i71OnUq3iUe1ma7Lr6yG6/rjvM3emb6yoL7xLFzcVQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -32,22 +33,15 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4 h1:ydJNl0ENAG67pFbB+9tfhiL2pYqLhfoaZFw/cjLhY4A= golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb h1:fgwFCsaw9buMuxNd6+DQfAuSFqbNiQZpcgJQAgJsK6k= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190627182818-9947fec5c3ab h1:uOzhX2fm3C4BmBwW2a7lnJQD7qel2+4uhmTc8czKBCU= -golang.org/x/tools v0.0.0-20190627182818-9947fec5c3ab/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/vendor/github.com/skycoin/dmsg/ioutil/ack_waiter.go b/vendor/github.com/SkycoinProject/dmsg/ioutil/ack_waiter.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/ioutil/ack_waiter.go rename to vendor/github.com/SkycoinProject/dmsg/ioutil/ack_waiter.go diff --git a/vendor/github.com/skycoin/dmsg/ioutil/atomic_bool.go b/vendor/github.com/SkycoinProject/dmsg/ioutil/atomic_bool.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/ioutil/atomic_bool.go rename to vendor/github.com/SkycoinProject/dmsg/ioutil/atomic_bool.go diff --git a/vendor/github.com/skycoin/dmsg/ioutil/buf_read.go b/vendor/github.com/SkycoinProject/dmsg/ioutil/buf_read.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/ioutil/buf_read.go rename to vendor/github.com/SkycoinProject/dmsg/ioutil/buf_read.go diff --git a/vendor/github.com/skycoin/dmsg/ioutil/logging.go b/vendor/github.com/SkycoinProject/dmsg/ioutil/logging.go similarity index 53% rename from vendor/github.com/skycoin/dmsg/ioutil/logging.go rename to vendor/github.com/SkycoinProject/dmsg/ioutil/logging.go index 6a904fe71..cc42d0d4e 100644 --- a/vendor/github.com/skycoin/dmsg/ioutil/logging.go +++ b/vendor/github.com/SkycoinProject/dmsg/ioutil/logging.go @@ -1,7 +1,7 @@ package ioutil import ( - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" ) var log = logging.MustGetLogger("ioutil") diff --git a/vendor/github.com/skycoin/dmsg/noise/dh.go b/vendor/github.com/SkycoinProject/dmsg/noise/dh.go similarity index 92% rename from vendor/github.com/skycoin/dmsg/noise/dh.go rename to vendor/github.com/SkycoinProject/dmsg/noise/dh.go index e627bc095..dfd9e49fc 100644 --- a/vendor/github.com/skycoin/dmsg/noise/dh.go +++ b/vendor/github.com/SkycoinProject/dmsg/noise/dh.go @@ -4,7 +4,7 @@ import ( "io" "github.com/flynn/noise" - "github.com/SkycoinProject/SkycoinProject/src/cipher" + "github.com/SkycoinProject/skycoin/src/cipher" ) // Secp256k1 implements `noise.DHFunc`. diff --git a/vendor/github.com/skycoin/dmsg/noise/net.go b/vendor/github.com/SkycoinProject/dmsg/noise/net.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/noise/net.go rename to vendor/github.com/SkycoinProject/dmsg/noise/net.go diff --git a/vendor/github.com/skycoin/dmsg/noise/noise.go b/vendor/github.com/SkycoinProject/dmsg/noise/noise.go similarity index 98% rename from vendor/github.com/skycoin/dmsg/noise/noise.go rename to vendor/github.com/SkycoinProject/dmsg/noise/noise.go index e9121a7a5..3c0f0cf1b 100644 --- a/vendor/github.com/skycoin/dmsg/noise/noise.go +++ b/vendor/github.com/SkycoinProject/dmsg/noise/noise.go @@ -4,7 +4,7 @@ import ( "crypto/rand" "encoding/binary" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/flynn/noise" diff --git a/vendor/github.com/skycoin/dmsg/noise/read_writer.go b/vendor/github.com/SkycoinProject/dmsg/noise/read_writer.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/noise/read_writer.go rename to vendor/github.com/SkycoinProject/dmsg/noise/read_writer.go diff --git a/vendor/github.com/skycoin/dmsg/server.go b/vendor/github.com/SkycoinProject/dmsg/server.go similarity index 99% rename from vendor/github.com/skycoin/dmsg/server.go rename to vendor/github.com/SkycoinProject/dmsg/server.go index 92f492cc3..0cf4cad1f 100644 --- a/vendor/github.com/skycoin/dmsg/server.go +++ b/vendor/github.com/SkycoinProject/dmsg/server.go @@ -9,7 +9,7 @@ import ( "sync/atomic" "time" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/SkycoinProject/dmsg/cipher" "github.com/SkycoinProject/dmsg/disc" diff --git a/vendor/github.com/skycoin/dmsg/testing.go b/vendor/github.com/SkycoinProject/dmsg/testing.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/testing.go rename to vendor/github.com/SkycoinProject/dmsg/testing.go diff --git a/vendor/github.com/skycoin/dmsg/transport.go b/vendor/github.com/SkycoinProject/dmsg/transport.go similarity index 99% rename from vendor/github.com/skycoin/dmsg/transport.go rename to vendor/github.com/SkycoinProject/dmsg/transport.go index 8bfdd573f..613aa7cb9 100644 --- a/vendor/github.com/skycoin/dmsg/transport.go +++ b/vendor/github.com/SkycoinProject/dmsg/transport.go @@ -8,7 +8,7 @@ import ( "net" "sync" - "github.com/SkycoinProject/SkycoinProject/src/util/logging" + "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/SkycoinProject/dmsg/cipher" "github.com/SkycoinProject/dmsg/ioutil" diff --git a/vendor/github.com/skycoin/skycoin/src/cipher/address.go b/vendor/github.com/SkycoinProject/skycoin/src/cipher/address.go similarity index 98% rename from vendor/github.com/skycoin/skycoin/src/cipher/address.go rename to vendor/github.com/SkycoinProject/skycoin/src/cipher/address.go index 9693d3356..b5d93275b 100644 --- a/vendor/github.com/skycoin/skycoin/src/cipher/address.go +++ b/vendor/github.com/SkycoinProject/skycoin/src/cipher/address.go @@ -4,7 +4,7 @@ import ( "errors" "log" - "github.com/SkycoinProject/SkycoinProject/src/cipher/base58" + "github.com/skycoin/skycoin/src/cipher/base58" ) var ( diff --git a/vendor/github.com/skycoin/skycoin/src/cipher/bitcoin.go b/vendor/github.com/SkycoinProject/skycoin/src/cipher/bitcoin.go similarity index 98% rename from vendor/github.com/skycoin/skycoin/src/cipher/bitcoin.go rename to vendor/github.com/SkycoinProject/skycoin/src/cipher/bitcoin.go index 769ae6989..e601d5a2c 100644 --- a/vendor/github.com/skycoin/skycoin/src/cipher/bitcoin.go +++ b/vendor/github.com/SkycoinProject/skycoin/src/cipher/bitcoin.go @@ -5,7 +5,7 @@ import ( "errors" "log" - "github.com/SkycoinProject/SkycoinProject/src/cipher/base58" + "github.com/skycoin/skycoin/src/cipher/base58" ) var ( diff --git a/vendor/github.com/skycoin/skycoin/src/cipher/crypto.go b/vendor/github.com/SkycoinProject/skycoin/src/cipher/crypto.go similarity index 99% rename from vendor/github.com/skycoin/skycoin/src/cipher/crypto.go rename to vendor/github.com/SkycoinProject/skycoin/src/cipher/crypto.go index 6c0e31a31..94499df00 100644 --- a/vendor/github.com/skycoin/skycoin/src/cipher/crypto.go +++ b/vendor/github.com/SkycoinProject/skycoin/src/cipher/crypto.go @@ -24,8 +24,8 @@ import ( "log" "time" - "github.com/SkycoinProject/SkycoinProject/src/cipher/ripemd160" - secp256k1 "github.com/SkycoinProject/SkycoinProject/src/cipher/secp256k1-go" + "github.com/skycoin/skycoin/src/cipher/ripemd160" + secp256k1 "github.com/skycoin/skycoin/src/cipher/secp256k1-go" ) var ( diff --git a/vendor/github.com/skycoin/skycoin/src/cipher/hash.go b/vendor/github.com/SkycoinProject/skycoin/src/cipher/hash.go similarity index 100% rename from vendor/github.com/skycoin/skycoin/src/cipher/hash.go rename to vendor/github.com/SkycoinProject/skycoin/src/cipher/hash.go diff --git a/vendor/github.com/skycoin/skycoin/src/util/logging/formatter.go b/vendor/github.com/SkycoinProject/skycoin/src/util/logging/formatter.go similarity index 100% rename from vendor/github.com/skycoin/skycoin/src/util/logging/formatter.go rename to vendor/github.com/SkycoinProject/skycoin/src/util/logging/formatter.go diff --git a/vendor/github.com/skycoin/skycoin/src/util/logging/hooks.go b/vendor/github.com/SkycoinProject/skycoin/src/util/logging/hooks.go similarity index 100% rename from vendor/github.com/skycoin/skycoin/src/util/logging/hooks.go rename to vendor/github.com/SkycoinProject/skycoin/src/util/logging/hooks.go diff --git a/vendor/github.com/skycoin/skycoin/src/util/logging/logger.go b/vendor/github.com/SkycoinProject/skycoin/src/util/logging/logger.go similarity index 100% rename from vendor/github.com/skycoin/skycoin/src/util/logging/logger.go rename to vendor/github.com/SkycoinProject/skycoin/src/util/logging/logger.go diff --git a/vendor/github.com/skycoin/skycoin/src/util/logging/logging.go b/vendor/github.com/SkycoinProject/skycoin/src/util/logging/logging.go similarity index 100% rename from vendor/github.com/skycoin/skycoin/src/util/logging/logging.go rename to vendor/github.com/SkycoinProject/skycoin/src/util/logging/logging.go diff --git a/vendor/github.com/skycoin/skycoin/src/cipher/secp256k1-go/secp256k1.go b/vendor/github.com/skycoin/skycoin/src/cipher/secp256k1-go/secp256k1.go index de8947815..f4b8fa93d 100644 --- a/vendor/github.com/skycoin/skycoin/src/cipher/secp256k1-go/secp256k1.go +++ b/vendor/github.com/skycoin/skycoin/src/cipher/secp256k1-go/secp256k1.go @@ -9,7 +9,7 @@ import ( "encoding/hex" "log" - secp "github.com/SkycoinProject/SkycoinProject/src/cipher/secp256k1-go/secp256k1-go2" + secp "github.com/skycoin/skycoin/src/cipher/secp256k1-go/secp256k1-go2" ) // DebugPrint enable debug print statements diff --git a/vendor/modules.txt b/vendor/modules.txt index 442ed25b5..8df6b0256 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,3 +1,12 @@ +# github.com/SkycoinProject/dmsg v0.0.0-20190917230949-27f4fd2f25fb +github.com/SkycoinProject/dmsg/cipher +github.com/SkycoinProject/dmsg +github.com/SkycoinProject/dmsg/disc +github.com/SkycoinProject/dmsg/noise +github.com/SkycoinProject/dmsg/ioutil +# github.com/SkycoinProject/skycoin v0.26.0 +github.com/SkycoinProject/skycoin/src/util/logging +github.com/SkycoinProject/skycoin/src/cipher # github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc github.com/alecthomas/template github.com/alecthomas/template/parse @@ -62,19 +71,11 @@ github.com/prometheus/procfs/internal/fs # github.com/sirupsen/logrus v1.4.2 github.com/sirupsen/logrus github.com/sirupsen/logrus/hooks/syslog -# github.com/SkycoinProject/dmsg v0.0.0-20190805065636-70f4c32a994f -github.com/SkycoinProject/dmsg/cipher -github.com/SkycoinProject/dmsg -github.com/SkycoinProject/dmsg/disc -github.com/SkycoinProject/dmsg/noise -github.com/SkycoinProject/dmsg/ioutil -# github.com/SkycoinProject/SkycoinProject v0.26.0 -github.com/SkycoinProject/SkycoinProject/src/util/logging -github.com/SkycoinProject/SkycoinProject/src/cipher -github.com/SkycoinProject/SkycoinProject/src/cipher/base58 -github.com/SkycoinProject/SkycoinProject/src/cipher/ripemd160 -github.com/SkycoinProject/SkycoinProject/src/cipher/secp256k1-go -github.com/SkycoinProject/SkycoinProject/src/cipher/secp256k1-go/secp256k1-go2 +# github.com/skycoin/skycoin v0.26.0 +github.com/skycoin/skycoin/src/cipher/base58 +github.com/skycoin/skycoin/src/cipher/ripemd160 +github.com/skycoin/skycoin/src/cipher/secp256k1-go +github.com/skycoin/skycoin/src/cipher/secp256k1-go/secp256k1-go2 # github.com/spf13/cobra v0.0.5 github.com/spf13/cobra # github.com/spf13/pflag v1.0.3