Merge pull request #1137 from mrpalide/fix/dmsg-new-structure-usage

fix dmsg imports
skycoin · Mar 29, 2022 · f1728e1 · f1728e1
2 parents 92f3024 + 9447343
commit f1728e1
Show file tree

Hide file tree

Showing 100 changed files with 99 additions and 93 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/...b.com/skycoin/dmsg/servermetrics/delta.go → ...coin/dmsg/internal/servermetrics/delta.go b/...b.com/skycoin/dmsg/servermetrics/delta.go → ...coin/dmsg/internal/servermetrics/delta.go
diff --git a/...b.com/skycoin/dmsg/servermetrics/empty.go → ...coin/dmsg/internal/servermetrics/empty.go b/...b.com/skycoin/dmsg/servermetrics/empty.go → ...coin/dmsg/internal/servermetrics/empty.go
diff --git a/...com/skycoin/dmsg/servermetrics/metrics.go → ...in/dmsg/internal/servermetrics/metrics.go b/...com/skycoin/dmsg/servermetrics/metrics.go → ...in/dmsg/internal/servermetrics/metrics.go
diff --git a/...in/dmsg/servermetrics/victoria_metrics.go → ...nternal/servermetrics/victoria_metrics.go b/...in/dmsg/servermetrics/victoria_metrics.go → ...nternal/servermetrics/victoria_metrics.go
diff --git a/.../github.com/skycoin/dmsg/direct/client.go → ...hub.com/skycoin/dmsg/pkg/direct/client.go b/.../github.com/skycoin/dmsg/direct/client.go → ...hub.com/skycoin/dmsg/pkg/direct/client.go
diff --git a/.../github.com/skycoin/dmsg/direct/direct.go → ...hub.com/skycoin/dmsg/pkg/direct/direct.go b/.../github.com/skycoin/dmsg/direct/direct.go → ...hub.com/skycoin/dmsg/pkg/direct/direct.go
diff --git a/...github.com/skycoin/dmsg/direct/entries.go → ...ub.com/skycoin/dmsg/pkg/direct/entries.go b/...github.com/skycoin/dmsg/direct/entries.go → ...ub.com/skycoin/dmsg/pkg/direct/entries.go
diff --git a/...or/github.com/skycoin/dmsg/disc/client.go → ...ithub.com/skycoin/dmsg/pkg/disc/client.go b/...or/github.com/skycoin/dmsg/disc/client.go → ...ithub.com/skycoin/dmsg/pkg/disc/client.go
diff --git a/vendor/github.com/skycoin/dmsg/disc/entry.go → ...github.com/skycoin/dmsg/pkg/disc/entry.go b/vendor/github.com/skycoin/dmsg/disc/entry.go → ...github.com/skycoin/dmsg/pkg/disc/entry.go
diff --git a/...hub.com/skycoin/dmsg/disc/http_message.go → ...com/skycoin/dmsg/pkg/disc/http_message.go b/...hub.com/skycoin/dmsg/disc/http_message.go → ...com/skycoin/dmsg/pkg/disc/http_message.go
diff --git a/...r/github.com/skycoin/dmsg/disc/testing.go → ...thub.com/skycoin/dmsg/pkg/disc/testing.go b/...r/github.com/skycoin/dmsg/disc/testing.go → ...thub.com/skycoin/dmsg/pkg/disc/testing.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ import ( @@
     	"fmt"
     	"net"
-    	"github.com/skycoin/dmsg"
+    	"github.com/skycoin/dmsg/pkg/dmsg"
     	"github.com/skycoin/skywire-utilities/pkg/cipher"
     )
@@ Expand Down @@