From cb65518c55226e2fb0ff8cbb0e2f72bcfe1ac9d2 Mon Sep 17 00:00:00 2001 From: Moses Narrow <36607567+0pcom@users.noreply.github.com> Date: Tue, 17 Dec 2024 13:22:05 -0600 Subject: [PATCH] Replace "github.com/skycoin/skywire-utilities" imports with "github.com/skycoin/skywire/pkg/skywire-utilities" (#1912) * update skywire-utilities import * update skywire-utilities import --- cmd/apps/skychat/commands/skychat.go | 6 +++--- cmd/apps/skysocks-client/commands/skysocks-client.go | 6 +++--- cmd/apps/skysocks/commands/skysocks.go | 2 +- cmd/apps/vpn-client/commands/vpn-client.go | 4 ++-- cmd/apps/vpn-server/commands/vpn-server.go | 4 ++-- cmd/setup-node/commands/root.go | 8 ++++---- cmd/skycoin-skywire/commands/root.go | 2 +- cmd/skywire-cli/commands/config/gen.go | 6 +++--- cmd/skywire-cli/commands/config/root.go | 4 ++-- cmd/skywire-cli/commands/config/services.go | 4 ++-- cmd/skywire-cli/commands/config/update.go | 4 ++-- cmd/skywire-cli/commands/dmsgpty/root.go | 4 ++-- cmd/skywire-cli/commands/log/log.go | 6 +++--- cmd/skywire-cli/commands/log/root.go | 2 +- cmd/skywire-cli/commands/log/st.go | 2 +- cmd/skywire-cli/commands/mdisc/root.go | 4 ++-- cmd/skywire-cli/commands/proxy/proxy.go | 4 ++-- cmd/skywire-cli/commands/proxy/root.go | 4 ++-- cmd/skywire-cli/commands/rewards/calc.go | 4 ++-- cmd/skywire-cli/commands/rewards/ui.go | 6 +++--- cmd/skywire-cli/commands/root.go | 2 +- cmd/skywire-cli/commands/route/route.go | 2 +- cmd/skywire-cli/commands/rpc/root.go | 2 +- cmd/skywire-cli/commands/skyrev/root.go | 2 +- cmd/skywire-cli/commands/survey/root.go | 6 +++--- cmd/skywire-cli/commands/tp/tp.go | 4 ++-- cmd/skywire-cli/commands/visor/app.go | 2 +- cmd/skywire-cli/commands/visor/hv.go | 2 +- cmd/skywire-cli/commands/visor/ip.go | 2 +- cmd/skywire-cli/commands/visor/root.go | 2 +- cmd/skywire-cli/commands/vpn/root.go | 4 ++-- cmd/skywire-cli/commands/vpn/vvpn.go | 2 +- cmd/skywire-cli/commands/vpn/vvpnui.go | 2 +- cmd/skywire-cli/internal/internal.go | 4 ++-- cmd/skywire/commands/root.go | 2 +- example/example-client-app/example-client-app.go | 4 ++-- example/example-server-app/example-server-app.go | 2 +- example/http-server/server.go | 2 +- go.mod | 2 +- internal/httpauth/client.go | 4 ++-- internal/httpauth/client_test.go | 4 ++-- internal/httpauth/nonce.go | 2 +- internal/packetfilter/address-filter.go | 2 +- internal/packetfilter/kcp-filter.go | 2 +- internal/skysocks/server_test.go | 2 +- internal/vpn/client.go | 4 ++-- internal/vpn/client_config.go | 2 +- internal/vpn/env.go | 2 +- internal/vpn/server.go | 2 +- pkg/app/appcommon/log_store.go | 2 +- pkg/app/appcommon/proc_config.go | 2 +- pkg/app/appdisc/factory.go | 4 ++-- pkg/app/appevent/broadcaster.go | 2 +- pkg/app/appevent/rpc.go | 2 +- pkg/app/appnet/addr.go | 2 +- pkg/app/appnet/addr_test.go | 2 +- pkg/app/appnet/dmsg_networker.go | 2 +- pkg/app/appnet/forwarding.go | 2 +- pkg/app/appnet/http_transport.go | 2 +- pkg/app/appnet/mock_networker.go | 2 +- pkg/app/appnet/networker.go | 2 +- pkg/app/appnet/networker_test.go | 2 +- pkg/app/appnet/skywire_networker.go | 4 ++-- pkg/app/appserver/proc.go | 2 +- pkg/app/appserver/proc_manager.go | 2 +- pkg/app/appserver/proc_manager_test.go | 2 +- pkg/app/appserver/rpc_ingress_client_test.go | 2 +- pkg/app/appserver/rpc_ingress_gateway.go | 2 +- pkg/app/appserver/rpc_ingress_gateway_test.go | 4 ++-- pkg/app/client_test.go | 4 ++-- pkg/app/conn_test.go | 2 +- pkg/app/launcher/launcher.go | 2 +- pkg/app/listener_test.go | 4 ++-- pkg/dmsgc/dmsgc.go | 4 ++-- pkg/routefinder/rfclient/client.go | 2 +- pkg/router/dmsg_wrapper.go | 2 +- pkg/router/id_reserver.go | 2 +- pkg/router/id_reserver_test.go | 2 +- pkg/router/map.go | 2 +- pkg/router/map_test.go | 4 ++-- pkg/router/mock_id_reserver.go | 2 +- pkg/router/mock_route_group_dialer.go | 4 ++-- pkg/router/mock_router.go | 2 +- pkg/router/route_group.go | 2 +- pkg/router/route_group_test.go | 4 ++-- pkg/router/router.go | 4 ++-- pkg/router/router_test.go | 2 +- pkg/router/routerclient.go | 4 ++-- pkg/router/routerclient_test.go | 4 ++-- pkg/router/rpc_gateway.go | 2 +- pkg/router/rpc_gateway_test.go | 4 ++-- pkg/router/setup_rpc_gateway.go | 4 ++-- pkg/router/setupclient.go | 4 ++-- pkg/router/setupconfig.go | 2 +- pkg/router/setupmetrics/victoria_metrics.go | 2 +- pkg/router/setupnode.go | 4 ++-- pkg/router/setupnode_test.go | 2 +- pkg/router/testing_test.go | 2 +- pkg/router/wrappers.go | 4 ++-- pkg/routing/addr.go | 2 +- pkg/routing/route.go | 2 +- pkg/routing/route_descriptor.go | 2 +- pkg/routing/route_descriptor_test.go | 2 +- pkg/routing/rule.go | 2 +- pkg/routing/rule_test.go | 2 +- pkg/routing/table.go | 2 +- pkg/routing/table_test.go | 2 +- pkg/servicedisc/autoconnect.go | 6 +++--- pkg/servicedisc/client.go | 8 ++++---- pkg/servicedisc/types.go | 4 ++-- pkg/servicedisc/types_test.go | 2 +- pkg/skywire-utilities/pkg/cipher/cipher_test.go | 2 +- pkg/skywire-utilities/pkg/cmdutil/catch_test.go | 2 +- pkg/skywire-utilities/pkg/cmdutil/service_flags.go | 2 +- pkg/skywire-utilities/pkg/cmdutil/sysloghook_unix.go | 2 +- pkg/skywire-utilities/pkg/cmdutil/sysloghook_windows.go | 2 +- pkg/skywire-utilities/pkg/geo/geo.go | 4 ++-- pkg/skywire-utilities/pkg/httpauth/auth.go | 2 +- pkg/skywire-utilities/pkg/httpauth/handler.go | 6 +++--- pkg/skywire-utilities/pkg/httpauth/handler_test.go | 6 +++--- pkg/skywire-utilities/pkg/httpauth/memory_store.go | 2 +- pkg/skywire-utilities/pkg/httpauth/nonce-storer.go | 4 ++-- pkg/skywire-utilities/pkg/httpauth/redis-store.go | 2 +- pkg/skywire-utilities/pkg/httputil/health.go | 2 +- pkg/skywire-utilities/pkg/httputil/httputil.go | 2 +- pkg/skywire-utilities/pkg/netutil/net_test.go | 2 +- pkg/transport/discovery.go | 2 +- pkg/transport/discovery_test.go | 2 +- pkg/transport/entry.go | 2 +- pkg/transport/entry_test.go | 2 +- pkg/transport/handshake.go | 6 +++--- pkg/transport/log.go | 2 +- pkg/transport/log_test.go | 2 +- pkg/transport/managed_transport.go | 8 ++++---- pkg/transport/manager.go | 4 ++-- pkg/transport/manager_test.go | 4 ++-- pkg/transport/network/addrresolver/client.go | 6 +++--- pkg/transport/network/addrresolver/client_test.go | 4 ++-- pkg/transport/network/addrresolver/mock_api_client.go | 2 +- pkg/transport/network/client.go | 4 ++-- pkg/transport/network/connection.go | 4 ++-- pkg/transport/network/dmsg.go | 2 +- pkg/transport/network/handshake/handshake.go | 2 +- pkg/transport/network/handshake/handshake_test.go | 2 +- pkg/transport/network/listener.go | 2 +- pkg/transport/network/mock_dialer.go | 2 +- pkg/transport/network/network.go | 2 +- pkg/transport/network/stcp.go | 2 +- pkg/transport/network/stcp/pktable.go | 2 +- pkg/transport/network/stcpr.go | 4 ++-- pkg/transport/network/stun_client.go | 2 +- pkg/transport/network/sudph.go | 2 +- pkg/transport/setup/rpc.go | 4 ++-- pkg/transport/setup/visor.go | 4 ++-- pkg/transport/tpdclient/client.go | 6 +++--- pkg/transport/tpdclient/client_test.go | 4 ++-- pkg/transport/transport.go | 2 +- pkg/utclient/client.go | 6 +++--- pkg/utclient/client_test.go | 4 ++-- pkg/util/cipherutil/cipherutil.go | 2 +- pkg/util/pathutil/configpath.go | 2 +- pkg/visor/api.go | 8 ++++---- pkg/visor/cmd.go | 4 ++-- pkg/visor/dmsgtracker/dmsg_tracker.go | 4 ++-- pkg/visor/etc.go | 4 ++-- pkg/visor/gui.go | 4 ++-- pkg/visor/hypervisor.go | 8 ++++---- pkg/visor/init.go | 6 +++--- pkg/visor/logserver/api.go | 8 ++++---- pkg/visor/ping.go | 2 +- pkg/visor/rpc.go | 2 +- pkg/visor/rpc_client.go | 6 +++--- pkg/visor/rpc_client_serve.go | 2 +- pkg/visor/rpc_test.go | 2 +- pkg/visor/survey.go | 2 +- pkg/visor/usermanager/user.go | 2 +- pkg/visor/usermanager/user_manager.go | 4 ++-- pkg/visor/visor.go | 6 +++--- pkg/visor/visorconfig/common.go | 4 ++-- pkg/visor/visorconfig/common_test.go | 2 +- pkg/visor/visorconfig/config.go | 4 ++-- pkg/visor/visorconfig/hypervisorconfig.go | 2 +- pkg/visor/visorconfig/parse.go | 4 ++-- pkg/visor/visorconfig/services.go | 4 ++-- pkg/visor/visorconfig/v1.go | 2 +- pkg/visor/visorconfig/values.go | 4 ++-- pkg/visor/visorconfig/values_darwin.go | 2 +- pkg/visor/visorconfig/values_linux.go | 2 +- pkg/visor/visorconfig/values_windows.go | 2 +- pkg/visor/visorinit/module.go | 2 +- pkg/visor/withoutsystray.go | 2 +- scripts/mac_installer/desktop-deinstaller/deinstaller.go | 2 +- skywire.go | 2 +- 193 files changed, 300 insertions(+), 300 deletions(-) diff --git a/cmd/apps/skychat/commands/skychat.go b/cmd/apps/skychat/commands/skychat.go index d5ecf21abd..c5b3bb305b 100644 --- a/cmd/apps/skychat/commands/skychat.go +++ b/cmd/apps/skychat/commands/skychat.go @@ -19,13 +19,13 @@ import ( ipc "github.com/james-barrow/golang-ipc" "github.com/spf13/cobra" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/app" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/visor/visorconfig" ) diff --git a/cmd/apps/skysocks-client/commands/skysocks-client.go b/cmd/apps/skysocks-client/commands/skysocks-client.go index e844cc0332..73bb44a162 100644 --- a/cmd/apps/skysocks-client/commands/skysocks-client.go +++ b/cmd/apps/skysocks-client/commands/skysocks-client.go @@ -18,14 +18,14 @@ import ( ipc "github.com/james-barrow/golang-ipc" "github.com/spf13/cobra" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/internal/skysocks" "github.com/skycoin/skywire/pkg/app" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/visor/visorconfig" ) diff --git a/cmd/apps/skysocks/commands/skysocks.go b/cmd/apps/skysocks/commands/skysocks.go index 05a77e0351..c10caa7a1d 100644 --- a/cmd/apps/skysocks/commands/skysocks.go +++ b/cmd/apps/skysocks/commands/skysocks.go @@ -11,12 +11,12 @@ import ( ipc "github.com/james-barrow/golang-ipc" "github.com/spf13/cobra" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" "github.com/skycoin/skywire/internal/skysocks" "github.com/skycoin/skywire/pkg/app" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" "github.com/skycoin/skywire/pkg/visor/visorconfig" ) diff --git a/cmd/apps/vpn-client/commands/vpn-client.go b/cmd/apps/vpn-client/commands/vpn-client.go index ff1100d63b..55a60960c0 100644 --- a/cmd/apps/vpn-client/commands/vpn-client.go +++ b/cmd/apps/vpn-client/commands/vpn-client.go @@ -14,13 +14,13 @@ import ( ipc "github.com/james-barrow/golang-ipc" "github.com/spf13/cobra" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/internal/vpn" "github.com/skycoin/skywire/pkg/app" "github.com/skycoin/skywire/pkg/app/appevent" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/visor/visorconfig" ) diff --git a/cmd/apps/vpn-server/commands/vpn-server.go b/cmd/apps/vpn-server/commands/vpn-server.go index a9b9adad70..0b4ca8662e 100644 --- a/cmd/apps/vpn-server/commands/vpn-server.go +++ b/cmd/apps/vpn-server/commands/vpn-server.go @@ -12,14 +12,14 @@ import ( "github.com/spf13/cobra" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/internal/vpn" "github.com/skycoin/skywire/pkg/app" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) const ( diff --git a/cmd/setup-node/commands/root.go b/cmd/setup-node/commands/root.go index ddc170d1e9..15821f84ac 100644 --- a/cmd/setup-node/commands/root.go +++ b/cmd/setup-node/commands/root.go @@ -15,12 +15,12 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cmdutil" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/metricsutil" "github.com/skycoin/skywire/pkg/router" "github.com/skycoin/skywire/pkg/router/setupmetrics" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil" ) var ( diff --git a/cmd/skycoin-skywire/commands/root.go b/cmd/skycoin-skywire/commands/root.go index c26e3279f5..1217150309 100644 --- a/cmd/skycoin-skywire/commands/root.go +++ b/cmd/skycoin-skywire/commands/root.go @@ -17,7 +17,6 @@ import ( "github.com/spf13/cobra" services "github.com/skycoin/skywire-services/cmd/skywire-services/commands" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" sc "github.com/skycoin/skywire/cmd/apps/skychat/commands" ssc "github.com/skycoin/skywire/cmd/apps/skysocks-client/commands" ss "github.com/skycoin/skywire/cmd/apps/skysocks/commands" @@ -25,6 +24,7 @@ import ( vpns "github.com/skycoin/skywire/cmd/apps/vpn-server/commands" sn "github.com/skycoin/skywire/cmd/setup-node/commands" scli "github.com/skycoin/skywire/cmd/skywire-cli/commands" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" "github.com/skycoin/skywire/pkg/visor" ) diff --git a/cmd/skywire-cli/commands/config/gen.go b/cmd/skywire-cli/commands/config/gen.go index 4c1277e692..84ac1bfdf8 100644 --- a/cmd/skywire-cli/commands/config/gen.go +++ b/cmd/skywire-cli/commands/config/gen.go @@ -19,13 +19,13 @@ import ( coinCipher "github.com/skycoin/skycoin/src/cipher" "github.com/spf13/cobra" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/dmsgc" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/transport/network" "github.com/skycoin/skywire/pkg/visor/visorconfig" ) diff --git a/cmd/skywire-cli/commands/config/root.go b/cmd/skywire-cli/commands/config/root.go index dc3dc00c98..1c56bed9bb 100644 --- a/cmd/skywire-cli/commands/config/root.go +++ b/cmd/skywire-cli/commands/config/root.go @@ -10,8 +10,8 @@ import ( "github.com/skycoin/dmsg/pkg/disc" "github.com/spf13/cobra" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/visor/visorconfig" ) diff --git a/cmd/skywire-cli/commands/config/services.go b/cmd/skywire-cli/commands/config/services.go index 75dc63b080..30040f66c3 100644 --- a/cmd/skywire-cli/commands/config/services.go +++ b/cmd/skywire-cli/commands/config/services.go @@ -10,8 +10,8 @@ import ( "github.com/spf13/cobra" - "github.com/skycoin/skywire-utilities/pkg/cmdutil" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/visor/visorconfig" ) diff --git a/cmd/skywire-cli/commands/config/update.go b/cmd/skywire-cli/commands/config/update.go index c243b297fb..80f0321219 100644 --- a/cmd/skywire-cli/commands/config/update.go +++ b/cmd/skywire-cli/commands/config/update.go @@ -13,9 +13,9 @@ import ( "github.com/spf13/cobra" "github.com/skycoin/skywire" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/dmsgc" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/visor/visorconfig" ) diff --git a/cmd/skywire-cli/commands/dmsgpty/root.go b/cmd/skywire-cli/commands/dmsgpty/root.go index 4adf269a65..45ad7766c6 100644 --- a/cmd/skywire-cli/commands/dmsgpty/root.go +++ b/cmd/skywire-cli/commands/dmsgpty/root.go @@ -12,9 +12,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/skycoin/skywire-utilities/pkg/cmdutil" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/cmd/skywire-cli/internal" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/visor" ) diff --git a/cmd/skywire-cli/commands/log/log.go b/cmd/skywire-cli/commands/log/log.go index d5f7c376c9..4129a41689 100644 --- a/cmd/skywire-cli/commands/log/log.go +++ b/cmd/skywire-cli/commands/log/log.go @@ -23,9 +23,9 @@ import ( "github.com/spf13/cobra" "github.com/skycoin/skywire" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/cmdutil" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) func init() { diff --git a/cmd/skywire-cli/commands/log/root.go b/cmd/skywire-cli/commands/log/root.go index b19c4e85c0..091848be82 100644 --- a/cmd/skywire-cli/commands/log/root.go +++ b/cmd/skywire-cli/commands/log/root.go @@ -2,7 +2,7 @@ package clilog import ( - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) var ( diff --git a/cmd/skywire-cli/commands/log/st.go b/cmd/skywire-cli/commands/log/st.go index 2fb7dfd82d..469ac53e10 100644 --- a/cmd/skywire-cli/commands/log/st.go +++ b/cmd/skywire-cli/commands/log/st.go @@ -13,7 +13,7 @@ import ( "github.com/pterm/pterm" "github.com/spf13/cobra" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) func init() { diff --git a/cmd/skywire-cli/commands/mdisc/root.go b/cmd/skywire-cli/commands/mdisc/root.go index cd910dd146..459a247307 100644 --- a/cmd/skywire-cli/commands/mdisc/root.go +++ b/cmd/skywire-cli/commands/mdisc/root.go @@ -18,9 +18,9 @@ import ( "github.com/spf13/pflag" "github.com/skycoin/skywire" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/cmd/skywire-cli/internal" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) var ( diff --git a/cmd/skywire-cli/commands/proxy/proxy.go b/cmd/skywire-cli/commands/proxy/proxy.go index c09996809a..b492047702 100644 --- a/cmd/skywire-cli/commands/proxy/proxy.go +++ b/cmd/skywire-cli/commands/proxy/proxy.go @@ -17,12 +17,12 @@ import ( "github.com/tidwall/pretty" "github.com/skycoin/skywire" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cmdutil" clirpc "github.com/skycoin/skywire/cmd/skywire-cli/commands/rpc" "github.com/skycoin/skywire/cmd/skywire-cli/internal" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil" "github.com/skycoin/skywire/pkg/visor/visorconfig" ) diff --git a/cmd/skywire-cli/commands/proxy/root.go b/cmd/skywire-cli/commands/proxy/root.go index 49646a83b9..5dde04aebd 100644 --- a/cmd/skywire-cli/commands/proxy/root.go +++ b/cmd/skywire-cli/commands/proxy/root.go @@ -4,9 +4,9 @@ package skysocksc import ( "github.com/spf13/cobra" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/servicedisc" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) var ( diff --git a/cmd/skywire-cli/commands/rewards/calc.go b/cmd/skywire-cli/commands/rewards/calc.go index 3ebef1b49b..51319003f8 100644 --- a/cmd/skywire-cli/commands/rewards/calc.go +++ b/cmd/skywire-cli/commands/rewards/calc.go @@ -18,9 +18,9 @@ import ( "github.com/tidwall/pretty" "github.com/skycoin/skywire" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" tgbot "github.com/skycoin/skywire/cmd/skywire-cli/commands/rewards/tgbot" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) const yearlyTotalRewardsPerPool int = 408000 diff --git a/cmd/skywire-cli/commands/rewards/ui.go b/cmd/skywire-cli/commands/rewards/ui.go index e716322fe2..ba8f32e1c3 100644 --- a/cmd/skywire-cli/commands/rewards/ui.go +++ b/cmd/skywire-cli/commands/rewards/ui.go @@ -26,9 +26,9 @@ import ( "github.com/spf13/cobra" "github.com/skycoin/skywire" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/cmdutil" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) func init() { diff --git a/cmd/skywire-cli/commands/root.go b/cmd/skywire-cli/commands/root.go index 5a04199f87..340609ac02 100644 --- a/cmd/skywire-cli/commands/root.go +++ b/cmd/skywire-cli/commands/root.go @@ -13,7 +13,6 @@ import ( "github.com/pterm/pterm/putils" "github.com/spf13/cobra" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" clicompletion "github.com/skycoin/skywire/cmd/skywire-cli/commands/completion" cliconfig "github.com/skycoin/skywire/cmd/skywire-cli/commands/config" clidmsgpty "github.com/skycoin/skywire/cmd/skywire-cli/commands/dmsgpty" @@ -31,6 +30,7 @@ import ( clivisor "github.com/skycoin/skywire/cmd/skywire-cli/commands/visor" clivpn "github.com/skycoin/skywire/cmd/skywire-cli/commands/vpn" "github.com/skycoin/skywire/cmd/skywire-cli/internal" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" ) func init() { diff --git a/cmd/skywire-cli/commands/route/route.go b/cmd/skywire-cli/commands/route/route.go index c988b265a3..cf79c1a57d 100644 --- a/cmd/skywire-cli/commands/route/route.go +++ b/cmd/skywire-cli/commands/route/route.go @@ -19,13 +19,13 @@ import ( "golang.org/x/net/context" "github.com/skycoin/skywire" - "github.com/skycoin/skywire-utilities/pkg/cipher" clirpc "github.com/skycoin/skywire/cmd/skywire-cli/commands/rpc" "github.com/skycoin/skywire/cmd/skywire-cli/internal" "github.com/skycoin/skywire/pkg/routefinder/rfclient" "github.com/skycoin/skywire/pkg/router" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/visor/visorconfig" ) diff --git a/cmd/skywire-cli/commands/rpc/root.go b/cmd/skywire-cli/commands/rpc/root.go index 121e4689ba..3238ecd73b 100644 --- a/cmd/skywire-cli/commands/rpc/root.go +++ b/cmd/skywire-cli/commands/rpc/root.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/pflag" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/cmd/skywire-cli/internal" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/visor" ) diff --git a/cmd/skywire-cli/commands/skyrev/root.go b/cmd/skywire-cli/commands/skyrev/root.go index b8fccc903e..55889f75bb 100644 --- a/cmd/skywire-cli/commands/skyrev/root.go +++ b/cmd/skywire-cli/commands/skyrev/root.go @@ -11,9 +11,9 @@ import ( "github.com/google/uuid" "github.com/spf13/cobra" - "github.com/skycoin/skywire-utilities/pkg/cipher" clirpc "github.com/skycoin/skywire/cmd/skywire-cli/commands/rpc" "github.com/skycoin/skywire/cmd/skywire-cli/internal" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) var ( diff --git a/cmd/skywire-cli/commands/survey/root.go b/cmd/skywire-cli/commands/survey/root.go index 35edafd95b..777de1ab5a 100644 --- a/cmd/skywire-cli/commands/survey/root.go +++ b/cmd/skywire-cli/commands/survey/root.go @@ -13,10 +13,10 @@ import ( "github.com/spf13/cobra" "github.com/skycoin/skywire" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/cmdutil" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/cmd/skywire-cli/internal" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/visor/visorconfig" ) diff --git a/cmd/skywire-cli/commands/tp/tp.go b/cmd/skywire-cli/commands/tp/tp.go index 4d49b55625..e8f0b417dd 100644 --- a/cmd/skywire-cli/commands/tp/tp.go +++ b/cmd/skywire-cli/commands/tp/tp.go @@ -22,10 +22,10 @@ import ( "github.com/tidwall/pretty" "github.com/skycoin/skywire" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" clirpc "github.com/skycoin/skywire/cmd/skywire-cli/commands/rpc" "github.com/skycoin/skywire/cmd/skywire-cli/internal" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/transport/network" "github.com/skycoin/skywire/pkg/visor" diff --git a/cmd/skywire-cli/commands/visor/app.go b/cmd/skywire-cli/commands/visor/app.go index 7468fbea05..a654e40ccf 100644 --- a/cmd/skywire-cli/commands/visor/app.go +++ b/cmd/skywire-cli/commands/visor/app.go @@ -12,11 +12,11 @@ import ( "github.com/spf13/cobra" - "github.com/skycoin/skywire-utilities/pkg/cipher" clirpc "github.com/skycoin/skywire/cmd/skywire-cli/commands/rpc" "github.com/skycoin/skywire/cmd/skywire-cli/internal" "github.com/skycoin/skywire/pkg/app/appcommon" "github.com/skycoin/skywire/pkg/app/appserver" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) var appName string diff --git a/cmd/skywire-cli/commands/visor/hv.go b/cmd/skywire-cli/commands/visor/hv.go index 921c811517..21293cda77 100644 --- a/cmd/skywire-cli/commands/visor/hv.go +++ b/cmd/skywire-cli/commands/visor/hv.go @@ -9,9 +9,9 @@ import ( "github.com/spf13/pflag" "github.com/toqueteos/webbrowser" - "github.com/skycoin/skywire-utilities/pkg/cipher" clirpc "github.com/skycoin/skywire/cmd/skywire-cli/commands/rpc" "github.com/skycoin/skywire/cmd/skywire-cli/internal" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/visor/visorconfig" ) diff --git a/cmd/skywire-cli/commands/visor/ip.go b/cmd/skywire-cli/commands/visor/ip.go index 7a6bee94f9..8e7cda0be9 100644 --- a/cmd/skywire-cli/commands/visor/ip.go +++ b/cmd/skywire-cli/commands/visor/ip.go @@ -10,8 +10,8 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/cmd/skywire-cli/internal" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/cmd/skywire-cli/commands/visor/root.go b/cmd/skywire-cli/commands/visor/root.go index 8d074839b4..d70fd544b7 100644 --- a/cmd/skywire-cli/commands/visor/root.go +++ b/cmd/skywire-cli/commands/visor/root.go @@ -4,8 +4,8 @@ package clivisor import ( "github.com/spf13/cobra" - "github.com/skycoin/skywire-utilities/pkg/logging" clirpc "github.com/skycoin/skywire/cmd/skywire-cli/commands/rpc" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) var logger = logging.MustGetLogger("skywire-cli") diff --git a/cmd/skywire-cli/commands/vpn/root.go b/cmd/skywire-cli/commands/vpn/root.go index 9f9e2e8964..6e6c621409 100644 --- a/cmd/skywire-cli/commands/vpn/root.go +++ b/cmd/skywire-cli/commands/vpn/root.go @@ -4,9 +4,9 @@ package clivpn import ( "github.com/spf13/cobra" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/servicedisc" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) var ( diff --git a/cmd/skywire-cli/commands/vpn/vvpn.go b/cmd/skywire-cli/commands/vpn/vvpn.go index 0de39a9b37..f5fd9aeaf9 100644 --- a/cmd/skywire-cli/commands/vpn/vvpn.go +++ b/cmd/skywire-cli/commands/vpn/vvpn.go @@ -17,10 +17,10 @@ import ( "github.com/tidwall/pretty" "github.com/skycoin/skywire" - "github.com/skycoin/skywire-utilities/pkg/cmdutil" clirpc "github.com/skycoin/skywire/cmd/skywire-cli/commands/rpc" "github.com/skycoin/skywire/cmd/skywire-cli/internal" "github.com/skycoin/skywire/pkg/app/appserver" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil" "github.com/skycoin/skywire/pkg/visor" ) diff --git a/cmd/skywire-cli/commands/vpn/vvpnui.go b/cmd/skywire-cli/commands/vpn/vvpnui.go index bc26f794a5..9e6e295e57 100644 --- a/cmd/skywire-cli/commands/vpn/vvpnui.go +++ b/cmd/skywire-cli/commands/vpn/vvpnui.go @@ -8,10 +8,10 @@ import ( "github.com/spf13/cobra" "github.com/toqueteos/webbrowser" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" clirpc "github.com/skycoin/skywire/cmd/skywire-cli/commands/rpc" clivisor "github.com/skycoin/skywire/cmd/skywire-cli/commands/visor" "github.com/skycoin/skywire/cmd/skywire-cli/internal" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" "github.com/skycoin/skywire/pkg/visor/visorconfig" ) diff --git a/cmd/skywire-cli/internal/internal.go b/cmd/skywire-cli/internal/internal.go index ab5098697c..47c7f0a5bc 100644 --- a/cmd/skywire-cli/internal/internal.go +++ b/cmd/skywire-cli/internal/internal.go @@ -13,8 +13,8 @@ import ( "github.com/google/uuid" "github.com/spf13/pflag" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) var log = logging.MustGetLogger("skywire-cli") diff --git a/cmd/skywire/commands/root.go b/cmd/skywire/commands/root.go index 5124388d0a..1c1c0b4072 100644 --- a/cmd/skywire/commands/root.go +++ b/cmd/skywire/commands/root.go @@ -16,7 +16,6 @@ import ( "github.com/spf13/cobra" services "github.com/skycoin/skywire-services/cmd/skywire-services/commands" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" sc "github.com/skycoin/skywire/cmd/apps/skychat/commands" ssc "github.com/skycoin/skywire/cmd/apps/skysocks-client/commands" ss "github.com/skycoin/skywire/cmd/apps/skysocks/commands" @@ -24,6 +23,7 @@ import ( vpns "github.com/skycoin/skywire/cmd/apps/vpn-server/commands" sn "github.com/skycoin/skywire/cmd/setup-node/commands" scli "github.com/skycoin/skywire/cmd/skywire-cli/commands" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" "github.com/skycoin/skywire/pkg/visor" ) diff --git a/example/example-client-app/example-client-app.go b/example/example-client-app/example-client-app.go index 88e66f4954..83d406d31a 100644 --- a/example/example-client-app/example-client-app.go +++ b/example/example-client-app/example-client-app.go @@ -17,13 +17,13 @@ import ( "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/app" "github.com/skycoin/skywire/pkg/app/appcommon" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" ) const ( diff --git a/example/example-server-app/example-server-app.go b/example/example-server-app/example-server-app.go index 73bcbbb22e..33b08ea291 100644 --- a/example/example-server-app/example-server-app.go +++ b/example/example-server-app/example-server-app.go @@ -13,10 +13,10 @@ import ( "os/signal" "syscall" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" "github.com/skycoin/skywire/pkg/app" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/app/appserver" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" ) const ( diff --git a/example/http-server/server.go b/example/http-server/server.go index 4e231a39ed..845659ff17 100644 --- a/example/http-server/server.go +++ b/example/http-server/server.go @@ -10,8 +10,8 @@ import ( "syscall" "time" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/example/http-server/html" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/visor" ) diff --git a/go.mod b/go.mod index 74bc433fa9..bece9b13c6 100644 --- a/go.mod +++ b/go.mod @@ -38,7 +38,6 @@ require ( github.com/skycoin/skycoin v0.28.1-0.20241105130348-39b49a2d0a7f github.com/skycoin/skycoin-service-discovery v1.3.29-0.20241019190420-233c2d68bce0 github.com/skycoin/skywire-services v1.3.29-0.20241105123837-b4869a32c8db - github.com/skycoin/skywire-utilities v1.3.25 github.com/skycoin/systray v1.10.0 github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8 github.com/spf13/cobra v1.8.1 @@ -141,6 +140,7 @@ require ( github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/shopspring/decimal v1.4.0 // indirect github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6 // indirect + github.com/skycoin/skywire-utilities v1.3.25 // indirect github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.11.0 // indirect github.com/spf13/cast v1.7.0 // indirect diff --git a/internal/httpauth/client.go b/internal/httpauth/client.go index 6d4f6ac894..b86fd36a05 100644 --- a/internal/httpauth/client.go +++ b/internal/httpauth/client.go @@ -15,8 +15,8 @@ import ( "sync" "sync/atomic" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) const ( diff --git a/internal/httpauth/client_test.go b/internal/httpauth/client_test.go index e0b072aaa1..6cdd973cfe 100644 --- a/internal/httpauth/client_test.go +++ b/internal/httpauth/client_test.go @@ -16,8 +16,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) var masterLogger = logging.NewMasterLogger() diff --git a/internal/httpauth/nonce.go b/internal/httpauth/nonce.go index 30813d055a..99a3c1ad19 100644 --- a/internal/httpauth/nonce.go +++ b/internal/httpauth/nonce.go @@ -4,7 +4,7 @@ package httpauth import ( "fmt" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // Nonce is used to sign requests in order to avoid replay attack diff --git a/internal/packetfilter/address-filter.go b/internal/packetfilter/address-filter.go index 726e7f0adc..fdadb5bb78 100644 --- a/internal/packetfilter/address-filter.go +++ b/internal/packetfilter/address-filter.go @@ -4,7 +4,7 @@ package packetfilter import ( "net" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // AddressFilter filters packets from specified address. diff --git a/internal/packetfilter/kcp-filter.go b/internal/packetfilter/kcp-filter.go index 634dc7ff47..feea783e0a 100644 --- a/internal/packetfilter/kcp-filter.go +++ b/internal/packetfilter/kcp-filter.go @@ -8,7 +8,7 @@ import ( "github.com/xtaci/kcp-go" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) const ( diff --git a/internal/skysocks/server_test.go b/internal/skysocks/server_test.go index 1306d81030..effe39b488 100644 --- a/internal/skysocks/server_test.go +++ b/internal/skysocks/server_test.go @@ -16,7 +16,7 @@ import ( "golang.org/x/net/nettest" "golang.org/x/net/proxy" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) func TestMain(m *testing.M) { diff --git a/internal/vpn/client.go b/internal/vpn/client.go index b3acddf7e3..c25d2774c9 100644 --- a/internal/vpn/client.go +++ b/internal/vpn/client.go @@ -17,13 +17,13 @@ import ( ipc "github.com/james-barrow/golang-ipc" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/app" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" ) const ( diff --git a/internal/vpn/client_config.go b/internal/vpn/client_config.go index 0cb48c6357..4b51771cee 100644 --- a/internal/vpn/client_config.go +++ b/internal/vpn/client_config.go @@ -1,7 +1,7 @@ // Package vpn internal/vpn/client_config.go package vpn -import "github.com/skycoin/skywire-utilities/pkg/cipher" +import "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" // ClientConfig is a configuration for VPN client. type ClientConfig struct { diff --git a/internal/vpn/env.go b/internal/vpn/env.go index c424d7b3e0..d4a9acbc41 100644 --- a/internal/vpn/env.go +++ b/internal/vpn/env.go @@ -10,7 +10,7 @@ import ( "github.com/skycoin/dmsg/pkg/dmsgcurl" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) const ( diff --git a/internal/vpn/server.go b/internal/vpn/server.go index da38c98185..bbc11c9c26 100644 --- a/internal/vpn/server.go +++ b/internal/vpn/server.go @@ -9,9 +9,9 @@ import ( "strings" "sync" - "github.com/skycoin/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/app" "github.com/skycoin/skywire/pkg/app/appserver" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" ) // Server is a VPN server. diff --git a/pkg/app/appcommon/log_store.go b/pkg/app/appcommon/log_store.go index 88b732c922..7558f0c5db 100644 --- a/pkg/app/appcommon/log_store.go +++ b/pkg/app/appcommon/log_store.go @@ -13,7 +13,7 @@ import ( log "github.com/sirupsen/logrus" "go.etcd.io/bbolt" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) const ( diff --git a/pkg/app/appcommon/proc_config.go b/pkg/app/appcommon/proc_config.go index fa7e1ee52c..533a27b27c 100644 --- a/pkg/app/appcommon/proc_config.go +++ b/pkg/app/appcommon/proc_config.go @@ -11,8 +11,8 @@ import ( "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) const ( diff --git a/pkg/app/appdisc/factory.go b/pkg/app/appdisc/factory.go index 9b193610eb..e37c73adea 100644 --- a/pkg/app/appdisc/factory.go +++ b/pkg/app/appdisc/factory.go @@ -8,11 +8,11 @@ import ( "github.com/sirupsen/logrus" "github.com/skycoin/skywire" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appcommon" "github.com/skycoin/skywire/pkg/servicedisc" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // Factory creates appdisc.Updater instances based on the app name. diff --git a/pkg/app/appevent/broadcaster.go b/pkg/app/appevent/broadcaster.go index d782c6635e..1bf3441816 100644 --- a/pkg/app/appevent/broadcaster.go +++ b/pkg/app/appevent/broadcaster.go @@ -8,7 +8,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // Broadcaster combines multiple RPCClients (which connects to the RPCGateway of the apps). diff --git a/pkg/app/appevent/rpc.go b/pkg/app/appevent/rpc.go index 4d5e03b346..0cc2d372c0 100644 --- a/pkg/app/appevent/rpc.go +++ b/pkg/app/appevent/rpc.go @@ -9,8 +9,8 @@ import ( "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appcommon" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // RPCGateway represents the RPC gateway that opens up an app for incoming events from visor. diff --git a/pkg/app/appnet/addr.go b/pkg/app/appnet/addr.go index 37d512bcf9..1970bffda8 100644 --- a/pkg/app/appnet/addr.go +++ b/pkg/app/appnet/addr.go @@ -8,8 +8,8 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) var ( diff --git a/pkg/app/appnet/addr_test.go b/pkg/app/appnet/addr_test.go index 02b8829ba4..3da56d89fb 100644 --- a/pkg/app/appnet/addr_test.go +++ b/pkg/app/appnet/addr_test.go @@ -8,8 +8,8 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) func TestConvertAddr(t *testing.T) { diff --git a/pkg/app/appnet/dmsg_networker.go b/pkg/app/appnet/dmsg_networker.go index 2c2a365fb8..bae30a3ee6 100644 --- a/pkg/app/appnet/dmsg_networker.go +++ b/pkg/app/appnet/dmsg_networker.go @@ -8,7 +8,7 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // DmsgNetworker implements `Networker` for dmsg network. diff --git a/pkg/app/appnet/forwarding.go b/pkg/app/appnet/forwarding.go index fdc9d48d83..b8e08d73b1 100644 --- a/pkg/app/appnet/forwarding.go +++ b/pkg/app/appnet/forwarding.go @@ -12,7 +12,7 @@ import ( "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // nolint: gochecknoglobals diff --git a/pkg/app/appnet/http_transport.go b/pkg/app/appnet/http_transport.go index 4875b238f3..8a0fda2603 100644 --- a/pkg/app/appnet/http_transport.go +++ b/pkg/app/appnet/http_transport.go @@ -6,7 +6,7 @@ import ( "net" "net/http" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // HTTPTransport implements http.RoundTripper diff --git a/pkg/app/appnet/mock_networker.go b/pkg/app/appnet/mock_networker.go index 11a1d2efb8..06bab8dfc4 100644 --- a/pkg/app/appnet/mock_networker.go +++ b/pkg/app/appnet/mock_networker.go @@ -8,7 +8,7 @@ import ( mock "github.com/stretchr/testify/mock" - cipher "github.com/skycoin/skywire-utilities/pkg/cipher" + cipher "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // MockNetworker is an autogenerated mock type for the Networker type diff --git a/pkg/app/appnet/networker.go b/pkg/app/appnet/networker.go index e57571a8e2..5005598d1e 100644 --- a/pkg/app/appnet/networker.go +++ b/pkg/app/appnet/networker.go @@ -7,7 +7,7 @@ import ( "net" "sync" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) //go:generate mockery --name Networker --case underscore --inpackage diff --git a/pkg/app/appnet/networker_test.go b/pkg/app/appnet/networker_test.go index e059a3fb4b..b4bc8be3e1 100644 --- a/pkg/app/appnet/networker_test.go +++ b/pkg/app/appnet/networker_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) func TestAddNetworker(t *testing.T) { diff --git a/pkg/app/appnet/skywire_networker.go b/pkg/app/appnet/skywire_networker.go index 1b2d4ea8e9..e7468cba69 100644 --- a/pkg/app/appnet/skywire_networker.go +++ b/pkg/app/appnet/skywire_networker.go @@ -12,10 +12,10 @@ import ( "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/router" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" ) var ( diff --git a/pkg/app/appserver/proc.go b/pkg/app/appserver/proc.go index a46a373ea5..8d916d0f27 100644 --- a/pkg/app/appserver/proc.go +++ b/pkg/app/appserver/proc.go @@ -19,12 +19,12 @@ import ( "github.com/orandin/lumberjackrus" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appcommon" "github.com/skycoin/skywire/pkg/app/appdisc" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) var ( diff --git a/pkg/app/appserver/proc_manager.go b/pkg/app/appserver/proc_manager.go index 6801b961a2..b3db19b097 100644 --- a/pkg/app/appserver/proc_manager.go +++ b/pkg/app/appserver/proc_manager.go @@ -11,11 +11,11 @@ import ( "sync" "time" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appcommon" "github.com/skycoin/skywire/pkg/app/appdisc" "github.com/skycoin/skywire/pkg/app/appevent" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) //go:generate mockery --name ProcManager --case underscore --inpackage diff --git a/pkg/app/appserver/proc_manager_test.go b/pkg/app/appserver/proc_manager_test.go index 5aeefa507d..065097a620 100644 --- a/pkg/app/appserver/proc_manager_test.go +++ b/pkg/app/appserver/proc_manager_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/cipher" appcommon "github.com/skycoin/skywire/pkg/app/appcommon" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) func TestProcManager_ProcByName(t *testing.T) { diff --git a/pkg/app/appserver/rpc_ingress_client_test.go b/pkg/app/appserver/rpc_ingress_client_test.go index 1cee402dfb..ff347344a8 100644 --- a/pkg/app/appserver/rpc_ingress_client_test.go +++ b/pkg/app/appserver/rpc_ingress_client_test.go @@ -15,11 +15,11 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/net/nettest" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/internal/testhelpers" "github.com/skycoin/skywire/pkg/app/appcommon" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) func TestRPCIngressClient_SetDetailedStatus(t *testing.T) { diff --git a/pkg/app/appserver/rpc_ingress_gateway.go b/pkg/app/appserver/rpc_ingress_gateway.go index cb9c18c5de..8c6ba33f3f 100644 --- a/pkg/app/appserver/rpc_ingress_gateway.go +++ b/pkg/app/appserver/rpc_ingress_gateway.go @@ -8,10 +8,10 @@ import ( "net" "time" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/app/idmanager" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/util/rpcutil" ) diff --git a/pkg/app/appserver/rpc_ingress_gateway_test.go b/pkg/app/appserver/rpc_ingress_gateway_test.go index 59209e5c2d..548d3f2748 100644 --- a/pkg/app/appserver/rpc_ingress_gateway_test.go +++ b/pkg/app/appserver/rpc_ingress_gateway_test.go @@ -15,13 +15,13 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/internal/testhelpers" "github.com/skycoin/skywire/pkg/app/appcommon" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/app/idmanager" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) func TestRPCIngressGateway_SetDetailedStatus(t *testing.T) { diff --git a/pkg/app/client_test.go b/pkg/app/client_test.go index 3ddad39ab3..6b43011a54 100644 --- a/pkg/app/client_test.go +++ b/pkg/app/client_test.go @@ -7,13 +7,13 @@ import ( "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appcommon" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/app/idmanager" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) func TestClient_Dial(t *testing.T) { diff --git a/pkg/app/conn_test.go b/pkg/app/conn_test.go index 6398db8f5b..e835b3c562 100644 --- a/pkg/app/conn_test.go +++ b/pkg/app/conn_test.go @@ -12,13 +12,13 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/net/nettest" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/internal/testhelpers" "github.com/skycoin/skywire/pkg/app/appcommon" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/app/idmanager" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/util/cipherutil" ) diff --git a/pkg/app/launcher/launcher.go b/pkg/app/launcher/launcher.go index ad5ce0045e..6ea4ee9a1f 100644 --- a/pkg/app/launcher/launcher.go +++ b/pkg/app/launcher/launcher.go @@ -16,11 +16,11 @@ import ( "github.com/sirupsen/logrus" "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/app/appcommon" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/router" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/util/pathutil" ) diff --git a/pkg/app/listener_test.go b/pkg/app/listener_test.go index e4869862e4..7c31bdf69f 100644 --- a/pkg/app/listener_test.go +++ b/pkg/app/listener_test.go @@ -7,12 +7,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/app/idmanager" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) func TestListener_Accept(t *testing.T) { diff --git a/pkg/dmsgc/dmsgc.go b/pkg/dmsgc/dmsgc.go index 0313b01b88..feaad32eb4 100644 --- a/pkg/dmsgc/dmsgc.go +++ b/pkg/dmsgc/dmsgc.go @@ -8,9 +8,9 @@ import ( "github.com/skycoin/dmsg/pkg/disc" "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appevent" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // DmsgConfig defines config for Dmsg network. diff --git a/pkg/routefinder/rfclient/client.go b/pkg/routefinder/rfclient/client.go index 4bcae562cb..a9322de00e 100644 --- a/pkg/routefinder/rfclient/client.go +++ b/pkg/routefinder/rfclient/client.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) //go:generate mockery -name Client -case underscore -inpkg diff --git a/pkg/router/dmsg_wrapper.go b/pkg/router/dmsg_wrapper.go index adb093d88c..4558c750f7 100644 --- a/pkg/router/dmsg_wrapper.go +++ b/pkg/router/dmsg_wrapper.go @@ -7,7 +7,7 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/pkg/router/id_reserver.go b/pkg/router/id_reserver.go index 05dd78eb62..ae3053bff0 100644 --- a/pkg/router/id_reserver.go +++ b/pkg/router/id_reserver.go @@ -9,8 +9,8 @@ import ( "io" "sync" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/pkg/router/id_reserver_test.go b/pkg/router/id_reserver_test.go index c80aa6a496..60eab89e32 100644 --- a/pkg/router/id_reserver_test.go +++ b/pkg/router/id_reserver_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // We check the contents of 'idReserver.rec' is as expected after calling 'NewIDReserver'. diff --git a/pkg/router/map.go b/pkg/router/map.go index 8bd0b477f1..8b5996784c 100644 --- a/pkg/router/map.go +++ b/pkg/router/map.go @@ -4,7 +4,7 @@ package router import ( "context" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/pkg/router/map_test.go b/pkg/router/map_test.go index 87ec8a278d..bfa9a9a03f 100644 --- a/pkg/router/map_test.go +++ b/pkg/router/map_test.go @@ -16,9 +16,9 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/net/nettest" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/pkg/router/mock_id_reserver.go b/pkg/router/mock_id_reserver.go index cb4428afce..4fb0152384 100644 --- a/pkg/router/mock_id_reserver.go +++ b/pkg/router/mock_id_reserver.go @@ -7,8 +7,8 @@ import ( mock "github.com/stretchr/testify/mock" - cipher "github.com/skycoin/skywire-utilities/pkg/cipher" routing "github.com/skycoin/skywire/pkg/routing" + cipher "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // MockIDReserver is an autogenerated mock type for the IDReserver type diff --git a/pkg/router/mock_route_group_dialer.go b/pkg/router/mock_route_group_dialer.go index a0d53a7cb8..7451611865 100644 --- a/pkg/router/mock_route_group_dialer.go +++ b/pkg/router/mock_route_group_dialer.go @@ -8,9 +8,9 @@ import ( dmsg "github.com/skycoin/dmsg/pkg/dmsg" mock "github.com/stretchr/testify/mock" - cipher "github.com/skycoin/skywire-utilities/pkg/cipher" - logging "github.com/skycoin/skywire-utilities/pkg/logging" routing "github.com/skycoin/skywire/pkg/routing" + cipher "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + logging "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // MockRouteGroupDialer is an autogenerated mock type for the RouteGroupDialer type diff --git a/pkg/router/mock_router.go b/pkg/router/mock_router.go index 00c1ab61c8..af5fe501b1 100644 --- a/pkg/router/mock_router.go +++ b/pkg/router/mock_router.go @@ -8,8 +8,8 @@ import ( mock "github.com/stretchr/testify/mock" - cipher "github.com/skycoin/skywire-utilities/pkg/cipher" routing "github.com/skycoin/skywire/pkg/routing" + cipher "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // MockRouter is an autogenerated mock type for the Router type diff --git a/pkg/router/route_group.go b/pkg/router/route_group.go index cccd1cdbd6..768999ae92 100644 --- a/pkg/router/route_group.go +++ b/pkg/router/route_group.go @@ -15,8 +15,8 @@ import ( "github.com/skycoin/dmsg/pkg/ioutil" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/util/deadline" ) diff --git a/pkg/router/route_group_test.go b/pkg/router/route_group_test.go index ac3365b27e..764060ffc9 100644 --- a/pkg/router/route_group_test.go +++ b/pkg/router/route_group_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) func TestNewRouteGroup(t *testing.T) { diff --git a/pkg/router/router.go b/pkg/router/router.go index 8c509ff08b..0094e2046a 100644 --- a/pkg/router/router.go +++ b/pkg/router/router.go @@ -15,11 +15,11 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/dmsg/pkg/noise" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/routefinder/rfclient" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/pkg/router/router_test.go b/pkg/router/router_test.go index 95fd91f3b8..973f338a73 100644 --- a/pkg/router/router_test.go +++ b/pkg/router/router_test.go @@ -8,7 +8,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport" ) diff --git a/pkg/router/routerclient.go b/pkg/router/routerclient.go index 4a7f459079..b81bcfa420 100644 --- a/pkg/router/routerclient.go +++ b/pkg/router/routerclient.go @@ -9,10 +9,10 @@ import ( "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/pkg/router/routerclient_test.go b/pkg/router/routerclient_test.go index f974b82acd..f2ba6ce84b 100644 --- a/pkg/router/routerclient_test.go +++ b/pkg/router/routerclient_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/net/nettest" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/internal/testhelpers" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) func TestClient_Close(t *testing.T) { diff --git a/pkg/router/rpc_gateway.go b/pkg/router/rpc_gateway.go index 99e1a288e4..0ad54df861 100644 --- a/pkg/router/rpc_gateway.go +++ b/pkg/router/rpc_gateway.go @@ -2,8 +2,8 @@ package router import ( - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // RPCGateway is a RPC interface for router. diff --git a/pkg/router/rpc_gateway_test.go b/pkg/router/rpc_gateway_test.go index 2c5d143579..1b49b2d849 100644 --- a/pkg/router/rpc_gateway_test.go +++ b/pkg/router/rpc_gateway_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/internal/testhelpers" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) var mlog = logging.NewMasterLogger() diff --git a/pkg/router/setup_rpc_gateway.go b/pkg/router/setup_rpc_gateway.go index 53bce1d71a..fa0a404298 100644 --- a/pkg/router/setup_rpc_gateway.go +++ b/pkg/router/setup_rpc_gateway.go @@ -6,10 +6,10 @@ import ( "net" "time" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/router/setupmetrics" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/pkg/router/setupclient.go b/pkg/router/setupclient.go index f795fb2048..89baec4510 100644 --- a/pkg/router/setupclient.go +++ b/pkg/router/setupclient.go @@ -9,10 +9,10 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) const rpcName = "SetupRPCGateway" diff --git a/pkg/router/setupconfig.go b/pkg/router/setupconfig.go index b9f4949f43..bcb95b7504 100644 --- a/pkg/router/setupconfig.go +++ b/pkg/router/setupconfig.go @@ -4,8 +4,8 @@ package router import ( "time" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/dmsgc" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // Various timeouts for setup node. diff --git a/pkg/router/setupmetrics/victoria_metrics.go b/pkg/router/setupmetrics/victoria_metrics.go index 6a2b592929..69a8553a5a 100644 --- a/pkg/router/setupmetrics/victoria_metrics.go +++ b/pkg/router/setupmetrics/victoria_metrics.go @@ -6,8 +6,8 @@ import ( "github.com/VictoriaMetrics/metrics" - "github.com/skycoin/skywire-utilities/pkg/metricsutil" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil" ) // Metrics collects metrics in prometheus format. diff --git a/pkg/router/setupnode.go b/pkg/router/setupnode.go index 95f930fcfa..74fde7a0a9 100644 --- a/pkg/router/setupnode.go +++ b/pkg/router/setupnode.go @@ -13,11 +13,11 @@ import ( "github.com/skycoin/dmsg/pkg/disc" "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/router/setupmetrics" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/pkg/router/setupnode_test.go b/pkg/router/setupnode_test.go index 5b662441d2..447615bb60 100644 --- a/pkg/router/setupnode_test.go +++ b/pkg/router/setupnode_test.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/router/setupmetrics" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) func TestCreateRouteGroup(t *testing.T) { diff --git a/pkg/router/testing_test.go b/pkg/router/testing_test.go index b7cc47054e..f95c7367f8 100644 --- a/pkg/router/testing_test.go +++ b/pkg/router/testing_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/pkg/router/wrappers.go b/pkg/router/wrappers.go index 9120332eff..b3b31049b5 100644 --- a/pkg/router/wrappers.go +++ b/pkg/router/wrappers.go @@ -7,9 +7,9 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) //go:generate mockery -name RouteGroupDialer -case underscore -inpkg diff --git a/pkg/routing/addr.go b/pkg/routing/addr.go index 005d83a73d..de38e824eb 100644 --- a/pkg/routing/addr.go +++ b/pkg/routing/addr.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // Port is a network port number diff --git a/pkg/routing/route.go b/pkg/routing/route.go index 8c271e6d0e..40409453ca 100644 --- a/pkg/routing/route.go +++ b/pkg/routing/route.go @@ -11,7 +11,7 @@ import ( "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // Route is a succession of transport entries that denotes a path from source visor to destination visor diff --git a/pkg/routing/route_descriptor.go b/pkg/routing/route_descriptor.go index 3a47e508b2..c79e4eb149 100644 --- a/pkg/routing/route_descriptor.go +++ b/pkg/routing/route_descriptor.go @@ -5,7 +5,7 @@ import ( "encoding/binary" "fmt" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // RouteDescriptor describes a route (from the perspective of the source and destination edges). diff --git a/pkg/routing/route_descriptor_test.go b/pkg/routing/route_descriptor_test.go index 5cb0e03f8a..e96718d12f 100644 --- a/pkg/routing/route_descriptor_test.go +++ b/pkg/routing/route_descriptor_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) func TestRouteDescriptor(t *testing.T) { diff --git a/pkg/routing/rule.go b/pkg/routing/rule.go index a0411bd5e5..7dd150001a 100644 --- a/pkg/routing/rule.go +++ b/pkg/routing/rule.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // RuleHeaderSize represents the base size of a rule. diff --git a/pkg/routing/rule_test.go b/pkg/routing/rule_test.go index f4512d1a10..3d1968b1b9 100644 --- a/pkg/routing/rule_test.go +++ b/pkg/routing/rule_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/assert" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) func TestConsumeRule(t *testing.T) { diff --git a/pkg/routing/table.go b/pkg/routing/table.go index 7710b97b7d..b1a2c54c2d 100644 --- a/pkg/routing/table.go +++ b/pkg/routing/table.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) var ( diff --git a/pkg/routing/table_test.go b/pkg/routing/table_test.go index 60b7b0097e..704800a0bb 100644 --- a/pkg/routing/table_test.go +++ b/pkg/routing/table_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) func TestMain(m *testing.M) { diff --git a/pkg/servicedisc/autoconnect.go b/pkg/servicedisc/autoconnect.go index 3cc1ac4f0d..3f25e061e8 100644 --- a/pkg/servicedisc/autoconnect.go +++ b/pkg/servicedisc/autoconnect.go @@ -10,9 +10,9 @@ import ( "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/netutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/pkg/servicedisc/client.go b/pkg/servicedisc/client.go index e10a5c1395..f1e2702693 100644 --- a/pkg/servicedisc/client.go +++ b/pkg/servicedisc/client.go @@ -16,11 +16,11 @@ import ( "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/internal/httpauth" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" ) // ErrVisorUnreachable is returned when visor is not reachable diff --git a/pkg/servicedisc/types.go b/pkg/servicedisc/types.go index 9e9b2c5b40..34eb4dac44 100644 --- a/pkg/servicedisc/types.go +++ b/pkg/servicedisc/types.go @@ -12,8 +12,8 @@ import ( pq "github.com/lib/pq" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/geo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/geo" ) const ( diff --git a/pkg/servicedisc/types_test.go b/pkg/servicedisc/types_test.go index 6b88388223..ffff1d04ef 100644 --- a/pkg/servicedisc/types_test.go +++ b/pkg/servicedisc/types_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) func TestProxy_MarshalBinary(t *testing.T) { diff --git a/pkg/skywire-utilities/pkg/cipher/cipher_test.go b/pkg/skywire-utilities/pkg/cipher/cipher_test.go index 9cd85ee83b..15609a1a07 100644 --- a/pkg/skywire-utilities/pkg/cipher/cipher_test.go +++ b/pkg/skywire-utilities/pkg/cipher/cipher_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) func TestMain(m *testing.M) { diff --git a/pkg/skywire-utilities/pkg/cmdutil/catch_test.go b/pkg/skywire-utilities/pkg/cmdutil/catch_test.go index 4f096a5fac..b121693966 100644 --- a/pkg/skywire-utilities/pkg/cmdutil/catch_test.go +++ b/pkg/skywire-utilities/pkg/cmdutil/catch_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) func TestCatch(t *testing.T) { diff --git a/pkg/skywire-utilities/pkg/cmdutil/service_flags.go b/pkg/skywire-utilities/pkg/cmdutil/service_flags.go index c8a8d7c98d..e8823d42c9 100644 --- a/pkg/skywire-utilities/pkg/cmdutil/service_flags.go +++ b/pkg/skywire-utilities/pkg/cmdutil/service_flags.go @@ -12,7 +12,7 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/spf13/cobra" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // Associated errors. diff --git a/pkg/skywire-utilities/pkg/cmdutil/sysloghook_unix.go b/pkg/skywire-utilities/pkg/cmdutil/sysloghook_unix.go index 0a90281097..e9184ebd50 100644 --- a/pkg/skywire-utilities/pkg/cmdutil/sysloghook_unix.go +++ b/pkg/skywire-utilities/pkg/cmdutil/sysloghook_unix.go @@ -11,7 +11,7 @@ import ( "github.com/sirupsen/logrus" logrussyslog "github.com/sirupsen/logrus/hooks/syslog" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) func (sf *ServiceFlags) sysLogHook(log *logging.Logger, sysLvl int) { diff --git a/pkg/skywire-utilities/pkg/cmdutil/sysloghook_windows.go b/pkg/skywire-utilities/pkg/cmdutil/sysloghook_windows.go index 83ddf4f8d5..9690fb7d55 100644 --- a/pkg/skywire-utilities/pkg/cmdutil/sysloghook_windows.go +++ b/pkg/skywire-utilities/pkg/cmdutil/sysloghook_windows.go @@ -9,7 +9,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) func (sf *ServiceFlags) sysLogHook(_ *logging.Logger, _ int) { diff --git a/pkg/skywire-utilities/pkg/geo/geo.go b/pkg/skywire-utilities/pkg/geo/geo.go index 031f06f64b..9b80290a67 100644 --- a/pkg/skywire-utilities/pkg/geo/geo.go +++ b/pkg/skywire-utilities/pkg/geo/geo.go @@ -11,8 +11,8 @@ import ( "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/netutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" ) // Errors associated with geo calls. diff --git a/pkg/skywire-utilities/pkg/httpauth/auth.go b/pkg/skywire-utilities/pkg/httpauth/auth.go index 2f2d99fd4f..05c4a0660d 100644 --- a/pkg/skywire-utilities/pkg/httpauth/auth.go +++ b/pkg/skywire-utilities/pkg/httpauth/auth.go @@ -9,7 +9,7 @@ import ( "net/http" "strconv" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // Auth holds authentication mandatory values diff --git a/pkg/skywire-utilities/pkg/httpauth/handler.go b/pkg/skywire-utilities/pkg/httpauth/handler.go index 2d6a992a27..e1b919474e 100644 --- a/pkg/skywire-utilities/pkg/httpauth/handler.go +++ b/pkg/skywire-utilities/pkg/httpauth/handler.go @@ -10,9 +10,9 @@ import ( "net/url" "strings" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) var ( diff --git a/pkg/skywire-utilities/pkg/httpauth/handler_test.go b/pkg/skywire-utilities/pkg/httpauth/handler_test.go index 80aa050599..eb19a25250 100644 --- a/pkg/skywire-utilities/pkg/httpauth/handler_test.go +++ b/pkg/skywire-utilities/pkg/httpauth/handler_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/storeconfig" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/storeconfig" ) var testPubKey, testSec = cipher.GenerateKeyPair() diff --git a/pkg/skywire-utilities/pkg/httpauth/memory_store.go b/pkg/skywire-utilities/pkg/httpauth/memory_store.go index b0b4151dc0..3831c8772b 100644 --- a/pkg/skywire-utilities/pkg/httpauth/memory_store.go +++ b/pkg/skywire-utilities/pkg/httpauth/memory_store.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) type memStore struct { diff --git a/pkg/skywire-utilities/pkg/httpauth/nonce-storer.go b/pkg/skywire-utilities/pkg/httpauth/nonce-storer.go index e2f8fe7bb7..4214b3b32a 100644 --- a/pkg/skywire-utilities/pkg/httpauth/nonce-storer.go +++ b/pkg/skywire-utilities/pkg/httpauth/nonce-storer.go @@ -5,8 +5,8 @@ import ( "context" "fmt" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/storeconfig" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/storeconfig" ) // Nonce is used to sign requests in order to avoid replay attack diff --git a/pkg/skywire-utilities/pkg/httpauth/redis-store.go b/pkg/skywire-utilities/pkg/httpauth/redis-store.go index f5525b5d67..f182ae3db3 100644 --- a/pkg/skywire-utilities/pkg/httpauth/redis-store.go +++ b/pkg/skywire-utilities/pkg/httpauth/redis-store.go @@ -10,7 +10,7 @@ import ( "github.com/go-redis/redis/v8" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) type redisStore struct { diff --git a/pkg/skywire-utilities/pkg/httputil/health.go b/pkg/skywire-utilities/pkg/httputil/health.go index 015071d7e3..38737f96f5 100644 --- a/pkg/skywire-utilities/pkg/httputil/health.go +++ b/pkg/skywire-utilities/pkg/httputil/health.go @@ -6,7 +6,7 @@ import ( "net/http" "time" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" ) var path = "/health" diff --git a/pkg/skywire-utilities/pkg/httputil/httputil.go b/pkg/skywire-utilities/pkg/httputil/httputil.go index f63b08baaf..7583622446 100644 --- a/pkg/skywire-utilities/pkg/httputil/httputil.go +++ b/pkg/skywire-utilities/pkg/httputil/httputil.go @@ -12,7 +12,7 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) var json = jsoniter.ConfigFastest diff --git a/pkg/skywire-utilities/pkg/netutil/net_test.go b/pkg/skywire-utilities/pkg/netutil/net_test.go index 0874ac0992..f4a1765ec8 100644 --- a/pkg/skywire-utilities/pkg/netutil/net_test.go +++ b/pkg/skywire-utilities/pkg/netutil/net_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/netutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" ) func TestDefaultNetworkInterfaceIPs(t *testing.T) { diff --git a/pkg/transport/discovery.go b/pkg/transport/discovery.go index aaf93df3c0..b1e245cdf7 100644 --- a/pkg/transport/discovery.go +++ b/pkg/transport/discovery.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // DiscoveryClient performs Transport discovery operations. diff --git a/pkg/transport/discovery_test.go b/pkg/transport/discovery_test.go index 33e3d17d4c..3330981277 100644 --- a/pkg/transport/discovery_test.go +++ b/pkg/transport/discovery_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport" ) diff --git a/pkg/transport/entry.go b/pkg/transport/entry.go index 17952dc009..11d2182b92 100644 --- a/pkg/transport/entry.go +++ b/pkg/transport/entry.go @@ -7,7 +7,7 @@ import ( "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/pkg/transport/entry_test.go b/pkg/transport/entry_test.go index 652a0a3aea..a80d07ec59 100644 --- a/pkg/transport/entry_test.go +++ b/pkg/transport/entry_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport" ) diff --git a/pkg/transport/handshake.go b/pkg/transport/handshake.go index 1f9bea6884..707592937d 100644 --- a/pkg/transport/handshake.go +++ b/pkg/transport/handshake.go @@ -9,9 +9,9 @@ import ( "io" "net/http" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/pkg/transport/log.go b/pkg/transport/log.go index c16eea21a2..d5f6654642 100644 --- a/pkg/transport/log.go +++ b/pkg/transport/log.go @@ -17,7 +17,7 @@ import ( "github.com/gocarina/gocsv" "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) const dateFormat string = "2006-01-02" diff --git a/pkg/transport/log_test.go b/pkg/transport/log_test.go index df779e25ed..f41942c0f8 100644 --- a/pkg/transport/log_test.go +++ b/pkg/transport/log_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport" ) diff --git a/pkg/transport/managed_transport.go b/pkg/transport/managed_transport.go index 0584200bbb..2fef47f522 100644 --- a/pkg/transport/managed_transport.go +++ b/pkg/transport/managed_transport.go @@ -12,13 +12,13 @@ import ( "sync/atomic" "time" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/app/appevent" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/pkg/transport/manager.go b/pkg/transport/manager.go index 07a6db977f..9a8d934f90 100644 --- a/pkg/transport/manager.go +++ b/pkg/transport/manager.go @@ -12,11 +12,11 @@ import ( "github.com/google/uuid" "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appevent" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport/network" "github.com/skycoin/skywire/pkg/transport/network/addrresolver" ) diff --git a/pkg/transport/manager_test.go b/pkg/transport/manager_test.go index 581685e605..5c8a21afb3 100644 --- a/pkg/transport/manager_test.go +++ b/pkg/transport/manager_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport" ) diff --git a/pkg/transport/network/addrresolver/client.go b/pkg/transport/network/addrresolver/client.go index 514e8f1d7e..0d5a0759b1 100644 --- a/pkg/transport/network/addrresolver/client.go +++ b/pkg/transport/network/addrresolver/client.go @@ -18,11 +18,11 @@ import ( "github.com/AudriusButkevicius/pfilter" "github.com/xtaci/kcp-go" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/internal/httpauth" "github.com/skycoin/skywire/internal/packetfilter" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" ) const ( diff --git a/pkg/transport/network/addrresolver/client_test.go b/pkg/transport/network/addrresolver/client_test.go index f35f4853a3..d7cf6b15bc 100644 --- a/pkg/transport/network/addrresolver/client_test.go +++ b/pkg/transport/network/addrresolver/client_test.go @@ -14,9 +14,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/internal/httpauth" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) var ( diff --git a/pkg/transport/network/addrresolver/mock_api_client.go b/pkg/transport/network/addrresolver/mock_api_client.go index 5ed5136826..6ad5f70897 100644 --- a/pkg/transport/network/addrresolver/mock_api_client.go +++ b/pkg/transport/network/addrresolver/mock_api_client.go @@ -8,7 +8,7 @@ import ( pfilter "github.com/AudriusButkevicius/pfilter" mock "github.com/stretchr/testify/mock" - cipher "github.com/skycoin/skywire-utilities/pkg/cipher" + cipher "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // MockAPIClient is an autogenerated mock type for the APIClient type diff --git a/pkg/transport/network/client.go b/pkg/transport/network/client.go index 2742f88db9..44ce48f9d9 100644 --- a/pkg/transport/network/client.go +++ b/pkg/transport/network/client.go @@ -12,9 +12,9 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appevent" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport/network/addrresolver" "github.com/skycoin/skywire/pkg/transport/network/handshake" "github.com/skycoin/skywire/pkg/transport/network/porter" diff --git a/pkg/transport/network/connection.go b/pkg/transport/network/connection.go index 668fb62d5d..41521fe469 100644 --- a/pkg/transport/network/connection.go +++ b/pkg/transport/network/connection.go @@ -9,8 +9,8 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/dmsg/pkg/noise" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport/network/handshake" ) diff --git a/pkg/transport/network/dmsg.go b/pkg/transport/network/dmsg.go index b990c36b9e..db83d1f6eb 100644 --- a/pkg/transport/network/dmsg.go +++ b/pkg/transport/network/dmsg.go @@ -8,7 +8,7 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // dmsgClientAdapter is a wrapper around dmsg.Client to conform to Client diff --git a/pkg/transport/network/handshake/handshake.go b/pkg/transport/network/handshake/handshake.go index 32f3a8a258..513694f529 100644 --- a/pkg/transport/network/handshake/handshake.go +++ b/pkg/transport/network/handshake/handshake.go @@ -12,7 +12,7 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) const ( diff --git a/pkg/transport/network/handshake/handshake_test.go b/pkg/transport/network/handshake/handshake_test.go index 45331d0c87..6018aaf559 100644 --- a/pkg/transport/network/handshake/handshake_test.go +++ b/pkg/transport/network/handshake/handshake_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) const ( diff --git a/pkg/transport/network/listener.go b/pkg/transport/network/listener.go index 4bb2b3784f..f91176289a 100644 --- a/pkg/transport/network/listener.go +++ b/pkg/transport/network/listener.go @@ -8,7 +8,7 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // Listener represents a skywire network listener. It wraps net.Listener diff --git a/pkg/transport/network/mock_dialer.go b/pkg/transport/network/mock_dialer.go index 7de80431af..c9049803fc 100644 --- a/pkg/transport/network/mock_dialer.go +++ b/pkg/transport/network/mock_dialer.go @@ -8,7 +8,7 @@ import ( mock "github.com/stretchr/testify/mock" - cipher "github.com/skycoin/skywire-utilities/pkg/cipher" + cipher "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // MockDialer is an autogenerated mock type for the Dialer type diff --git a/pkg/transport/network/network.go b/pkg/transport/network/network.go index 8ea2b0170e..938e2933ba 100644 --- a/pkg/transport/network/network.go +++ b/pkg/transport/network/network.go @@ -6,7 +6,7 @@ import ( "errors" "net" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // Type is a type of network. Type affects the way connection is established diff --git a/pkg/transport/network/stcp.go b/pkg/transport/network/stcp.go index 1595a43b2b..87cfddcb6e 100644 --- a/pkg/transport/network/stcp.go +++ b/pkg/transport/network/stcp.go @@ -7,7 +7,7 @@ import ( "io" "net" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport/network/stcp" ) diff --git a/pkg/transport/network/stcp/pktable.go b/pkg/transport/network/stcp/pktable.go index eddb8551bd..8065dc4e4e 100644 --- a/pkg/transport/network/stcp/pktable.go +++ b/pkg/transport/network/stcp/pktable.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) const expectedFieldsLen = 2 diff --git a/pkg/transport/network/stcpr.go b/pkg/transport/network/stcpr.go index 3e882ca59f..8690a45313 100644 --- a/pkg/transport/network/stcpr.go +++ b/pkg/transport/network/stcpr.go @@ -8,8 +8,8 @@ import ( "net" "time" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/netutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" ) type stcprClient struct { diff --git a/pkg/transport/network/stun_client.go b/pkg/transport/network/stun_client.go index cf3d81bd6d..3e28b30edc 100644 --- a/pkg/transport/network/stun_client.go +++ b/pkg/transport/network/stun_client.go @@ -4,7 +4,7 @@ package network import ( "github.com/ccding/go-stun/stun" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // StunDetails represents the visors public network details. diff --git a/pkg/transport/network/sudph.go b/pkg/transport/network/sudph.go index e03785e96e..c6c01bea4c 100644 --- a/pkg/transport/network/sudph.go +++ b/pkg/transport/network/sudph.go @@ -12,8 +12,8 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" "github.com/xtaci/kcp-go" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/internal/packetfilter" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport/network/addrresolver" "github.com/skycoin/skywire/pkg/transport/network/handshake" ) diff --git a/pkg/transport/setup/rpc.go b/pkg/transport/setup/rpc.go index 3fd4d1f42a..7754ca19fa 100644 --- a/pkg/transport/setup/rpc.go +++ b/pkg/transport/setup/rpc.go @@ -7,8 +7,8 @@ import ( "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/pkg/transport/setup/visor.go b/pkg/transport/setup/visor.go index c62a44693c..8a7aff5c26 100644 --- a/pkg/transport/setup/visor.go +++ b/pkg/transport/setup/visor.go @@ -9,9 +9,9 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport" ) diff --git a/pkg/transport/tpdclient/client.go b/pkg/transport/tpdclient/client.go index b96e9c5356..d694f3483a 100644 --- a/pkg/transport/tpdclient/client.go +++ b/pkg/transport/tpdclient/client.go @@ -10,10 +10,10 @@ import ( "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/internal/httpauth" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport" ) diff --git a/pkg/transport/tpdclient/client_test.go b/pkg/transport/tpdclient/client_test.go index 7c23c67585..8d7749a115 100644 --- a/pkg/transport/tpdclient/client_test.go +++ b/pkg/transport/tpdclient/client_test.go @@ -16,9 +16,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/internal/httpauth" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport" ) diff --git a/pkg/transport/transport.go b/pkg/transport/transport.go index 2174a54690..b0061a0b99 100644 --- a/pkg/transport/transport.go +++ b/pkg/transport/transport.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/pkg/utclient/client.go b/pkg/utclient/client.go index eb2fbbbf2f..41fd2f7527 100644 --- a/pkg/utclient/client.go +++ b/pkg/utclient/client.go @@ -9,10 +9,10 @@ import ( "net/http" "time" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/internal/httpauth" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" ) //go:generate mockery -name APIClient -case underscore -inpkg diff --git a/pkg/utclient/client_test.go b/pkg/utclient/client_test.go index 72da1c5623..dfed5051fc 100644 --- a/pkg/utclient/client_test.go +++ b/pkg/utclient/client_test.go @@ -14,9 +14,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/internal/httpauth" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) var ( diff --git a/pkg/util/cipherutil/cipherutil.go b/pkg/util/cipherutil/cipherutil.go index 0d5407d1a4..0adc893cec 100644 --- a/pkg/util/cipherutil/cipherutil.go +++ b/pkg/util/cipherutil/cipherutil.go @@ -1,7 +1,7 @@ // Package cipherutil works with public keys package cipherutil -import "github.com/skycoin/skywire-utilities/pkg/cipher" +import "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" // KeyPair is a pair of public and secret keys type KeyPair struct { diff --git a/pkg/util/pathutil/configpath.go b/pkg/util/pathutil/configpath.go index 1479cafdea..89664c9c2a 100644 --- a/pkg/util/pathutil/configpath.go +++ b/pkg/util/pathutil/configpath.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) var log = logging.MustGetLogger("pathutil") diff --git a/pkg/visor/api.go b/pkg/visor/api.go index 2004b21a7f..39d878bf2c 100644 --- a/pkg/visor/api.go +++ b/pkg/visor/api.go @@ -21,16 +21,16 @@ import ( "github.com/google/uuid" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/app/appcommon" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/servicedisc" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/transport/network" "github.com/skycoin/skywire/pkg/visor/dmsgtracker" diff --git a/pkg/visor/cmd.go b/pkg/visor/cmd.go index 52458d75c1..31a23965c7 100644 --- a/pkg/visor/cmd.go +++ b/pkg/visor/cmd.go @@ -16,8 +16,8 @@ import ( "github.com/bitfield/script" "github.com/spf13/cobra" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/visor/visorconfig" ) diff --git a/pkg/visor/dmsgtracker/dmsg_tracker.go b/pkg/visor/dmsgtracker/dmsg_tracker.go index 6acbf1ea80..c5d375fd13 100644 --- a/pkg/visor/dmsgtracker/dmsg_tracker.go +++ b/pkg/visor/dmsgtracker/dmsg_tracker.go @@ -11,8 +11,8 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/dmsg/pkg/dmsgctrl" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/visor/visorconfig" ) diff --git a/pkg/visor/etc.go b/pkg/visor/etc.go index 02989ec6a3..0798670fdd 100644 --- a/pkg/visor/etc.go +++ b/pkg/visor/etc.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/cobra" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // func initPProf(log *logging.MasterLogger, profMode string, profAddr string) (stop func()) { diff --git a/pkg/visor/gui.go b/pkg/visor/gui.go index 3d3b60ca66..81d9d5b425 100644 --- a/pkg/visor/gui.go +++ b/pkg/visor/gui.go @@ -25,9 +25,9 @@ import ( "github.com/skycoin/systray" "github.com/toqueteos/webbrowser" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/servicedisc" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/visor/visorconfig" "github.com/skycoin/skywire/static/icons" ) diff --git a/pkg/visor/hypervisor.go b/pkg/visor/hypervisor.go index 0df9842888..b4dc9d0b0d 100644 --- a/pkg/visor/hypervisor.go +++ b/pkg/visor/hypervisor.go @@ -23,13 +23,13 @@ import ( "github.com/skycoin/dmsg/pkg/dmsgpty" coincipher "github.com/skycoin/skycoin/src/cipher" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appcommon" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/visor/dmsgtracker" "github.com/skycoin/skywire/pkg/visor/rewardconfig" diff --git a/pkg/visor/init.go b/pkg/visor/init.go index 1713dd97a0..3e25e46a14 100644 --- a/pkg/visor/init.go +++ b/pkg/visor/init.go @@ -31,9 +31,6 @@ import ( "github.com/skycoin/dmsg/pkg/dmsgpty" "github.com/skycoin/skywire" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/internal/vpn" "github.com/skycoin/skywire/pkg/app/appdisc" "github.com/skycoin/skywire/pkg/app/appevent" @@ -46,6 +43,9 @@ import ( "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/servicedisc" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/transport/network" "github.com/skycoin/skywire/pkg/transport/network/addrresolver" diff --git a/pkg/visor/logserver/api.go b/pkg/visor/logserver/api.go index 7dc8555016..9011860b92 100644 --- a/pkg/visor/logserver/api.go +++ b/pkg/visor/logserver/api.go @@ -12,10 +12,10 @@ import ( "github.com/gin-gonic/gin" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/visor/visorconfig" ) diff --git a/pkg/visor/ping.go b/pkg/visor/ping.go index 45263ef9b9..e2025353f4 100644 --- a/pkg/visor/ping.go +++ b/pkg/visor/ping.go @@ -5,7 +5,7 @@ import ( "net" "time" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) type ping struct { diff --git a/pkg/visor/rpc.go b/pkg/visor/rpc.go index 2b713bf8a6..690de4ca8a 100644 --- a/pkg/visor/rpc.go +++ b/pkg/visor/rpc.go @@ -10,12 +10,12 @@ import ( "github.com/google/uuid" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/app/appcommon" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/servicedisc" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/transport/network" "github.com/skycoin/skywire/pkg/util/rpcutil" diff --git a/pkg/visor/rpc_client.go b/pkg/visor/rpc_client.go index ab8381a6b2..600d4fff55 100644 --- a/pkg/visor/rpc_client.go +++ b/pkg/visor/rpc_client.go @@ -16,15 +16,15 @@ import ( "github.com/google/uuid" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appcommon" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/router" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/servicedisc" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/transport/network" "github.com/skycoin/skywire/pkg/util/cipherutil" diff --git a/pkg/visor/rpc_client_serve.go b/pkg/visor/rpc_client_serve.go index 0dafa10529..cdbc47787b 100644 --- a/pkg/visor/rpc_client_serve.go +++ b/pkg/visor/rpc_client_serve.go @@ -10,7 +10,7 @@ import ( "github.com/sirupsen/logrus" "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/netutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" ) func isDone(ctx context.Context) bool { diff --git a/pkg/visor/rpc_test.go b/pkg/visor/rpc_test.go index bc58b7af0b..022f2c49ee 100644 --- a/pkg/visor/rpc_test.go +++ b/pkg/visor/rpc_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/utclient" "github.com/skycoin/skywire/pkg/visor/visorconfig" diff --git a/pkg/visor/survey.go b/pkg/visor/survey.go index 7574b2a673..3dd43d546f 100644 --- a/pkg/visor/survey.go +++ b/pkg/visor/survey.go @@ -10,7 +10,7 @@ import ( coincipher "github.com/skycoin/skycoin/src/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/util/pathutil" visconf "github.com/skycoin/skywire/pkg/visor/visorconfig" ) diff --git a/pkg/visor/usermanager/user.go b/pkg/visor/usermanager/user.go index 9f469b8e9d..f889226aae 100644 --- a/pkg/visor/usermanager/user.go +++ b/pkg/visor/usermanager/user.go @@ -12,7 +12,7 @@ import ( "go.etcd.io/bbolt" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) const ( diff --git a/pkg/visor/usermanager/user_manager.go b/pkg/visor/usermanager/user_manager.go index f7d8d274e7..edb1dce5a6 100644 --- a/pkg/visor/usermanager/user_manager.go +++ b/pkg/visor/usermanager/user_manager.go @@ -13,8 +13,8 @@ import ( "github.com/google/uuid" "github.com/gorilla/securecookie" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/visor/visorconfig" ) diff --git a/pkg/visor/visor.go b/pkg/visor/visor.go index 4fb66884a6..510ef98794 100644 --- a/pkg/visor/visor.go +++ b/pkg/visor/visor.go @@ -18,9 +18,6 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" "github.com/toqueteos/webbrowser" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/cmdutil" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appdisc" "github.com/skycoin/skywire/pkg/app/appevent" "github.com/skycoin/skywire/pkg/app/appnet" @@ -28,6 +25,9 @@ import ( "github.com/skycoin/skywire/pkg/app/launcher" "github.com/skycoin/skywire/pkg/routefinder/rfclient" "github.com/skycoin/skywire/pkg/router" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/transport/network" "github.com/skycoin/skywire/pkg/transport/network/addrresolver" diff --git a/pkg/visor/visorconfig/common.go b/pkg/visor/visorconfig/common.go index 9c492b28f3..9abc743e47 100644 --- a/pkg/visor/visorconfig/common.go +++ b/pkg/visor/visorconfig/common.go @@ -6,8 +6,8 @@ import ( "errors" "os" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) const ( diff --git a/pkg/visor/visorconfig/common_test.go b/pkg/visor/visorconfig/common_test.go index 6f65a21171..cd60737ac9 100644 --- a/pkg/visor/visorconfig/common_test.go +++ b/pkg/visor/visorconfig/common_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // When 'ensureKeys' is triggered, a 'Common' struct with: diff --git a/pkg/visor/visorconfig/config.go b/pkg/visor/visorconfig/config.go index 97782459a9..2d22ed7888 100644 --- a/pkg/visor/visorconfig/config.go +++ b/pkg/visor/visorconfig/config.go @@ -12,12 +12,12 @@ import ( coinCipher "github.com/skycoin/skycoin/src/cipher" "github.com/skycoin/skywire" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/dmsgc" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/pkg/visor/visorconfig/hypervisorconfig.go b/pkg/visor/visorconfig/hypervisorconfig.go index aa2476cda5..b9ae59ad56 100644 --- a/pkg/visor/visorconfig/hypervisorconfig.go +++ b/pkg/visor/visorconfig/hypervisorconfig.go @@ -12,7 +12,7 @@ import ( "time" "github.com/skycoin/skywire" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/util/pathutil" ) diff --git a/pkg/visor/visorconfig/parse.go b/pkg/visor/visorconfig/parse.go index 9dd3afb1b8..bf6559fe2d 100644 --- a/pkg/visor/visorconfig/parse.go +++ b/pkg/visor/visorconfig/parse.go @@ -8,8 +8,8 @@ import ( "github.com/blang/semver/v4" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) var ( diff --git a/pkg/visor/visorconfig/services.go b/pkg/visor/visorconfig/services.go index c3f3c4c8f3..9d610fa4c3 100644 --- a/pkg/visor/visorconfig/services.go +++ b/pkg/visor/visorconfig/services.go @@ -7,8 +7,8 @@ import ( "net/http" "time" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // Fetch fetches the service URLs & ip:ports from the config service endpoint diff --git a/pkg/visor/visorconfig/v1.go b/pkg/visor/visorconfig/v1.go index 93f0701b3f..bd80d471af 100644 --- a/pkg/visor/visorconfig/v1.go +++ b/pkg/visor/visorconfig/v1.go @@ -7,11 +7,11 @@ import ( "strings" "sync" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/app/launcher" "github.com/skycoin/skywire/pkg/dmsgc" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/pkg/visor/visorconfig/values.go b/pkg/visor/visorconfig/values.go index f583bb4336..73bb50010e 100644 --- a/pkg/visor/visorconfig/values.go +++ b/pkg/visor/visorconfig/values.go @@ -11,9 +11,9 @@ import ( "github.com/bitfield/script" "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) var ( diff --git a/pkg/visor/visorconfig/values_darwin.go b/pkg/visor/visorconfig/values_darwin.go index b1ccb72afd..31c2fe5da2 100644 --- a/pkg/visor/visorconfig/values_darwin.go +++ b/pkg/visor/visorconfig/values_darwin.go @@ -15,8 +15,8 @@ import ( "github.com/jaypipes/ghw" "github.com/zcalusic/sysinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // UserConfig contains installation paths for running skywire as the user diff --git a/pkg/visor/visorconfig/values_linux.go b/pkg/visor/visorconfig/values_linux.go index 7d24bbb942..ae7200db2b 100644 --- a/pkg/visor/visorconfig/values_linux.go +++ b/pkg/visor/visorconfig/values_linux.go @@ -13,8 +13,8 @@ import ( "github.com/jaypipes/ghw" "github.com/zcalusic/sysinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // UserConfig contains installation paths for running skywire as the user diff --git a/pkg/visor/visorconfig/values_windows.go b/pkg/visor/visorconfig/values_windows.go index c6ebc72c36..05a9702ac5 100644 --- a/pkg/visor/visorconfig/values_windows.go +++ b/pkg/visor/visorconfig/values_windows.go @@ -15,8 +15,8 @@ import ( "github.com/jaypipes/ghw" "golang.org/x/sys/windows" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // UserConfig contains installation paths for running skywire as the user diff --git a/pkg/visor/visorinit/module.go b/pkg/visor/visorinit/module.go index a522a09c41..f517686833 100644 --- a/pkg/visor/visorinit/module.go +++ b/pkg/visor/visorinit/module.go @@ -7,7 +7,7 @@ import ( "fmt" "sync" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // Hook is a function that can be run at some point as part diff --git a/pkg/visor/withoutsystray.go b/pkg/visor/withoutsystray.go index 5b36707262..2c71c29915 100644 --- a/pkg/visor/withoutsystray.go +++ b/pkg/visor/withoutsystray.go @@ -7,7 +7,7 @@ package visor import ( "context" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) func runAppSystray() { diff --git a/scripts/mac_installer/desktop-deinstaller/deinstaller.go b/scripts/mac_installer/desktop-deinstaller/deinstaller.go index 48eca1c90f..fc2b154b65 100644 --- a/scripts/mac_installer/desktop-deinstaller/deinstaller.go +++ b/scripts/mac_installer/desktop-deinstaller/deinstaller.go @@ -9,7 +9,7 @@ import ( "path/filepath" "syscall" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/util/osutil" ) diff --git a/skywire.go b/skywire.go index 47a18175b9..9eade58598 100644 --- a/skywire.go +++ b/skywire.go @@ -8,7 +8,7 @@ import ( "encoding/json" "log" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) /*