diff --git a/cmd/skywire-cli/commands/mdisc/root.go b/cmd/skywire-cli/commands/mdisc/root.go index aa48645931..943227023f 100644 --- a/cmd/skywire-cli/commands/mdisc/root.go +++ b/cmd/skywire-cli/commands/mdisc/root.go @@ -8,7 +8,7 @@ import ( "text/tabwriter" "time" - "github.com/skycoin/dmsg/disc" + "github.com/skycoin/dmsg/pkg/disc" "github.com/skycoin/skycoin/src/util/logging" "github.com/spf13/cobra" diff --git a/go.mod b/go.mod index db414c425f..499f7fd418 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/pkg/profile v1.5.0 github.com/shirou/gopsutil/v3 v3.21.4 github.com/sirupsen/logrus v1.8.1 - github.com/skycoin/dmsg v0.0.0-20220309150149-59567d358f03 + github.com/skycoin/dmsg v0.0.0-20220329122357-2e8d4715d14f github.com/skycoin/skycoin v0.27.1 github.com/skycoin/yamux v0.0.0-20200803175205-571ceb89da9f github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8 diff --git a/go.sum b/go.sum index 0d05d2f395..abf3bb56df 100644 --- a/go.sum +++ b/go.sum @@ -165,8 +165,6 @@ github.com/getlantern/systray v1.1.0 h1:U0wCEqseLi2ok1fE6b88gJklzriavPJixZysZPkZ github.com/getlantern/systray v1.1.0/go.mod h1:AecygODWIsBquJCJFop8MEQcJbWFfw/1yWbVabNgpCM= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= -github.com/go-chi/chi v1.5.4 h1:QHdzF2szwjqVV4wmByUnTcsbIg7UGaQ0tPF2t5GcAIs= -github.com/go-chi/chi v1.5.4/go.mod h1:uaf8YgoFazUOkPBG7fxPftUylNumIev9awIWOENIuEg= github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-chi/chi/v5 v5.0.8-0.20220103230436-7dbe9a0bd10f h1:6kLofhLkWj7lgCc+mvcVLnwhTzQYgL/yW/Y0e/JYwjg= github.com/go-chi/chi/v5 v5.0.8-0.20220103230436-7dbe9a0bd10f/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= @@ -487,13 +485,13 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/skycoin/dmsg v0.0.0-20220309150149-59567d358f03 h1:7nIQo/3Sd61jnyreu6uvMAFH3AFzf8rTMSz787Ve7R8= -github.com/skycoin/dmsg v0.0.0-20220309150149-59567d358f03/go.mod h1:2VdIS6SfIBVDniDhDVfsFjCe8oz6B3lTfkItzdvxt78= +github.com/skycoin/dmsg v0.0.0-20220329122357-2e8d4715d14f h1:wzQdtwmKSTgPPcOh/OQtOPiVeOFD25+jjLwKvb79LD0= +github.com/skycoin/dmsg v0.0.0-20220329122357-2e8d4715d14f/go.mod h1:bUiu+qaWcuH4SJudhjBPqv0hecc0V73DnsHRTh5TuyU= github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6 h1:1Nc5EBY6pjfw1kwW0duwyG+7WliWz5u9kgk1h5MnLuA= github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6/go.mod h1:UXghlricA7J3aRD/k7p/zBObQfmBawwCxIVPVjz2Q3o= github.com/skycoin/skycoin v0.27.1 h1:HatxsRwVSPaV4qxH6290xPBmkH/HgiuAoY2qC+e8C9I= github.com/skycoin/skycoin v0.27.1/go.mod h1:78nHjQzd8KG0jJJVL/j0xMmrihXi70ti63fh8vXScJw= -github.com/skycoin/skywire-utilities v0.0.0-20220308074734-3ac20b7c3254/go.mod h1:7l3pPv/3lGaa9mdni0wvXxSOLql36u3i2SDXhZOi78s= +github.com/skycoin/skywire-utilities v0.0.0-20220315050606-172bb2cd90d9/go.mod h1:9fOsut+rqCBd33NPF3cuolXrw8uQESYshSvdYMaZNEo= github.com/skycoin/skywire-utilities v0.0.0-20220321002722-7d4b15ff5211 h1:iEQL310u/j/cljfyI7m9WjBycPiRiTl5auLRWljlpyk= github.com/skycoin/skywire-utilities v0.0.0-20220321002722-7d4b15ff5211/go.mod h1:9fOsut+rqCBd33NPF3cuolXrw8uQESYshSvdYMaZNEo= github.com/skycoin/yamux v0.0.0-20200803175205-571ceb89da9f h1:A5dEM1OE9YhN3LciZU9qPjo7fJ46JeHNi3JCroDkK0Y= diff --git a/internal/vpn/env.go b/internal/vpn/env.go index 4620878fee..560e0cc25f 100644 --- a/internal/vpn/env.go +++ b/internal/vpn/env.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/skycoin/dmsg/dmsgget" + "github.com/skycoin/dmsg/pkg/dmsgget" "github.com/skycoin/skywire-utilities/pkg/cipher" ) diff --git a/pkg/app/appnet/addr.go b/pkg/app/appnet/addr.go index f02b5e4acf..62cca80148 100644 --- a/pkg/app/appnet/addr.go +++ b/pkg/app/appnet/addr.go @@ -5,7 +5,7 @@ import ( "fmt" "net" - "github.com/skycoin/dmsg" + "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/routing" diff --git a/pkg/app/appnet/addr_test.go b/pkg/app/appnet/addr_test.go index b089715aa8..95b4b57929 100644 --- a/pkg/app/appnet/addr_test.go +++ b/pkg/app/appnet/addr_test.go @@ -4,7 +4,7 @@ import ( "net" "testing" - "github.com/skycoin/dmsg" + "github.com/skycoin/dmsg/pkg/dmsg" "github.com/stretchr/testify/require" "github.com/skycoin/skywire-utilities/pkg/cipher" diff --git a/pkg/app/appnet/dmsg_networker.go b/pkg/app/appnet/dmsg_networker.go index 36ed83dbde..140890233d 100644 --- a/pkg/app/appnet/dmsg_networker.go +++ b/pkg/app/appnet/dmsg_networker.go @@ -4,7 +4,7 @@ import ( "context" "net" - "github.com/skycoin/dmsg" + "github.com/skycoin/dmsg/pkg/dmsg" ) // DmsgNetworker implements `Networker` for dmsg network. diff --git a/pkg/app/appserver/rpc_ingress_client_test.go b/pkg/app/appserver/rpc_ingress_client_test.go index 1028fc4a3f..60f2f0d974 100644 --- a/pkg/app/appserver/rpc_ingress_client_test.go +++ b/pkg/app/appserver/rpc_ingress_client_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/skycoin/dmsg" + "github.com/skycoin/dmsg/pkg/dmsg" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" "golang.org/x/net/nettest" diff --git a/pkg/app/appserver/rpc_ingress_gateway_test.go b/pkg/app/appserver/rpc_ingress_gateway_test.go index 160dc5f967..9655e5da7e 100644 --- a/pkg/app/appserver/rpc_ingress_gateway_test.go +++ b/pkg/app/appserver/rpc_ingress_gateway_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/skycoin/dmsg" + "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/skycoin/src/util/logging" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/pkg/app/launcher/launcher.go b/pkg/app/launcher/launcher.go index 9cd23c6555..a51f08f58e 100644 --- a/pkg/app/launcher/launcher.go +++ b/pkg/app/launcher/launcher.go @@ -13,7 +13,7 @@ import ( "syscall" "github.com/sirupsen/logrus" - "github.com/skycoin/dmsg" + "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/app/appcommon" diff --git a/pkg/dmsgc/dmsgc.go b/pkg/dmsgc/dmsgc.go index 7e4d2acc44..5cb1f2fa1b 100644 --- a/pkg/dmsgc/dmsgc.go +++ b/pkg/dmsgc/dmsgc.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "github.com/skycoin/dmsg" - "github.com/skycoin/dmsg/disc" + "github.com/skycoin/dmsg/pkg/disc" + "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/skycoin/src/util/logging" "github.com/skycoin/skywire-utilities/pkg/cipher" diff --git a/pkg/router/route_group.go b/pkg/router/route_group.go index 50abd8a39c..51e05a722b 100644 --- a/pkg/router/route_group.go +++ b/pkg/router/route_group.go @@ -12,7 +12,7 @@ import ( "sync/atomic" "time" - "github.com/skycoin/dmsg/ioutil" + "github.com/skycoin/dmsg/pkg/ioutil" "github.com/skycoin/skycoin/src/util/logging" "github.com/skycoin/skywire/pkg/routing" diff --git a/pkg/router/router.go b/pkg/router/router.go index 06c814e920..b8e381100a 100644 --- a/pkg/router/router.go +++ b/pkg/router/router.go @@ -12,8 +12,8 @@ import ( "sync" "time" - "github.com/skycoin/dmsg" - "github.com/skycoin/dmsg/noise" + "github.com/skycoin/dmsg/pkg/dmsg" + "github.com/skycoin/dmsg/pkg/noise" "github.com/skycoin/skycoin/src/util/logging" "github.com/skycoin/skywire-utilities/pkg/cipher" diff --git a/pkg/router/routerclient/dmsg_wrapper.go b/pkg/router/routerclient/dmsg_wrapper.go index f5b0586891..3ef07d1a7b 100644 --- a/pkg/router/routerclient/dmsg_wrapper.go +++ b/pkg/router/routerclient/dmsg_wrapper.go @@ -4,7 +4,7 @@ import ( "context" "net" - "github.com/skycoin/dmsg" + "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport/network" diff --git a/pkg/setup/node.go b/pkg/setup/node.go index e2a7cf4fc4..117b8b4685 100644 --- a/pkg/setup/node.go +++ b/pkg/setup/node.go @@ -8,8 +8,8 @@ import ( "time" "github.com/sirupsen/logrus" - "github.com/skycoin/dmsg" - "github.com/skycoin/dmsg/disc" + "github.com/skycoin/dmsg/pkg/disc" + "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/skycoin/src/util/logging" "github.com/skycoin/skywire-utilities/pkg/cipher" diff --git a/pkg/setup/setupclient/client.go b/pkg/setup/setupclient/client.go index 07a5b82b89..4c430ca6e0 100644 --- a/pkg/setup/setupclient/client.go +++ b/pkg/setup/setupclient/client.go @@ -6,7 +6,7 @@ import ( "net" "net/rpc" - "github.com/skycoin/dmsg" + "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/skycoin/src/util/logging" "github.com/skycoin/skywire-utilities/pkg/cipher" diff --git a/pkg/setup/setupclient/mock_route_group_dialer.go b/pkg/setup/setupclient/mock_route_group_dialer.go index 05f14d5ec1..99df1f7030 100644 --- a/pkg/setup/setupclient/mock_route_group_dialer.go +++ b/pkg/setup/setupclient/mock_route_group_dialer.go @@ -5,7 +5,7 @@ package setupclient import ( context "context" - dmsg "github.com/skycoin/dmsg" + dmsg "github.com/skycoin/dmsg/pkg/dmsg" logging "github.com/skycoin/skycoin/src/util/logging" mock "github.com/stretchr/testify/mock" diff --git a/pkg/setup/setupclient/wrappers.go b/pkg/setup/setupclient/wrappers.go index f2f356547f..9be9a96fbf 100644 --- a/pkg/setup/setupclient/wrappers.go +++ b/pkg/setup/setupclient/wrappers.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/skycoin/dmsg" + "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/skycoin/src/util/logging" "github.com/skycoin/skywire-utilities/pkg/cipher" diff --git a/pkg/transport/manager.go b/pkg/transport/manager.go index de311c527d..9accebfe61 100644 --- a/pkg/transport/manager.go +++ b/pkg/transport/manager.go @@ -9,7 +9,7 @@ import ( "time" "github.com/google/uuid" - "github.com/skycoin/dmsg" + "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/skycoin/src/util/logging" "github.com/skycoin/skywire-utilities/pkg/cipher" diff --git a/pkg/transport/network/client.go b/pkg/transport/network/client.go index 9208d3f517..f7a29dd82b 100644 --- a/pkg/transport/network/client.go +++ b/pkg/transport/network/client.go @@ -9,7 +9,7 @@ import ( "strings" "sync" - "github.com/skycoin/dmsg" + "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/skycoin/src/util/logging" "github.com/skycoin/skywire-utilities/pkg/cipher" diff --git a/pkg/transport/network/connection.go b/pkg/transport/network/connection.go index f1596ce199..69576af2ea 100644 --- a/pkg/transport/network/connection.go +++ b/pkg/transport/network/connection.go @@ -5,8 +5,8 @@ import ( "net" "time" - "github.com/skycoin/dmsg" - "github.com/skycoin/dmsg/noise" + "github.com/skycoin/dmsg/pkg/dmsg" + "github.com/skycoin/dmsg/pkg/noise" "github.com/skycoin/skycoin/src/util/logging" "github.com/skycoin/skywire-utilities/pkg/cipher" diff --git a/pkg/transport/network/dmsg.go b/pkg/transport/network/dmsg.go index b505686d7b..1015323936 100644 --- a/pkg/transport/network/dmsg.go +++ b/pkg/transport/network/dmsg.go @@ -5,7 +5,7 @@ import ( "fmt" "net" - "github.com/skycoin/dmsg" + "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/skywire-utilities/pkg/cipher" ) diff --git a/pkg/transport/network/handshake/handshake.go b/pkg/transport/network/handshake/handshake.go index 67b5293e15..fb8611a404 100644 --- a/pkg/transport/network/handshake/handshake.go +++ b/pkg/transport/network/handshake/handshake.go @@ -9,7 +9,7 @@ import ( "net" "time" - "github.com/skycoin/dmsg" + "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/skywire-utilities/pkg/cipher" ) diff --git a/pkg/transport/network/handshake/handshake_test.go b/pkg/transport/network/handshake/handshake_test.go index 355421e706..690a72407f 100644 --- a/pkg/transport/network/handshake/handshake_test.go +++ b/pkg/transport/network/handshake/handshake_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/skycoin/dmsg" + "github.com/skycoin/dmsg/pkg/dmsg" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/transport/network/listener.go b/pkg/transport/network/listener.go index 0da9b7b2c7..7f9a683c84 100644 --- a/pkg/transport/network/listener.go +++ b/pkg/transport/network/listener.go @@ -5,7 +5,7 @@ import ( "net" "sync" - "github.com/skycoin/dmsg" + "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/skywire-utilities/pkg/cipher" ) diff --git a/pkg/transport/network/sudph.go b/pkg/transport/network/sudph.go index f26f8782d7..6c98b1f935 100644 --- a/pkg/transport/network/sudph.go +++ b/pkg/transport/network/sudph.go @@ -8,7 +8,7 @@ import ( "time" "github.com/AudriusButkevicius/pfilter" - "github.com/skycoin/dmsg" + "github.com/skycoin/dmsg/pkg/dmsg" "github.com/xtaci/kcp-go" "github.com/skycoin/skywire-utilities/pkg/cipher" diff --git a/pkg/transport/setup/visor.go b/pkg/transport/setup/visor.go index f9825d4655..d8a628b325 100644 --- a/pkg/transport/setup/visor.go +++ b/pkg/transport/setup/visor.go @@ -6,7 +6,7 @@ import ( "fmt" "net/rpc" - "github.com/skycoin/dmsg" + "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/skycoin/src/util/logging" "github.com/skycoin/skywire-utilities/pkg/cipher" diff --git a/pkg/visor/dmsgtracker/dmsg_tracker.go b/pkg/visor/dmsgtracker/dmsg_tracker.go index be02bd447a..945a29debc 100644 --- a/pkg/visor/dmsgtracker/dmsg_tracker.go +++ b/pkg/visor/dmsgtracker/dmsg_tracker.go @@ -9,8 +9,8 @@ import ( "time" "github.com/sirupsen/logrus" - "github.com/skycoin/dmsg" - "github.com/skycoin/dmsg/dmsgctrl" + "github.com/skycoin/dmsg/pkg/dmsg" + "github.com/skycoin/dmsg/pkg/dmsgctrl" "github.com/skycoin/skycoin/src/util/logging" "github.com/skycoin/skywire-utilities/pkg/cipher" diff --git a/pkg/visor/dmsgtracker/dmsg_tracker_test.go b/pkg/visor/dmsgtracker/dmsg_tracker_test.go index e77444d96d..1466ada737 100644 --- a/pkg/visor/dmsgtracker/dmsg_tracker_test.go +++ b/pkg/visor/dmsgtracker/dmsg_tracker_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/skycoin/dmsg" - "github.com/skycoin/dmsg/dmsgctrl" - "github.com/skycoin/dmsg/dmsgtest" + "github.com/skycoin/dmsg/pkg/dmsg" + "github.com/skycoin/dmsg/pkg/dmsgctrl" + "github.com/skycoin/dmsg/pkg/dmsgtest" "github.com/skycoin/skycoin/src/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/visor/hypervisor.go b/pkg/visor/hypervisor.go index ca36869077..da8fba000b 100644 --- a/pkg/visor/hypervisor.go +++ b/pkg/visor/hypervisor.go @@ -18,8 +18,8 @@ import ( "github.com/go-chi/chi/v5/middleware" "github.com/google/uuid" "github.com/sirupsen/logrus" - "github.com/skycoin/dmsg" - "github.com/skycoin/dmsg/dmsgpty" + "github.com/skycoin/dmsg/pkg/dmsg" + "github.com/skycoin/dmsg/pkg/dmsgpty" "github.com/skycoin/skycoin/src/util/logging" "nhooyr.io/websocket" diff --git a/pkg/visor/init.go b/pkg/visor/init.go index 12aac7403b..2d815d968d 100644 --- a/pkg/visor/init.go +++ b/pkg/visor/init.go @@ -14,13 +14,13 @@ import ( "github.com/ccding/go-stun/stun" "github.com/sirupsen/logrus" - "github.com/skycoin/dmsg" - "github.com/skycoin/dmsg/direct" - dmsgdisc "github.com/skycoin/dmsg/disc" - "github.com/skycoin/dmsg/dmsgctrl" - "github.com/skycoin/dmsg/dmsgget" - "github.com/skycoin/dmsg/dmsghttp" - "github.com/skycoin/dmsg/dmsgpty" + "github.com/skycoin/dmsg/pkg/direct" + dmsgdisc "github.com/skycoin/dmsg/pkg/disc" + "github.com/skycoin/dmsg/pkg/dmsg" + "github.com/skycoin/dmsg/pkg/dmsgctrl" + "github.com/skycoin/dmsg/pkg/dmsgget" + "github.com/skycoin/dmsg/pkg/dmsghttp" + "github.com/skycoin/dmsg/pkg/dmsgpty" "github.com/skycoin/skycoin/src/util/logging" "github.com/skycoin/skywire-utilities/pkg/cipher" diff --git a/pkg/visor/rpc_client_serve.go b/pkg/visor/rpc_client_serve.go index 8726f0e337..9c99afd4af 100644 --- a/pkg/visor/rpc_client_serve.go +++ b/pkg/visor/rpc_client_serve.go @@ -7,7 +7,7 @@ import ( "time" "github.com/sirupsen/logrus" - "github.com/skycoin/dmsg" + "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/skywire-utilities/pkg/netutil" ) diff --git a/pkg/visor/visor.go b/pkg/visor/visor.go index 59e6177c26..650aba85ff 100644 --- a/pkg/visor/visor.go +++ b/pkg/visor/visor.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "github.com/skycoin/dmsg" - dmsgdisc "github.com/skycoin/dmsg/disc" + dmsgdisc "github.com/skycoin/dmsg/pkg/disc" + "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/skycoin/src/util/logging" "github.com/skycoin/skywire-utilities/pkg/cipher" diff --git a/pkg/visor/visorconfig/config.go b/pkg/visor/visorconfig/config.go index b770fef0a2..c6a8e77179 100644 --- a/pkg/visor/visorconfig/config.go +++ b/pkg/visor/visorconfig/config.go @@ -1,7 +1,7 @@ package visorconfig import ( - "github.com/skycoin/dmsg/disc" + "github.com/skycoin/dmsg/pkg/disc" "github.com/skycoin/skycoin/src/util/logging" "github.com/skycoin/skywire-utilities/pkg/cipher" diff --git a/vendor/github.com/skycoin/dmsg/dmsg.go b/vendor/github.com/skycoin/dmsg/dmsg.go new file mode 100644 index 0000000000..dd4308e032 --- /dev/null +++ b/vendor/github.com/skycoin/dmsg/dmsg.go @@ -0,0 +1,5 @@ +/* +This file is a workaround to avoid go module errors. +*/ + +package dmsg diff --git a/vendor/github.com/skycoin/dmsg/servermetrics/delta.go b/vendor/github.com/skycoin/dmsg/internal/servermetrics/delta.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/servermetrics/delta.go rename to vendor/github.com/skycoin/dmsg/internal/servermetrics/delta.go diff --git a/vendor/github.com/skycoin/dmsg/servermetrics/empty.go b/vendor/github.com/skycoin/dmsg/internal/servermetrics/empty.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/servermetrics/empty.go rename to vendor/github.com/skycoin/dmsg/internal/servermetrics/empty.go diff --git a/vendor/github.com/skycoin/dmsg/servermetrics/metrics.go b/vendor/github.com/skycoin/dmsg/internal/servermetrics/metrics.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/servermetrics/metrics.go rename to vendor/github.com/skycoin/dmsg/internal/servermetrics/metrics.go diff --git a/vendor/github.com/skycoin/dmsg/servermetrics/victoria_metrics.go b/vendor/github.com/skycoin/dmsg/internal/servermetrics/victoria_metrics.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/servermetrics/victoria_metrics.go rename to vendor/github.com/skycoin/dmsg/internal/servermetrics/victoria_metrics.go diff --git a/vendor/github.com/skycoin/dmsg/direct/client.go b/vendor/github.com/skycoin/dmsg/pkg/direct/client.go similarity index 98% rename from vendor/github.com/skycoin/dmsg/direct/client.go rename to vendor/github.com/skycoin/dmsg/pkg/direct/client.go index ad89c72dec..63885e80f3 100644 --- a/vendor/github.com/skycoin/dmsg/direct/client.go +++ b/vendor/github.com/skycoin/dmsg/pkg/direct/client.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "github.com/skycoin/dmsg/disc" + "github.com/skycoin/dmsg/pkg/disc" "github.com/skycoin/skywire-utilities/pkg/cipher" diff --git a/vendor/github.com/skycoin/dmsg/direct/direct.go b/vendor/github.com/skycoin/dmsg/pkg/direct/direct.go similarity index 92% rename from vendor/github.com/skycoin/dmsg/direct/direct.go rename to vendor/github.com/skycoin/dmsg/pkg/direct/direct.go index 5af6a73677..f71f06cbbb 100644 --- a/vendor/github.com/skycoin/dmsg/direct/direct.go +++ b/vendor/github.com/skycoin/dmsg/pkg/direct/direct.go @@ -4,8 +4,8 @@ import ( "context" "sync" - "github.com/skycoin/dmsg" - "github.com/skycoin/dmsg/disc" + "github.com/skycoin/dmsg/pkg/disc" + dmsg "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/skywire-utilities/pkg/cipher" diff --git a/vendor/github.com/skycoin/dmsg/direct/entries.go b/vendor/github.com/skycoin/dmsg/pkg/direct/entries.go similarity index 95% rename from vendor/github.com/skycoin/dmsg/direct/entries.go rename to vendor/github.com/skycoin/dmsg/pkg/direct/entries.go index 74cafc929b..ef741304fe 100644 --- a/vendor/github.com/skycoin/dmsg/direct/entries.go +++ b/vendor/github.com/skycoin/dmsg/pkg/direct/entries.go @@ -1,7 +1,7 @@ package direct import ( - "github.com/skycoin/dmsg/disc" + "github.com/skycoin/dmsg/pkg/disc" "github.com/skycoin/skywire-utilities/pkg/cipher" ) diff --git a/vendor/github.com/skycoin/dmsg/disc/client.go b/vendor/github.com/skycoin/dmsg/pkg/disc/client.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/disc/client.go rename to vendor/github.com/skycoin/dmsg/pkg/disc/client.go diff --git a/vendor/github.com/skycoin/dmsg/disc/entry.go b/vendor/github.com/skycoin/dmsg/pkg/disc/entry.go similarity index 98% rename from vendor/github.com/skycoin/dmsg/disc/entry.go rename to vendor/github.com/skycoin/dmsg/pkg/disc/entry.go index 96e5575d7b..5a4f38ad50 100644 --- a/vendor/github.com/skycoin/dmsg/disc/entry.go +++ b/vendor/github.com/skycoin/dmsg/pkg/disc/entry.go @@ -50,6 +50,8 @@ var ( ErrValidationServerAddress = NewEntryValidationError("advertising localhost listening address is not allowed in production mode") // ErrValidationEmptyServerAddress occurs when a server entry is submitted with an empty address. ErrValidationEmptyServerAddress = NewEntryValidationError("server address cannot be empty") + // ErrUnauthorizedNetworkMonitor occurs in case of invalid network monitor key + ErrUnauthorizedNetworkMonitor = errors.New("invalid network monitor key") errReverseMap = map[string]error{ ErrKeyNotFound.Error(): ErrKeyNotFound, diff --git a/vendor/github.com/skycoin/dmsg/disc/http_message.go b/vendor/github.com/skycoin/dmsg/pkg/disc/http_message.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/disc/http_message.go rename to vendor/github.com/skycoin/dmsg/pkg/disc/http_message.go diff --git a/vendor/github.com/skycoin/dmsg/disc/testing.go b/vendor/github.com/skycoin/dmsg/pkg/disc/testing.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/disc/testing.go rename to vendor/github.com/skycoin/dmsg/pkg/disc/testing.go diff --git a/vendor/github.com/skycoin/dmsg/client.go b/vendor/github.com/skycoin/dmsg/pkg/dmsg/client.go similarity index 99% rename from vendor/github.com/skycoin/dmsg/client.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsg/client.go index 0beea5a0e7..f05ba8204b 100644 --- a/vendor/github.com/skycoin/dmsg/client.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsg/client.go @@ -10,7 +10,7 @@ import ( "github.com/skycoin/skycoin/src/util/logging" - "github.com/skycoin/dmsg/disc" + "github.com/skycoin/dmsg/pkg/disc" "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire-utilities/pkg/netutil" diff --git a/vendor/github.com/skycoin/dmsg/client_session.go b/vendor/github.com/skycoin/dmsg/pkg/dmsg/client_session.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/client_session.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsg/client_session.go diff --git a/vendor/github.com/skycoin/dmsg/const.go b/vendor/github.com/skycoin/dmsg/pkg/dmsg/const.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/const.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsg/const.go diff --git a/vendor/github.com/skycoin/dmsg/entity_common.go b/vendor/github.com/skycoin/dmsg/pkg/dmsg/entity_common.go similarity index 99% rename from vendor/github.com/skycoin/dmsg/entity_common.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsg/entity_common.go index 5af402bf73..c9e0bfa0bb 100644 --- a/vendor/github.com/skycoin/dmsg/entity_common.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsg/entity_common.go @@ -9,7 +9,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/skycoin/dmsg/disc" + "github.com/skycoin/dmsg/pkg/disc" "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire-utilities/pkg/netutil" diff --git a/vendor/github.com/skycoin/dmsg/errors.go b/vendor/github.com/skycoin/dmsg/pkg/dmsg/errors.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/errors.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsg/errors.go diff --git a/vendor/github.com/skycoin/dmsg/listener.go b/vendor/github.com/skycoin/dmsg/pkg/dmsg/listener.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/listener.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsg/listener.go diff --git a/vendor/github.com/skycoin/dmsg/server.go b/vendor/github.com/skycoin/dmsg/pkg/dmsg/server.go similarity index 98% rename from vendor/github.com/skycoin/dmsg/server.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsg/server.go index da9dc7f8c4..2df207d513 100644 --- a/vendor/github.com/skycoin/dmsg/server.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsg/server.go @@ -9,8 +9,8 @@ import ( "github.com/sirupsen/logrus" "github.com/skycoin/skycoin/src/util/logging" - "github.com/skycoin/dmsg/disc" - "github.com/skycoin/dmsg/servermetrics" + "github.com/skycoin/dmsg/internal/servermetrics" + "github.com/skycoin/dmsg/pkg/disc" "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire-utilities/pkg/netutil" diff --git a/vendor/github.com/skycoin/dmsg/server_session.go b/vendor/github.com/skycoin/dmsg/pkg/dmsg/server_session.go similarity index 97% rename from vendor/github.com/skycoin/dmsg/server_session.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsg/server_session.go index d3391dd21a..4b04e7066f 100644 --- a/vendor/github.com/skycoin/dmsg/server_session.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsg/server_session.go @@ -7,8 +7,8 @@ import ( "github.com/sirupsen/logrus" "github.com/skycoin/yamux" - "github.com/skycoin/dmsg/noise" - "github.com/skycoin/dmsg/servermetrics" + "github.com/skycoin/dmsg/internal/servermetrics" + "github.com/skycoin/dmsg/pkg/noise" "github.com/skycoin/skywire-utilities/pkg/netutil" ) diff --git a/vendor/github.com/skycoin/dmsg/session_common.go b/vendor/github.com/skycoin/dmsg/pkg/dmsg/session_common.go similarity index 99% rename from vendor/github.com/skycoin/dmsg/session_common.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsg/session_common.go index a3d4ed4a58..1c5a6f6d9a 100644 --- a/vendor/github.com/skycoin/dmsg/session_common.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsg/session_common.go @@ -11,7 +11,7 @@ import ( "github.com/sirupsen/logrus" "github.com/skycoin/yamux" - "github.com/skycoin/dmsg/noise" + "github.com/skycoin/dmsg/pkg/noise" "github.com/skycoin/skywire-utilities/pkg/cipher" ) diff --git a/vendor/github.com/skycoin/dmsg/stream.go b/vendor/github.com/skycoin/dmsg/pkg/dmsg/stream.go similarity index 99% rename from vendor/github.com/skycoin/dmsg/stream.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsg/stream.go index 69898250c3..8b32dfe775 100644 --- a/vendor/github.com/skycoin/dmsg/stream.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsg/stream.go @@ -8,7 +8,7 @@ import ( "github.com/sirupsen/logrus" "github.com/skycoin/yamux" - "github.com/skycoin/dmsg/noise" + "github.com/skycoin/dmsg/pkg/noise" "github.com/skycoin/skywire-utilities/pkg/cipher" ) diff --git a/vendor/github.com/skycoin/dmsg/types.go b/vendor/github.com/skycoin/dmsg/pkg/dmsg/types.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/types.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsg/types.go diff --git a/vendor/github.com/skycoin/dmsg/util.go b/vendor/github.com/skycoin/dmsg/pkg/dmsg/util.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/util.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsg/util.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgctrl/control.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgctrl/control.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgctrl/control.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgctrl/control.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgctrl/serve_listener.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgctrl/serve_listener.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgctrl/serve_listener.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgctrl/serve_listener.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgget/dmsgget.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgget/dmsgget.go similarity index 96% rename from vendor/github.com/skycoin/dmsg/dmsgget/dmsgget.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgget/dmsgget.go index 1fe692498c..7198c45603 100644 --- a/vendor/github.com/skycoin/dmsg/dmsgget/dmsgget.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsgget/dmsgget.go @@ -15,9 +15,9 @@ import ( "github.com/sirupsen/logrus" "github.com/skycoin/skycoin/src/util/logging" - "github.com/skycoin/dmsg" - "github.com/skycoin/dmsg/disc" - "github.com/skycoin/dmsg/dmsghttp" + "github.com/skycoin/dmsg/pkg/disc" + dmsg "github.com/skycoin/dmsg/pkg/dmsg" + "github.com/skycoin/dmsg/pkg/dmsghttp" "github.com/skycoin/skywire-utilities/pkg/cipher" ) @@ -172,7 +172,7 @@ func parseOutputFile(name string, urlPath string) (*os.File, error) { stat, statErr := os.Stat(name) if statErr != nil { if os.IsNotExist(statErr) { - f, err := os.Create(name) + f, err := os.Create(name) //nolint if err != nil { return nil, err } @@ -182,7 +182,7 @@ func parseOutputFile(name string, urlPath string) (*os.File, error) { } if stat.IsDir() { - f, err := os.Create(filepath.Join(name, urlPath)) + f, err := os.Create(filepath.Join(name, urlPath)) //nolint if err != nil { return nil, err } diff --git a/vendor/github.com/skycoin/dmsg/dmsgget/flags.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgget/flags.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgget/flags.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgget/flags.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgget/progress_writer.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgget/progress_writer.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgget/progress_writer.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgget/progress_writer.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgget/url.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgget/url.go similarity index 93% rename from vendor/github.com/skycoin/dmsg/dmsgget/url.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgget/url.go index 7a5821a7c3..8f6d00193d 100644 --- a/vendor/github.com/skycoin/dmsg/dmsgget/url.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsgget/url.go @@ -4,7 +4,7 @@ import ( "errors" "net/url" - "github.com/skycoin/dmsg" + dmsg "github.com/skycoin/dmsg/pkg/dmsg" ) // Errors related to URLs. diff --git a/vendor/github.com/skycoin/dmsg/dmsghttp/http.go b/vendor/github.com/skycoin/dmsg/pkg/dmsghttp/http.go similarity index 90% rename from vendor/github.com/skycoin/dmsg/dmsghttp/http.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsghttp/http.go index 8f71d1fa48..4e3ab2bbc8 100644 --- a/vendor/github.com/skycoin/dmsg/dmsghttp/http.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsghttp/http.go @@ -5,8 +5,8 @@ import ( "fmt" "net/http" - "github.com/skycoin/dmsg" - "github.com/skycoin/dmsg/disc" + "github.com/skycoin/dmsg/pkg/disc" + dmsg "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/skywire-utilities/pkg/cipher" diff --git a/vendor/github.com/skycoin/dmsg/dmsghttp/http_transport.go b/vendor/github.com/skycoin/dmsg/pkg/dmsghttp/http_transport.go similarity index 97% rename from vendor/github.com/skycoin/dmsg/dmsghttp/http_transport.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsghttp/http_transport.go index 563a310bdf..307718f7ec 100644 --- a/vendor/github.com/skycoin/dmsg/dmsghttp/http_transport.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsghttp/http_transport.go @@ -9,7 +9,7 @@ import ( "net/http" "time" - "github.com/skycoin/dmsg" + dmsg "github.com/skycoin/dmsg/pkg/dmsg" ) const defaultHTTPPort = uint16(80) diff --git a/vendor/github.com/skycoin/dmsg/dmsghttp/util.go b/vendor/github.com/skycoin/dmsg/pkg/dmsghttp/util.go similarity index 95% rename from vendor/github.com/skycoin/dmsg/dmsghttp/util.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsghttp/util.go index 6bd03a9708..d412cbab34 100644 --- a/vendor/github.com/skycoin/dmsg/dmsghttp/util.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsghttp/util.go @@ -5,8 +5,8 @@ import ( "net/http" "time" - "github.com/skycoin/dmsg" - "github.com/skycoin/dmsg/disc" + "github.com/skycoin/dmsg/pkg/disc" + "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/skycoin/src/util/logging" ) diff --git a/vendor/github.com/skycoin/dmsg/dmsgpty/cli.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/cli.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgpty/cli.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgpty/cli.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgpty/cli_unix.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/cli_unix.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgpty/cli_unix.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgpty/cli_unix.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgpty/cli_windows.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/cli_windows.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgpty/cli_windows.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgpty/cli_windows.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgpty/conf.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/conf.go similarity index 98% rename from vendor/github.com/skycoin/dmsg/dmsgpty/conf.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgpty/conf.go index 242315c64e..0e8d217482 100644 --- a/vendor/github.com/skycoin/dmsg/dmsgpty/conf.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/conf.go @@ -7,7 +7,7 @@ import ( "runtime" "strings" - "github.com/skycoin/dmsg" + dmsg "github.com/skycoin/dmsg/pkg/dmsg" ) // Config struct is used to read the values from the config.json file diff --git a/vendor/github.com/skycoin/dmsg/dmsgpty/const.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/const.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgpty/const.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgpty/const.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgpty/const_unix.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/const_unix.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgpty/const_unix.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgpty/const_unix.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgpty/const_windows.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/const_windows.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgpty/const_windows.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgpty/const_windows.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgpty/host.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/host.go similarity index 99% rename from vendor/github.com/skycoin/dmsg/dmsgpty/host.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgpty/host.go index fe76457cae..1fcc64be61 100644 --- a/vendor/github.com/skycoin/dmsg/dmsgpty/host.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/host.go @@ -14,7 +14,7 @@ import ( "github.com/sirupsen/logrus" "github.com/skycoin/skycoin/src/util/logging" - "github.com/skycoin/dmsg" + dmsg "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/skywire-utilities/pkg/cipher" ) diff --git a/vendor/github.com/skycoin/dmsg/dmsgpty/host_mux.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/host_mux.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgpty/host_mux.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgpty/host_mux.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgpty/pty_client.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/pty_client.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgpty/pty_client.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgpty/pty_client.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgpty/pty_client_windows.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/pty_client_windows.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgpty/pty_client_windows.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgpty/pty_client_windows.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgpty/pty_gateway.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/pty_gateway.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgpty/pty_gateway.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgpty/pty_gateway.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgpty/pty_gateway_unix.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/pty_gateway_unix.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgpty/pty_gateway_unix.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgpty/pty_gateway_unix.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgpty/pty_gateway_windows.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/pty_gateway_windows.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgpty/pty_gateway_windows.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgpty/pty_gateway_windows.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgpty/pty_unix.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/pty_unix.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgpty/pty_unix.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgpty/pty_unix.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgpty/pty_windows.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/pty_windows.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgpty/pty_windows.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgpty/pty_windows.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgpty/rpc_util.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/rpc_util.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgpty/rpc_util.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgpty/rpc_util.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgpty/ui.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/ui.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgpty/ui.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgpty/ui.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgpty/ui_dialer.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/ui_dialer.go similarity index 96% rename from vendor/github.com/skycoin/dmsg/dmsgpty/ui_dialer.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgpty/ui_dialer.go index 975b01f219..91d1473bb3 100644 --- a/vendor/github.com/skycoin/dmsg/dmsgpty/ui_dialer.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/ui_dialer.go @@ -4,7 +4,7 @@ import ( "context" "net" - "github.com/skycoin/dmsg" + "github.com/skycoin/dmsg/pkg/dmsg" ) // UIDialer represents a dialer for dmsgpty-ui. diff --git a/vendor/github.com/skycoin/dmsg/dmsgpty/ui_html.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/ui_html.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgpty/ui_html.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgpty/ui_html.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgpty/ui_unix.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/ui_unix.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgpty/ui_unix.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgpty/ui_unix.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgpty/ui_windows.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/ui_windows.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgpty/ui_windows.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgpty/ui_windows.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgpty/whitelist.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/whitelist.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgpty/whitelist.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgpty/whitelist.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgpty/whitelist_client.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/whitelist_client.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgpty/whitelist_client.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgpty/whitelist_client.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgpty/whitelist_gateway.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/whitelist_gateway.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/dmsgpty/whitelist_gateway.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgpty/whitelist_gateway.go diff --git a/vendor/github.com/skycoin/dmsg/dmsgtest/env.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgtest/env.go similarity index 98% rename from vendor/github.com/skycoin/dmsg/dmsgtest/env.go rename to vendor/github.com/skycoin/dmsg/pkg/dmsgtest/env.go index 2b89da6cc7..11271528bd 100644 --- a/vendor/github.com/skycoin/dmsg/dmsgtest/env.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsgtest/env.go @@ -9,8 +9,8 @@ import ( "golang.org/x/net/nettest" - "github.com/skycoin/dmsg" - "github.com/skycoin/dmsg/disc" + "github.com/skycoin/dmsg/pkg/disc" + dmsg "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/skywire-utilities/pkg/cipher" ) diff --git a/vendor/github.com/skycoin/dmsg/ioutil/buf_read.go b/vendor/github.com/skycoin/dmsg/pkg/ioutil/buf_read.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/ioutil/buf_read.go rename to vendor/github.com/skycoin/dmsg/pkg/ioutil/buf_read.go diff --git a/vendor/github.com/skycoin/dmsg/ioutil/logging.go b/vendor/github.com/skycoin/dmsg/pkg/ioutil/logging.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/ioutil/logging.go rename to vendor/github.com/skycoin/dmsg/pkg/ioutil/logging.go diff --git a/vendor/github.com/skycoin/dmsg/noise/dh.go b/vendor/github.com/skycoin/dmsg/pkg/noise/dh.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/noise/dh.go rename to vendor/github.com/skycoin/dmsg/pkg/noise/dh.go diff --git a/vendor/github.com/skycoin/dmsg/noise/net.go b/vendor/github.com/skycoin/dmsg/pkg/noise/net.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/noise/net.go rename to vendor/github.com/skycoin/dmsg/pkg/noise/net.go diff --git a/vendor/github.com/skycoin/dmsg/noise/noise.go b/vendor/github.com/skycoin/dmsg/pkg/noise/noise.go similarity index 100% rename from vendor/github.com/skycoin/dmsg/noise/noise.go rename to vendor/github.com/skycoin/dmsg/pkg/noise/noise.go diff --git a/vendor/github.com/skycoin/dmsg/noise/read_writer.go b/vendor/github.com/skycoin/dmsg/pkg/noise/read_writer.go similarity index 99% rename from vendor/github.com/skycoin/dmsg/noise/read_writer.go rename to vendor/github.com/skycoin/dmsg/pkg/noise/read_writer.go index 0a73b4529d..87002ae7ec 100644 --- a/vendor/github.com/skycoin/dmsg/noise/read_writer.go +++ b/vendor/github.com/skycoin/dmsg/pkg/noise/read_writer.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/skycoin/dmsg/ioutil" + "github.com/skycoin/dmsg/pkg/ioutil" "github.com/skycoin/skywire-utilities/pkg/cipher" ) diff --git a/vendor/modules.txt b/vendor/modules.txt index e5d78dda1a..efd5f220a7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -154,19 +154,20 @@ github.com/shirou/gopsutil/v3/process ## explicit; go 1.13 github.com/sirupsen/logrus github.com/sirupsen/logrus/hooks/syslog -# github.com/skycoin/dmsg v0.0.0-20220309150149-59567d358f03 +# github.com/skycoin/dmsg v0.0.0-20220329122357-2e8d4715d14f ## explicit; go 1.16 github.com/skycoin/dmsg -github.com/skycoin/dmsg/direct -github.com/skycoin/dmsg/disc -github.com/skycoin/dmsg/dmsgctrl -github.com/skycoin/dmsg/dmsgget -github.com/skycoin/dmsg/dmsghttp -github.com/skycoin/dmsg/dmsgpty -github.com/skycoin/dmsg/dmsgtest -github.com/skycoin/dmsg/ioutil -github.com/skycoin/dmsg/noise -github.com/skycoin/dmsg/servermetrics +github.com/skycoin/dmsg/internal/servermetrics +github.com/skycoin/dmsg/pkg/direct +github.com/skycoin/dmsg/pkg/disc +github.com/skycoin/dmsg/pkg/dmsg +github.com/skycoin/dmsg/pkg/dmsgctrl +github.com/skycoin/dmsg/pkg/dmsgget +github.com/skycoin/dmsg/pkg/dmsghttp +github.com/skycoin/dmsg/pkg/dmsgpty +github.com/skycoin/dmsg/pkg/dmsgtest +github.com/skycoin/dmsg/pkg/ioutil +github.com/skycoin/dmsg/pkg/noise # github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6 ## explicit github.com/skycoin/noise