diff --git a/cmd/apps/skysocks-client/skysocks-client.go b/cmd/apps/skysocks-client/skysocks-client.go index 886fec6d7d..02cd4b8e76 100644 --- a/cmd/apps/skysocks-client/skysocks-client.go +++ b/cmd/apps/skysocks-client/skysocks-client.go @@ -14,11 +14,11 @@ import ( "github.com/SkycoinProject/skycoin/src/util/logging" "github.com/SkycoinProject/skywire-mainnet/internal/netutil" - "github.com/SkycoinProject/skywire-mainnet/internal/skyenv" "github.com/SkycoinProject/skywire-mainnet/internal/skysocks" "github.com/SkycoinProject/skywire-mainnet/pkg/app" "github.com/SkycoinProject/skywire-mainnet/pkg/app/appnet" "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" "github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo" ) diff --git a/cmd/skywire-cli/commands/mdisc/root.go b/cmd/skywire-cli/commands/mdisc/root.go index 13ea704754..fdfe55dcc8 100644 --- a/cmd/skywire-cli/commands/mdisc/root.go +++ b/cmd/skywire-cli/commands/mdisc/root.go @@ -7,7 +7,7 @@ import ( "text/tabwriter" "time" - "github.com/SkycoinProject/skywire-mainnet/internal/skyenv" + "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" "github.com/SkycoinProject/dmsg/disc" "github.com/spf13/cobra" diff --git a/cmd/skywire-cli/commands/rtfind/root.go b/cmd/skywire-cli/commands/rtfind/root.go index f4a513ceaf..be2b90fa22 100644 --- a/cmd/skywire-cli/commands/rtfind/root.go +++ b/cmd/skywire-cli/commands/rtfind/root.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/SkycoinProject/skywire-mainnet/internal/skyenv" "github.com/SkycoinProject/skywire-mainnet/pkg/routefinder/rfclient" "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" "github.com/SkycoinProject/dmsg/cipher" "github.com/spf13/cobra" diff --git a/cmd/skywire-cli/commands/visor/gen-config.go b/cmd/skywire-cli/commands/visor/gen-config.go index 33ec5df7a7..06ecccc189 100644 --- a/cmd/skywire-cli/commands/visor/gen-config.go +++ b/cmd/skywire-cli/commands/visor/gen-config.go @@ -7,10 +7,10 @@ import ( "path" "path/filepath" - "github.com/SkycoinProject/skywire-mainnet/internal/skyenv" "github.com/SkycoinProject/skywire-mainnet/pkg/app/appcommon" "github.com/SkycoinProject/skywire-mainnet/pkg/restart" "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" "github.com/SkycoinProject/dmsg/cipher" "github.com/spf13/cobra" diff --git a/pkg/hypervisor/config.go b/pkg/hypervisor/config.go index 764c7eca01..a057e25ae2 100644 --- a/pkg/hypervisor/config.go +++ b/pkg/hypervisor/config.go @@ -10,7 +10,7 @@ import ( "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/skywire-mainnet/internal/skyenv" + "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" "github.com/SkycoinProject/skywire-mainnet/pkg/util/pathutil" ) diff --git a/pkg/hypervisor/hypervisor.go b/pkg/hypervisor/hypervisor.go index 10ea262385..ec676f653b 100644 --- a/pkg/hypervisor/hypervisor.go +++ b/pkg/hypervisor/hypervisor.go @@ -23,9 +23,9 @@ import ( "github.com/go-chi/chi/middleware" "github.com/google/uuid" - "github.com/SkycoinProject/skywire-mainnet/internal/skyenv" "github.com/SkycoinProject/skywire-mainnet/pkg/app" "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" "github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo" "github.com/SkycoinProject/skywire-mainnet/pkg/visor" ) diff --git a/pkg/router/router.go b/pkg/router/router.go index 192d36e396..d2ecd55b12 100644 --- a/pkg/router/router.go +++ b/pkg/router/router.go @@ -15,10 +15,10 @@ import ( "github.com/SkycoinProject/dmsg/cipher" "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/internal/skyenv" "github.com/SkycoinProject/skywire-mainnet/pkg/routefinder/rfclient" "github.com/SkycoinProject/skywire-mainnet/pkg/routing" "github.com/SkycoinProject/skywire-mainnet/pkg/setup/setupclient" + "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" "github.com/SkycoinProject/skywire-mainnet/pkg/snet" "github.com/SkycoinProject/skywire-mainnet/pkg/transport" ) diff --git a/pkg/setup/node.go b/pkg/setup/node.go index 9930882570..a7ba8f67a5 100644 --- a/pkg/setup/node.go +++ b/pkg/setup/node.go @@ -11,10 +11,10 @@ import ( "github.com/SkycoinProject/dmsg/disc" "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/internal/skyenv" "github.com/SkycoinProject/skywire-mainnet/pkg/metrics" "github.com/SkycoinProject/skywire-mainnet/pkg/router/routerclient" "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" ) // Node performs routes setup operations over messaging channel. diff --git a/pkg/setup/node_test.go b/pkg/setup/node_test.go index 622bed13e2..78a0478106 100644 --- a/pkg/setup/node_test.go +++ b/pkg/setup/node_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire-mainnet/internal/skyenv" "github.com/SkycoinProject/skywire-mainnet/pkg/metrics" "github.com/SkycoinProject/skywire-mainnet/pkg/router" "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" ) func TestMain(m *testing.M) { diff --git a/internal/skyenv/values.go b/pkg/skyenv/values.go similarity index 100% rename from internal/skyenv/values.go rename to pkg/skyenv/values.go diff --git a/pkg/transport/handshake_test.go b/pkg/transport/handshake_test.go index 9cea0bd214..fdfc6a8b0b 100644 --- a/pkg/transport/handshake_test.go +++ b/pkg/transport/handshake_test.go @@ -8,7 +8,7 @@ import ( "github.com/SkycoinProject/dmsg" "github.com/stretchr/testify/require" - "github.com/SkycoinProject/skywire-mainnet/internal/skyenv" + "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" "github.com/SkycoinProject/skywire-mainnet/pkg/snet/snettest" "github.com/SkycoinProject/skywire-mainnet/pkg/transport" ) diff --git a/pkg/transport/managed_transport.go b/pkg/transport/managed_transport.go index f5eacab6ae..76bfc8620a 100644 --- a/pkg/transport/managed_transport.go +++ b/pkg/transport/managed_transport.go @@ -11,15 +11,14 @@ import ( "sync/atomic" "time" + "github.com/SkycoinProject/dmsg/cipher" "github.com/SkycoinProject/dmsg/httputil" "github.com/SkycoinProject/dmsg/netutil" + "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/internal/skyenv" "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" "github.com/SkycoinProject/skywire-mainnet/pkg/snet" - - "github.com/SkycoinProject/dmsg/cipher" - "github.com/SkycoinProject/skycoin/src/util/logging" ) const logWriteInterval = time.Second * 3 diff --git a/pkg/transport/manager.go b/pkg/transport/manager.go index 0c305dd411..6cca66369b 100644 --- a/pkg/transport/manager.go +++ b/pkg/transport/manager.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "github.com/SkycoinProject/skywire-mainnet/internal/skyenv" "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" "github.com/SkycoinProject/skywire-mainnet/pkg/snet" "github.com/SkycoinProject/skywire-mainnet/pkg/snet/snettest" diff --git a/pkg/visor/config.go b/pkg/visor/config.go index 0dac57ab3c..578e6ce5d8 100644 --- a/pkg/visor/config.go +++ b/pkg/visor/config.go @@ -16,9 +16,9 @@ import ( "github.com/SkycoinProject/dmsg/dmsgpty" "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/internal/skyenv" "github.com/SkycoinProject/skywire-mainnet/pkg/app/appcommon" "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" "github.com/SkycoinProject/skywire-mainnet/pkg/snet" "github.com/SkycoinProject/skywire-mainnet/pkg/transport" trClient "github.com/SkycoinProject/skywire-mainnet/pkg/transport-discovery/client" diff --git a/pkg/visor/visor.go b/pkg/visor/visor.go index 4dc6ee2b30..b8ba170ded 100644 --- a/pkg/visor/visor.go +++ b/pkg/visor/visor.go @@ -22,7 +22,6 @@ import ( "github.com/SkycoinProject/dmsg/dmsgpty" "github.com/SkycoinProject/skycoin/src/util/logging" - "github.com/SkycoinProject/skywire-mainnet/internal/skyenv" "github.com/SkycoinProject/skywire-mainnet/pkg/app/appcommon" "github.com/SkycoinProject/skywire-mainnet/pkg/app/appnet" "github.com/SkycoinProject/skywire-mainnet/pkg/app/appserver" @@ -30,6 +29,7 @@ import ( "github.com/SkycoinProject/skywire-mainnet/pkg/routefinder/rfclient" "github.com/SkycoinProject/skywire-mainnet/pkg/router" "github.com/SkycoinProject/skywire-mainnet/pkg/routing" + "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" "github.com/SkycoinProject/skywire-mainnet/pkg/snet" "github.com/SkycoinProject/skywire-mainnet/pkg/transport" "github.com/SkycoinProject/skywire-mainnet/pkg/util/pathutil"