From c1c878efcf7c69b130c521870c7e825c4ac929f4 Mon Sep 17 00:00:00 2001 From: Egon Elbre Date: Mon, 20 Jan 2020 17:29:53 +0200 Subject: [PATCH] all: fix import groupings check-imports was broken and didn't complain about things. Change-Id: I38adafd16b4aba86f0eb4f53427b4393f9a6c710 --- private/migrate/create_test.go | 1 - satellite/downtime/estimation_chore.go | 1 - satellite/downtime/estimation_chore_test.go | 1 - satellite/metainfo/loop.go | 1 - satellite/satellitedb/dbx/gen.go | 3 +-- satellite/satellitedb/migrate_test.go | 1 - satellite/satellitedb/satellitedbtest/run.go | 1 - storagenode/preflight/localtime_test.go | 7 +++---- 8 files changed, 4 insertions(+), 12 deletions(-) diff --git a/private/migrate/create_test.go b/private/migrate/create_test.go index 14fada675..cdaef2555 100644 --- a/private/migrate/create_test.go +++ b/private/migrate/create_test.go @@ -13,7 +13,6 @@ import ( "github.com/stretchr/testify/require" "storj.io/common/testcontext" - "storj.io/storj/private/dbutil/pgutil/pgtest" "storj.io/storj/private/dbutil/tempdb" "storj.io/storj/private/migrate" diff --git a/satellite/downtime/estimation_chore.go b/satellite/downtime/estimation_chore.go index 4459c85a3..65fde5af3 100644 --- a/satellite/downtime/estimation_chore.go +++ b/satellite/downtime/estimation_chore.go @@ -10,7 +10,6 @@ import ( "go.uber.org/zap" "storj.io/common/sync2" - "storj.io/storj/satellite/overlay" ) diff --git a/satellite/downtime/estimation_chore_test.go b/satellite/downtime/estimation_chore_test.go index abf7665cc..736dce84d 100644 --- a/satellite/downtime/estimation_chore_test.go +++ b/satellite/downtime/estimation_chore_test.go @@ -11,7 +11,6 @@ import ( "go.uber.org/zap" "storj.io/common/testcontext" - "storj.io/storj/private/testplanet" "storj.io/storj/satellite" ) diff --git a/satellite/metainfo/loop.go b/satellite/metainfo/loop.go index 4b64b4284..5699fed8a 100644 --- a/satellite/metainfo/loop.go +++ b/satellite/metainfo/loop.go @@ -10,7 +10,6 @@ import ( "github.com/gogo/protobuf/proto" "github.com/skyrings/skyring-common/tools/uuid" "github.com/zeebo/errs" - "golang.org/x/time/rate" "storj.io/common/pb" diff --git a/satellite/satellitedb/dbx/gen.go b/satellite/satellitedb/dbx/gen.go index f75c86b03..af588aaeb 100644 --- a/satellite/satellitedb/dbx/gen.go +++ b/satellite/satellitedb/dbx/gen.go @@ -10,10 +10,9 @@ import ( "github.com/zeebo/errs" "gopkg.in/spacemonkeygo/monkit.v2" - "storj.io/storj/private/dbutil/txutil" - // load our cockroach sql driver for anywhere that uses this dbx.Open _ "storj.io/storj/private/dbutil/cockroachutil" + "storj.io/storj/private/dbutil/txutil" ) //go:generate sh gen.sh diff --git a/satellite/satellitedb/migrate_test.go b/satellite/satellitedb/migrate_test.go index df7b56dd2..31efdd859 100644 --- a/satellite/satellitedb/migrate_test.go +++ b/satellite/satellitedb/migrate_test.go @@ -20,7 +20,6 @@ import ( "golang.org/x/sync/errgroup" "storj.io/common/testcontext" - "storj.io/storj/private/dbutil/dbschema" "storj.io/storj/private/dbutil/pgutil" "storj.io/storj/private/dbutil/pgutil/pgtest" diff --git a/satellite/satellitedb/satellitedbtest/run.go b/satellite/satellitedb/satellitedbtest/run.go index 8de9c7120..00680402f 100644 --- a/satellite/satellitedb/satellitedbtest/run.go +++ b/satellite/satellitedb/satellitedbtest/run.go @@ -16,7 +16,6 @@ import ( "go.uber.org/zap/zaptest" "storj.io/common/testcontext" - "storj.io/storj/private/dbutil" "storj.io/storj/private/dbutil/pgutil" "storj.io/storj/private/dbutil/pgutil/pgtest" diff --git a/storagenode/preflight/localtime_test.go b/storagenode/preflight/localtime_test.go index 815236567..4e6787fe5 100644 --- a/storagenode/preflight/localtime_test.go +++ b/storagenode/preflight/localtime_test.go @@ -13,14 +13,13 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" + "storj.io/common/identity/testidentity" "storj.io/common/pb" + "storj.io/common/peertls/extensions" "storj.io/common/peertls/tlsopts" "storj.io/common/rpc" - "storj.io/storj/pkg/server" - - "storj.io/common/identity/testidentity" - "storj.io/common/peertls/extensions" "storj.io/common/testcontext" + "storj.io/storj/pkg/server" "storj.io/storj/private/testplanet" "storj.io/storj/storagenode/preflight" "storj.io/storj/storagenode/trust"