update skywire-utilities import path (#34)

skycoin · Dec 17, 2024 · 634b05d · 634b05d
1 parent 233c2d6
commit 634b05d
Show file tree

Hide file tree

Showing 127 changed files with 668 additions and 568 deletions.
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@ TEST_ARGS:=-tags no_ci -cover -timeout=5m
 
 BIN := ${PWD}/bin
 
-SKYWIRE_UTILITIES_REPO := github.com/skycoin/skywire-utilities
+SKYWIRE_UTILITIES_REPO := github.com/skycoin/skywire/pkg/skywire-utilities
 BUILDINFO_PATH := $(SKYWIRE_UTILITIES_REPO)/pkg/buildinfo
 
 BUILDINFO_VERSION := -X $(BUILDINFO_PATH).version=$(VERSION)

diff --git a/cmd/service-discovery/commands/root.go b/cmd/service-discovery/commands/root.go
@@ -12,14 +12,14 @@ import (
 	"github.com/skycoin/dmsg/pkg/direct"
 	"github.com/skycoin/dmsg/pkg/dmsg"
 	"github.com/skycoin/dmsg/pkg/dmsghttp"
-	"github.com/skycoin/skywire-utilities/pkg/buildinfo"
-	"github.com/skycoin/skywire-utilities/pkg/cipher"
-	"github.com/skycoin/skywire-utilities/pkg/cmdutil"
-	"github.com/skycoin/skywire-utilities/pkg/httpauth"
-	"github.com/skycoin/skywire-utilities/pkg/logging"
-	"github.com/skycoin/skywire-utilities/pkg/metricsutil"
-	"github.com/skycoin/skywire-utilities/pkg/storeconfig"
-	"github.com/skycoin/skywire-utilities/pkg/tcpproxy"
+	"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/cmdutil"
+	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth"
+	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging"
+	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil"
+	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/storeconfig"
+	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/tcpproxy"
 	"github.com/spf13/cobra"
 	"gorm.io/gorm"
 

diff --git a/go.mod b/go.mod
@@ -1,8 +1,8 @@
 module github.com/skycoin/skycoin-service-discovery
 
-go 1.22.0
+go 1.23
 
-toolchain go1.23.1
+toolchain go1.23.4
 
 require (
 	github.com/chen3feng/safecast v0.0.0-20220908170618-81b2ecd47937
@@ -12,10 +12,9 @@ require (
 	github.com/ivanpirog/coloredcobra v1.0.1
 	github.com/lib/pq v1.10.9
 	github.com/sirupsen/logrus v1.9.3
-	github.com/skycoin/dmsg v1.3.29-0.20241019182716-022283c93835
-	github.com/skycoin/skycoin v0.28.0
-	github.com/skycoin/skywire v1.3.28
-	github.com/skycoin/skywire-utilities v1.3.25
+	github.com/skycoin/dmsg v1.3.29-0.20241217193208-d32ec623e670
+	github.com/skycoin/skycoin v0.28.1-0.20241105130348-39b49a2d0a7f
+	github.com/skycoin/skywire v1.3.29-rc1.0.20241217192205-cb65518c5522
 	github.com/spf13/cobra v1.8.1
 	github.com/stretchr/testify v1.9.0
 	gorm.io/driver/postgres v1.5.9
@@ -27,9 +26,9 @@ require (
 	github.com/VictoriaMetrics/metrics v1.35.1 // indirect
 	github.com/ccding/go-stun/stun v0.0.0-20200514191101-4dc67bcdb029 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/fatih/color v1.17.0 // indirect
+	github.com/fatih/color v1.18.0 // indirect
 	github.com/go-chi/chi/v5 v5.1.0 // indirect
 	github.com/go-redis/redis/v8 v8.11.5 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
@@ -47,6 +46,7 @@ require (
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
 	github.com/klauspost/reedsolomon v1.12.4 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
@@ -55,7 +55,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.20.2 // indirect
 	github.com/pires/go-proxyproto v0.8.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/quic-go/quic-go v0.48.0 // indirect
 	github.com/rogpeppe/go-internal v1.13.1 // indirect
 	github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6 // indirect
@@ -86,6 +86,7 @@ require (
 //replace github.com/skycoin/skywire => ../skywire
 
 //replace github.com/skycoin/dmsg => github.com/skycoin/dmsg
+//replace github.com/skycoin/dmsg => github.com/skycoin/dmsg v1.3.29-0.20241217193208-d32ec623e670
 
 // replace github.com/skycoin/skywire => ../skywire
 

diff --git a/go.sum b/go.sum
diff --git a/internal/sdmetrics/victoria_metrics.go b/internal/sdmetrics/victoria_metrics.go
@@ -1,7 +1,7 @@
 package sdmetrics
 
 import (
-	"github.com/skycoin/skywire-utilities/pkg/metricsutil"
+	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil"
 )
 
 // VictoriaMetrics implements `Metrics` using `VictoriaMetrics`.

diff --git a/pkg/service-discovery/api/api.go b/pkg/service-discovery/api/api.go
@@ -16,14 +16,14 @@ import (
 	"github.com/go-chi/chi/middleware"
 	"github.com/go-chi/cors"
 	"github.com/sirupsen/logrus"
-	"github.com/skycoin/skywire-utilities/pkg/buildinfo"
-	"github.com/skycoin/skywire-utilities/pkg/cipher"
-	"github.com/skycoin/skywire-utilities/pkg/geo"
-	"github.com/skycoin/skywire-utilities/pkg/httpauth"
-	"github.com/skycoin/skywire-utilities/pkg/httputil"
-	"github.com/skycoin/skywire-utilities/pkg/metricsutil"
-	"github.com/skycoin/skywire-utilities/pkg/networkmonitor"
 	"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/geo"
+	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth"
+	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil"
+	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil"
+	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/networkmonitor"
 
 	"github.com/skycoin/skycoin-service-discovery/internal/sdmetrics"
 	"github.com/skycoin/skycoin-service-discovery/pkg/service-discovery/store"

diff --git a/pkg/service-discovery/api/api_test.go b/pkg/service-discovery/api/api_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/skycoin/skycoin/src/util/logging"
-	"github.com/skycoin/skywire-utilities/pkg/cipher"
 	"github.com/skycoin/skywire/pkg/servicedisc"
+	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 

diff --git a/pkg/service-discovery/api/integration_test.go b/pkg/service-discovery/api/integration_test.go
@@ -10,12 +10,12 @@ import (
 	"testing"
 
 	"github.com/go-redis/redis"
-	"github.com/skycoin/skywire-utilities/pkg/cipher"
-	"github.com/skycoin/skywire-utilities/pkg/cmdutil"
-	"github.com/skycoin/skywire-utilities/pkg/httpauth"
-	"github.com/skycoin/skywire-utilities/pkg/logging"
-	"github.com/skycoin/skywire-utilities/pkg/storeconfig"
 	"github.com/skycoin/skywire/pkg/servicedisc"
+	"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/httpauth"
+	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging"
+	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/storeconfig"
 	"github.com/stretchr/testify/require"
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"

diff --git a/pkg/service-discovery/store/postgres_store.go b/pkg/service-discovery/store/postgres_store.go
@@ -10,9 +10,9 @@ import (
 	"github.com/chen3feng/safecast"
 	"github.com/lib/pq"
 	"github.com/sirupsen/logrus"
-	"github.com/skycoin/skywire-utilities/pkg/geo"
-	"github.com/skycoin/skywire-utilities/pkg/logging"
 	"github.com/skycoin/skywire/pkg/servicedisc"
+	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/geo"
+	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging"
 	"gorm.io/gorm"
 )
 

diff --git a/pkg/service-discovery/store/store.go b/pkg/service-discovery/store/store.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"io"
 
-	"github.com/skycoin/skywire-utilities/pkg/logging"
 	"github.com/skycoin/skywire/pkg/servicedisc"
+	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging"
 	"gorm.io/gorm"
 )
 

diff --git a/vendor/github.com/fatih/color/README.md b/vendor/github.com/fatih/color/README.md
diff --git a/vendor/github.com/fatih/color/color.go b/vendor/github.com/fatih/color/color.go
diff --git a/vendor/github.com/skycoin/dmsg/internal/servermetrics/victoria_metrics.go b/vendor/github.com/skycoin/dmsg/internal/servermetrics/victoria_metrics.go
diff --git a/vendor/github.com/skycoin/dmsg/pkg/direct/client.go b/vendor/github.com/skycoin/dmsg/pkg/direct/client.go
diff --git a/vendor/github.com/skycoin/dmsg/pkg/direct/direct.go b/vendor/github.com/skycoin/dmsg/pkg/direct/direct.go
diff --git a/vendor/github.com/skycoin/dmsg/pkg/direct/entries.go b/vendor/github.com/skycoin/dmsg/pkg/direct/entries.go
diff --git a/vendor/github.com/skycoin/dmsg/pkg/disc/client.go b/vendor/github.com/skycoin/dmsg/pkg/disc/client.go
diff --git a/vendor/github.com/skycoin/dmsg/pkg/disc/entry.go b/vendor/github.com/skycoin/dmsg/pkg/disc/entry.go
diff --git a/vendor/github.com/skycoin/dmsg/pkg/disc/testing.go b/vendor/github.com/skycoin/dmsg/pkg/disc/testing.go
diff --git a/vendor/github.com/skycoin/dmsg/pkg/dmsg/client.go b/vendor/github.com/skycoin/dmsg/pkg/dmsg/client.go
diff --git a/vendor/github.com/skycoin/dmsg/pkg/dmsg/client_session.go b/vendor/github.com/skycoin/dmsg/pkg/dmsg/client_session.go
diff --git a/vendor/github.com/skycoin/dmsg/pkg/dmsg/entity_common.go b/vendor/github.com/skycoin/dmsg/pkg/dmsg/entity_common.go