From aedf2ae35793064ff132d63c1728495e2ac8eb2b Mon Sep 17 00:00:00 2001 From: Moses Narrow Date: Tue, 2 Apr 2024 19:24:12 -0500 Subject: [PATCH] make format --- cmd/uptime-tracker/commands/root.go | 14 +++++++------- internal/skysocks/client.go | 1 - internal/skysocks/common.go | 1 - pkg/uptime-tracker/api/api.go | 6 +++--- pkg/uptime-tracker/api/api_test.go | 10 +++++----- pkg/uptime-tracker/store/memory_store_test.go | 3 +-- pkg/uptime-tracker/store/postgres_store.go | 3 +-- pkg/uptime-tracker/store/store.go | 3 +-- 8 files changed, 18 insertions(+), 23 deletions(-) diff --git a/cmd/uptime-tracker/commands/root.go b/cmd/uptime-tracker/commands/root.go index 3775141e..6e3df5e1 100644 --- a/cmd/uptime-tracker/commands/root.go +++ b/cmd/uptime-tracker/commands/root.go @@ -12,13 +12,6 @@ import ( "github.com/skycoin/dmsg/pkg/direct" "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/dmsg/pkg/dmsghttp" - "github.com/skycoin/skywire-services/internal/pg" - "github.com/skycoin/skywire-services/internal/utmetrics" - "github.com/skycoin/skywire-services/pkg/uptime-tracker/api" - "github.com/skycoin/skywire-services/pkg/uptime-tracker/store" - "github.com/spf13/cobra" - "gorm.io/gorm" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire-utilities/pkg/cmdutil" @@ -28,6 +21,13 @@ import ( "github.com/skycoin/skywire-utilities/pkg/metricsutil" "github.com/skycoin/skywire-utilities/pkg/storeconfig" "github.com/skycoin/skywire-utilities/pkg/tcpproxy" + "github.com/spf13/cobra" + "gorm.io/gorm" + + "github.com/skycoin/skywire-services/internal/pg" + "github.com/skycoin/skywire-services/internal/utmetrics" + "github.com/skycoin/skywire-services/pkg/uptime-tracker/api" + "github.com/skycoin/skywire-services/pkg/uptime-tracker/store" ) const ( diff --git a/internal/skysocks/client.go b/internal/skysocks/client.go index c1b85b8d..c14c72ad 100644 --- a/internal/skysocks/client.go +++ b/internal/skysocks/client.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/yamux" ipc "github.com/james-barrow/golang-ipc" - "github.com/skycoin/skywire/pkg/app" "github.com/skycoin/skywire/pkg/router" "github.com/skycoin/skywire/pkg/skyenv" diff --git a/internal/skysocks/common.go b/internal/skysocks/common.go index 3d70aa8b..2ea4196e 100644 --- a/internal/skysocks/common.go +++ b/internal/skysocks/common.go @@ -5,7 +5,6 @@ import ( "fmt" ipc "github.com/james-barrow/golang-ipc" - "github.com/skycoin/skywire/pkg/skyenv" ) diff --git a/pkg/uptime-tracker/api/api.go b/pkg/uptime-tracker/api/api.go index 5fcec7ab..c0b88829 100644 --- a/pkg/uptime-tracker/api/api.go +++ b/pkg/uptime-tracker/api/api.go @@ -21,9 +21,6 @@ import ( "github.com/go-echarts/go-echarts/v2/charts" "github.com/go-echarts/go-echarts/v2/opts" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-services/internal/utmetrics" - "github.com/skycoin/skywire-services/pkg/uptime-tracker/store" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire-utilities/pkg/geo" @@ -32,6 +29,9 @@ import ( "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire-utilities/pkg/metricsutil" "github.com/skycoin/skywire-utilities/pkg/netutil" + + "github.com/skycoin/skywire-services/internal/utmetrics" + "github.com/skycoin/skywire-services/pkg/uptime-tracker/store" ) const ( diff --git a/pkg/uptime-tracker/api/api_test.go b/pkg/uptime-tracker/api/api_test.go index a5b00bd9..77615d5a 100644 --- a/pkg/uptime-tracker/api/api_test.go +++ b/pkg/uptime-tracker/api/api_test.go @@ -10,15 +10,15 @@ import ( "net/http/httptest" "testing" - "github.com/skycoin/skywire-services/internal/utmetrics" - "github.com/skycoin/skywire-services/pkg/uptime-tracker/store" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "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/storeconfig" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + + "github.com/skycoin/skywire-services/internal/utmetrics" + "github.com/skycoin/skywire-services/pkg/uptime-tracker/store" ) var testPubKey, testSec = cipher.GenerateKeyPair() diff --git a/pkg/uptime-tracker/store/memory_store_test.go b/pkg/uptime-tracker/store/memory_store_test.go index 7b384c02..1fb482ac 100644 --- a/pkg/uptime-tracker/store/memory_store_test.go +++ b/pkg/uptime-tracker/store/memory_store_test.go @@ -9,10 +9,9 @@ import ( "testing" "time" - "github.com/stretchr/testify/require" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire-utilities/pkg/geo" + "github.com/stretchr/testify/require" ) func TestMemory(t *testing.T) { diff --git a/pkg/uptime-tracker/store/postgres_store.go b/pkg/uptime-tracker/store/postgres_store.go index 1408f8c8..a94f589b 100644 --- a/pkg/uptime-tracker/store/postgres_store.go +++ b/pkg/uptime-tracker/store/postgres_store.go @@ -8,10 +8,9 @@ import ( "sync" "time" - "gorm.io/gorm" - "github.com/skycoin/skywire-utilities/pkg/geo" "github.com/skycoin/skywire-utilities/pkg/logging" + "gorm.io/gorm" ) type postgresStore struct { diff --git a/pkg/uptime-tracker/store/store.go b/pkg/uptime-tracker/store/store.go index df251d63..5ab10e75 100644 --- a/pkg/uptime-tracker/store/store.go +++ b/pkg/uptime-tracker/store/store.go @@ -3,10 +3,9 @@ package store import ( "time" - "gorm.io/gorm" - "github.com/skycoin/skywire-utilities/pkg/geo" "github.com/skycoin/skywire-utilities/pkg/logging" + "gorm.io/gorm" ) const (