From 267506bb20aaab42348feb081563a42eda0eb00d Mon Sep 17 00:00:00 2001 From: Egon Elbre Date: Wed, 21 Apr 2021 15:42:57 +0300 Subject: [PATCH] satellite/metabase: move package one level higher metabase has become a central concept and it's more suitable for it to be directly nested under satellite rather than being part of metainfo. metainfo is going to be the "endpoint" logic for handling requests. Change-Id: I53770d6761ac1e9a1283b5aa68f471b21e784198 --- cmd/metabase-createdat-migration/main.go | 2 +- cmd/metabase-createdat-migration/main_test.go | 2 +- satellite/accounting/billing_test.go | 2 +- satellite/accounting/bucketstats.go | 2 +- satellite/accounting/db.go | 2 +- satellite/accounting/db_test.go | 2 +- satellite/accounting/projectusage_test.go | 2 +- satellite/accounting/tally/tally.go | 2 +- satellite/accounting/tally/tally_test.go | 2 +- satellite/audit/containment.go | 2 +- satellite/audit/disqualification_test.go | 2 +- satellite/audit/getshare_test.go | 2 +- satellite/audit/queue_test.go | 2 +- satellite/audit/reservoir.go | 2 +- satellite/audit/reverify_test.go | 2 +- satellite/audit/verifier.go | 2 +- satellite/audit/verifier_test.go | 2 +- satellite/audit/verifier_unit_test.go | 2 +- satellite/console/buckets.go | 2 +- satellite/gc/gc_test.go | 2 +- satellite/gracefulexit/chore_test.go | 2 +- satellite/gracefulexit/db.go | 2 +- satellite/gracefulexit/db_test.go | 2 +- satellite/gracefulexit/endpoint.go | 2 +- satellite/gracefulexit/endpoint_test.go | 2 +- satellite/gracefulexit/gracefulexit_test.go | 2 +- satellite/gracefulexit/pending.go | 2 +- satellite/gracefulexit/pending_test.go | 2 +- satellite/inspector/inspector.go | 2 +- satellite/inspector/inspector_test.go | 2 +- satellite/{metainfo => }/metabase/alias.go | 0 satellite/{metainfo => }/metabase/alias_test.go | 2 +- satellite/{metainfo => }/metabase/aliascache.go | 0 satellite/{metainfo => }/metabase/aliascache_test.go | 2 +- satellite/{metainfo => }/metabase/aliaspiece.go | 0 satellite/{metainfo => }/metabase/aliaspiece_test.go | 2 +- satellite/{metainfo => }/metabase/bench_expired_test.go | 2 +- satellite/{metainfo => }/metabase/bench_test.go | 2 +- satellite/{metainfo => }/metabase/commit.go | 0 satellite/{metainfo => }/metabase/commit_object.go | 0 satellite/{metainfo => }/metabase/commit_object_test.go | 2 +- satellite/{metainfo => }/metabase/commit_test.go | 2 +- satellite/{metainfo => }/metabase/common.go | 0 satellite/{metainfo => }/metabase/common_test.go | 2 +- satellite/{metainfo => }/metabase/consts_test.go | 0 satellite/{metainfo => }/metabase/db.go | 0 satellite/{metainfo => }/metabase/db_migrate_test.go | 2 +- satellite/{metainfo => }/metabase/db_test.go | 2 +- satellite/{metainfo => }/metabase/delete.go | 0 satellite/{metainfo => }/metabase/delete_bucket.go | 0 satellite/{metainfo => }/metabase/delete_bucket_test.go | 2 +- satellite/{metainfo => }/metabase/delete_expired.go | 0 satellite/{metainfo => }/metabase/delete_expired_test.go | 2 +- satellite/{metainfo => }/metabase/delete_test.go | 2 +- satellite/{metainfo => }/metabase/encoding.go | 0 satellite/{metainfo => }/metabase/get.go | 0 satellite/{metainfo => }/metabase/get_test.go | 2 +- satellite/{metainfo => }/metabase/iterator.go | 0 satellite/{metainfo => }/metabase/iterator_test.go | 2 +- satellite/{metainfo => }/metabase/iterator_util_test.go | 0 satellite/{metainfo => }/metabase/list.go | 0 satellite/{metainfo => }/metabase/list_segments.go | 0 satellite/{metainfo => }/metabase/list_segments_test.go | 2 +- satellite/{metainfo => }/metabase/loop.go | 0 satellite/{metainfo => }/metabase/loop_test.go | 2 +- satellite/{metainfo => }/metabase/raw.go | 0 satellite/{metainfo => }/metabase/streamstat.go | 0 satellite/{metainfo => }/metabase/streamstat_test.go | 2 +- satellite/{metainfo => }/metabase/test_test.go | 2 +- satellite/{metainfo => }/metabase/update.go | 0 satellite/{metainfo => }/metabase/update_test.go | 2 +- satellite/{metainfo => }/metabase/util.go | 0 satellite/metainfo/config.go | 2 +- satellite/metainfo/db.go | 2 +- satellite/metainfo/endpoint_test.go | 2 +- satellite/metainfo/expireddeletion/chore.go | 2 +- satellite/metainfo/metainfo.go | 2 +- satellite/metainfo/metainfo_test.go | 2 +- satellite/metainfo/metaloop/service.go | 2 +- satellite/metainfo/metaloop/service_test.go | 2 +- satellite/metainfo/service.go | 2 +- satellite/metainfo/validation.go | 2 +- satellite/orders/endpoint.go | 2 +- satellite/orders/endpoint_test.go | 2 +- satellite/orders/service.go | 2 +- satellite/orders/service_test.go | 2 +- satellite/orders/signer.go | 2 +- satellite/orders/signer_test.go | 2 +- satellite/overlay/service.go | 2 +- satellite/payments/stripecoinpayments/service_test.go | 2 +- satellite/repair/checker/checker.go | 2 +- satellite/repair/checker/checker_test.go | 2 +- satellite/repair/checker/checkerstats.go | 2 +- satellite/repair/checker/online.go | 2 +- satellite/repair/checker/online_test.go | 2 +- satellite/repair/irreparable/irreparable.go | 2 +- satellite/repair/irreparable/irreparable_test.go | 2 +- satellite/repair/repair_test.go | 2 +- satellite/repair/repairer/segments.go | 2 +- satellite/satellitedb/bucketsdb.go | 2 +- satellite/satellitedb/containment.go | 2 +- satellite/satellitedb/gracefulexit.go | 2 +- satellite/satellitedb/irreparabledb.go | 2 +- satellite/satellitedb/projectaccounting.go | 2 +- storagenode/orders/service_test.go | 2 +- 105 files changed, 83 insertions(+), 83 deletions(-) rename satellite/{metainfo => }/metabase/alias.go (100%) rename satellite/{metainfo => }/metabase/alias_test.go (98%) rename satellite/{metainfo => }/metabase/aliascache.go (100%) rename satellite/{metainfo => }/metabase/aliascache_test.go (99%) rename satellite/{metainfo => }/metabase/aliaspiece.go (100%) rename satellite/{metainfo => }/metabase/aliaspiece_test.go (99%) rename satellite/{metainfo => }/metabase/bench_expired_test.go (99%) rename satellite/{metainfo => }/metabase/bench_test.go (99%) rename satellite/{metainfo => }/metabase/commit.go (100%) rename satellite/{metainfo => }/metabase/commit_object.go (100%) rename satellite/{metainfo => }/metabase/commit_object_test.go (99%) rename satellite/{metainfo => }/metabase/commit_test.go (99%) rename satellite/{metainfo => }/metabase/common.go (100%) rename satellite/{metainfo => }/metabase/common_test.go (99%) rename satellite/{metainfo => }/metabase/consts_test.go (100%) rename satellite/{metainfo => }/metabase/db.go (100%) rename satellite/{metainfo => }/metabase/db_migrate_test.go (98%) rename satellite/{metainfo => }/metabase/db_test.go (98%) rename satellite/{metainfo => }/metabase/delete.go (100%) rename satellite/{metainfo => }/metabase/delete_bucket.go (100%) rename satellite/{metainfo => }/metabase/delete_bucket_test.go (99%) rename satellite/{metainfo => }/metabase/delete_expired.go (100%) rename satellite/{metainfo => }/metabase/delete_expired_test.go (98%) rename satellite/{metainfo => }/metabase/delete_test.go (99%) rename satellite/{metainfo => }/metabase/encoding.go (100%) rename satellite/{metainfo => }/metabase/get.go (100%) rename satellite/{metainfo => }/metabase/get_test.go (99%) rename satellite/{metainfo => }/metabase/iterator.go (100%) rename satellite/{metainfo => }/metabase/iterator_test.go (99%) rename satellite/{metainfo => }/metabase/iterator_util_test.go (100%) rename satellite/{metainfo => }/metabase/list.go (100%) rename satellite/{metainfo => }/metabase/list_segments.go (100%) rename satellite/{metainfo => }/metabase/list_segments_test.go (99%) rename satellite/{metainfo => }/metabase/loop.go (100%) rename satellite/{metainfo => }/metabase/loop_test.go (99%) rename satellite/{metainfo => }/metabase/raw.go (100%) rename satellite/{metainfo => }/metabase/streamstat.go (100%) rename satellite/{metainfo => }/metabase/streamstat_test.go (98%) rename satellite/{metainfo => }/metabase/test_test.go (99%) rename satellite/{metainfo => }/metabase/update.go (100%) rename satellite/{metainfo => }/metabase/update_test.go (99%) rename satellite/{metainfo => }/metabase/util.go (100%) diff --git a/cmd/metabase-createdat-migration/main.go b/cmd/metabase-createdat-migration/main.go index 8df2002b9..46f4a5c36 100644 --- a/cmd/metabase-createdat-migration/main.go +++ b/cmd/metabase-createdat-migration/main.go @@ -15,8 +15,8 @@ import ( "go.uber.org/zap/zapcore" "storj.io/common/uuid" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/metainfo" - "storj.io/storj/satellite/metainfo/metabase" ) // Config defines configuration for migration. diff --git a/cmd/metabase-createdat-migration/main_test.go b/cmd/metabase-createdat-migration/main_test.go index 080f088e2..776a5ae09 100644 --- a/cmd/metabase-createdat-migration/main_test.go +++ b/cmd/metabase-createdat-migration/main_test.go @@ -19,8 +19,8 @@ import ( migrator "storj.io/storj/cmd/metabase-createdat-migration" "storj.io/storj/private/dbutil" "storj.io/storj/private/dbutil/tempdb" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/metainfo" - "storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/satellitedb/satellitedbtest" ) diff --git a/satellite/accounting/billing_test.go b/satellite/accounting/billing_test.go index b21927054..a120f37cf 100644 --- a/satellite/accounting/billing_test.go +++ b/satellite/accounting/billing_test.go @@ -16,7 +16,7 @@ import ( "storj.io/common/uuid" "storj.io/storj/private/testplanet" "storj.io/storj/satellite/accounting" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) func TestBilling_DownloadWithoutExpansionFactor(t *testing.T) { diff --git a/satellite/accounting/bucketstats.go b/satellite/accounting/bucketstats.go index bcbf1f615..ccac1d404 100644 --- a/satellite/accounting/bucketstats.go +++ b/satellite/accounting/bucketstats.go @@ -4,7 +4,7 @@ package accounting import ( - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) // BucketTally contains information about aggregate data stored in a bucket. diff --git a/satellite/accounting/db.go b/satellite/accounting/db.go index 6792fa75d..fa7768b30 100644 --- a/satellite/accounting/db.go +++ b/satellite/accounting/db.go @@ -11,7 +11,7 @@ import ( "storj.io/common/storj" "storj.io/common/uuid" "storj.io/storj/satellite/compensation" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/orders" ) diff --git a/satellite/accounting/db_test.go b/satellite/accounting/db_test.go index b24dd0a4d..a1a36ec37 100644 --- a/satellite/accounting/db_test.go +++ b/satellite/accounting/db_test.go @@ -20,7 +20,7 @@ import ( "storj.io/storj/satellite" "storj.io/storj/satellite/accounting" "storj.io/storj/satellite/console" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/satellitedb/satellitedbtest" ) diff --git a/satellite/accounting/projectusage_test.go b/satellite/accounting/projectusage_test.go index e5c2a81c8..07d3b2d0e 100644 --- a/satellite/accounting/projectusage_test.go +++ b/satellite/accounting/projectusage_test.go @@ -28,7 +28,7 @@ import ( "storj.io/storj/private/testplanet" "storj.io/storj/satellite" "storj.io/storj/satellite/accounting" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/orders" "storj.io/storj/satellite/satellitedb/satellitedbtest" ) diff --git a/satellite/accounting/tally/tally.go b/satellite/accounting/tally/tally.go index 81bd4ea67..66f6bb2c9 100644 --- a/satellite/accounting/tally/tally.go +++ b/satellite/accounting/tally/tally.go @@ -15,7 +15,7 @@ import ( "storj.io/common/sync2" "storj.io/common/uuid" "storj.io/storj/satellite/accounting" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/metainfo/metaloop" ) diff --git a/satellite/accounting/tally/tally_test.go b/satellite/accounting/tally/tally_test.go index 25b4b932c..2bb7c825c 100644 --- a/satellite/accounting/tally/tally_test.go +++ b/satellite/accounting/tally/tally_test.go @@ -21,7 +21,7 @@ import ( "storj.io/storj/private/teststorj" "storj.io/storj/satellite/accounting" "storj.io/storj/satellite/accounting/tally" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) func TestDeleteTalliesBefore(t *testing.T) { diff --git a/satellite/audit/containment.go b/satellite/audit/containment.go index d3e1a769e..a374aced4 100644 --- a/satellite/audit/containment.go +++ b/satellite/audit/containment.go @@ -10,7 +10,7 @@ import ( "storj.io/common/pb" "storj.io/common/storj" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) var ( diff --git a/satellite/audit/disqualification_test.go b/satellite/audit/disqualification_test.go index 0c9756fb9..4e0cab0d5 100644 --- a/satellite/audit/disqualification_test.go +++ b/satellite/audit/disqualification_test.go @@ -19,7 +19,7 @@ import ( "storj.io/storj/private/testplanet" "storj.io/storj/satellite" "storj.io/storj/satellite/audit" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/overlay" ) diff --git a/satellite/audit/getshare_test.go b/satellite/audit/getshare_test.go index ae0c74b03..71ec101e9 100644 --- a/satellite/audit/getshare_test.go +++ b/satellite/audit/getshare_test.go @@ -19,7 +19,7 @@ import ( "storj.io/common/testrand" "storj.io/storj/private/testplanet" "storj.io/storj/satellite/audit" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) type mockConnector struct { diff --git a/satellite/audit/queue_test.go b/satellite/audit/queue_test.go index 8e622763a..e93143adc 100644 --- a/satellite/audit/queue_test.go +++ b/satellite/audit/queue_test.go @@ -13,7 +13,7 @@ import ( "storj.io/common/errs2" "storj.io/common/testcontext" "storj.io/common/testrand" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) func TestQueues(t *testing.T) { diff --git a/satellite/audit/reservoir.go b/satellite/audit/reservoir.go index 2bbbd5232..b99c4e170 100644 --- a/satellite/audit/reservoir.go +++ b/satellite/audit/reservoir.go @@ -8,7 +8,7 @@ import ( "time" "storj.io/common/uuid" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/metainfo/metaloop" ) diff --git a/satellite/audit/reverify_test.go b/satellite/audit/reverify_test.go index 4d071a29c..9b8933e47 100644 --- a/satellite/audit/reverify_test.go +++ b/satellite/audit/reverify_test.go @@ -23,7 +23,7 @@ import ( "storj.io/storj/private/testplanet" "storj.io/storj/satellite" "storj.io/storj/satellite/audit" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/storagenode" ) diff --git a/satellite/audit/verifier.go b/satellite/audit/verifier.go index 680537bab..80f66442f 100644 --- a/satellite/audit/verifier.go +++ b/satellite/audit/verifier.go @@ -23,8 +23,8 @@ import ( "storj.io/common/rpc" "storj.io/common/rpc/rpcstatus" "storj.io/common/storj" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/metainfo" - "storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/orders" "storj.io/storj/satellite/overlay" "storj.io/uplink/private/piecestore" diff --git a/satellite/audit/verifier_test.go b/satellite/audit/verifier_test.go index 4ae602318..9b1cb9f2f 100644 --- a/satellite/audit/verifier_test.go +++ b/satellite/audit/verifier_test.go @@ -25,7 +25,7 @@ import ( "storj.io/storj/private/testplanet" "storj.io/storj/satellite" "storj.io/storj/satellite/audit" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/storagenode" ) diff --git a/satellite/audit/verifier_unit_test.go b/satellite/audit/verifier_unit_test.go index 603539b8f..a6ed4d26d 100644 --- a/satellite/audit/verifier_unit_test.go +++ b/satellite/audit/verifier_unit_test.go @@ -15,7 +15,7 @@ import ( "storj.io/common/pkcrypto" "storj.io/common/storj" "storj.io/common/testrand" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) func TestFailingAudit(t *testing.T) { diff --git a/satellite/console/buckets.go b/satellite/console/buckets.go index 04272c7ba..55384eae2 100644 --- a/satellite/console/buckets.go +++ b/satellite/console/buckets.go @@ -9,7 +9,7 @@ import ( "storj.io/common/macaroon" "storj.io/common/storj" "storj.io/common/uuid" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) // Buckets is the interface for the database to interact with buckets. diff --git a/satellite/gc/gc_test.go b/satellite/gc/gc_test.go index da2c38a1e..5b4ea3187 100644 --- a/satellite/gc/gc_test.go +++ b/satellite/gc/gc_test.go @@ -25,7 +25,7 @@ import ( "storj.io/storj/private/testplanet" "storj.io/storj/satellite" "storj.io/storj/satellite/gc" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/storage" "storj.io/storj/storagenode" "storj.io/uplink/private/etag" diff --git a/satellite/gracefulexit/chore_test.go b/satellite/gracefulexit/chore_test.go index fb4332cdc..a726c2da2 100644 --- a/satellite/gracefulexit/chore_test.go +++ b/satellite/gracefulexit/chore_test.go @@ -20,7 +20,7 @@ import ( "storj.io/storj/private/testplanet" "storj.io/storj/satellite" "storj.io/storj/satellite/gracefulexit" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/overlay" "storj.io/storj/satellite/satellitedb/satellitedbtest" "storj.io/uplink/private/etag" diff --git a/satellite/gracefulexit/db.go b/satellite/gracefulexit/db.go index 6cac32046..13e992da3 100644 --- a/satellite/gracefulexit/db.go +++ b/satellite/gracefulexit/db.go @@ -8,7 +8,7 @@ import ( "time" "storj.io/common/storj" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) // Progress represents the persisted graceful exit progress record. diff --git a/satellite/gracefulexit/db_test.go b/satellite/gracefulexit/db_test.go index 347610749..9fcd5d4f1 100644 --- a/satellite/gracefulexit/db_test.go +++ b/satellite/gracefulexit/db_test.go @@ -15,7 +15,7 @@ import ( "storj.io/common/testrand" "storj.io/storj/satellite" "storj.io/storj/satellite/gracefulexit" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/satellitedb/satellitedbtest" ) diff --git a/satellite/gracefulexit/endpoint.go b/satellite/gracefulexit/endpoint.go index 2830bd56c..ea5e94d9d 100644 --- a/satellite/gracefulexit/endpoint.go +++ b/satellite/gracefulexit/endpoint.go @@ -21,8 +21,8 @@ import ( "storj.io/common/signing" "storj.io/common/storj" "storj.io/common/sync2" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/metainfo" - "storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/orders" "storj.io/storj/satellite/overlay" "storj.io/uplink/private/eestream" diff --git a/satellite/gracefulexit/endpoint_test.go b/satellite/gracefulexit/endpoint_test.go index d4114953e..e1d569d85 100644 --- a/satellite/gracefulexit/endpoint_test.go +++ b/satellite/gracefulexit/endpoint_test.go @@ -31,8 +31,8 @@ import ( "storj.io/storj/private/testblobs" "storj.io/storj/private/testplanet" "storj.io/storj/satellite" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/metainfo" - "storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/overlay" "storj.io/storj/storagenode" "storj.io/storj/storagenode/gracefulexit" diff --git a/satellite/gracefulexit/gracefulexit_test.go b/satellite/gracefulexit/gracefulexit_test.go index e3560d58a..58a9c2476 100644 --- a/satellite/gracefulexit/gracefulexit_test.go +++ b/satellite/gracefulexit/gracefulexit_test.go @@ -15,7 +15,7 @@ import ( "storj.io/common/testcontext" "storj.io/storj/private/testplanet" "storj.io/storj/satellite/gracefulexit" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/overlay" ) diff --git a/satellite/gracefulexit/pending.go b/satellite/gracefulexit/pending.go index 853d41f62..b8d4e10c9 100644 --- a/satellite/gracefulexit/pending.go +++ b/satellite/gracefulexit/pending.go @@ -9,7 +9,7 @@ import ( "storj.io/common/pb" "storj.io/common/storj" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) // PendingFinishedPromise for waiting for information about finished state. diff --git a/satellite/gracefulexit/pending_test.go b/satellite/gracefulexit/pending_test.go index 1fe6e36f4..0ed84024b 100644 --- a/satellite/gracefulexit/pending_test.go +++ b/satellite/gracefulexit/pending_test.go @@ -18,7 +18,7 @@ import ( "storj.io/common/testcontext" "storj.io/common/testrand" "storj.io/storj/satellite/gracefulexit" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) func TestPendingBasic(t *testing.T) { diff --git a/satellite/inspector/inspector.go b/satellite/inspector/inspector.go index d6054d687..5f8696d42 100644 --- a/satellite/inspector/inspector.go +++ b/satellite/inspector/inspector.go @@ -15,8 +15,8 @@ import ( "storj.io/common/storj" "storj.io/common/uuid" "storj.io/storj/satellite/internalpb" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/metainfo" - "storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/overlay" ) diff --git a/satellite/inspector/inspector_test.go b/satellite/inspector/inspector_test.go index 268ef2d80..2e7f728c6 100644 --- a/satellite/inspector/inspector_test.go +++ b/satellite/inspector/inspector_test.go @@ -20,7 +20,7 @@ import ( "storj.io/common/testrand" "storj.io/storj/private/testplanet" "storj.io/storj/satellite/internalpb" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/uplink/private/eestream" ) diff --git a/satellite/metainfo/metabase/alias.go b/satellite/metabase/alias.go similarity index 100% rename from satellite/metainfo/metabase/alias.go rename to satellite/metabase/alias.go diff --git a/satellite/metainfo/metabase/alias_test.go b/satellite/metabase/alias_test.go similarity index 98% rename from satellite/metainfo/metabase/alias_test.go rename to satellite/metabase/alias_test.go index fc7c049f5..91973c65f 100644 --- a/satellite/metainfo/metabase/alias_test.go +++ b/satellite/metabase/alias_test.go @@ -12,7 +12,7 @@ import ( "storj.io/common/storj" "storj.io/common/testcontext" "storj.io/common/testrand" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) func TestNodeAliases(t *testing.T) { diff --git a/satellite/metainfo/metabase/aliascache.go b/satellite/metabase/aliascache.go similarity index 100% rename from satellite/metainfo/metabase/aliascache.go rename to satellite/metabase/aliascache.go diff --git a/satellite/metainfo/metabase/aliascache_test.go b/satellite/metabase/aliascache_test.go similarity index 99% rename from satellite/metainfo/metabase/aliascache_test.go rename to satellite/metabase/aliascache_test.go index 75e8839f6..0ad20cb58 100644 --- a/satellite/metainfo/metabase/aliascache_test.go +++ b/satellite/metabase/aliascache_test.go @@ -17,7 +17,7 @@ import ( "storj.io/common/storj" "storj.io/common/testcontext" "storj.io/common/testrand" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) func TestNodeAliasCache(t *testing.T) { diff --git a/satellite/metainfo/metabase/aliaspiece.go b/satellite/metabase/aliaspiece.go similarity index 100% rename from satellite/metainfo/metabase/aliaspiece.go rename to satellite/metabase/aliaspiece.go diff --git a/satellite/metainfo/metabase/aliaspiece_test.go b/satellite/metabase/aliaspiece_test.go similarity index 99% rename from satellite/metainfo/metabase/aliaspiece_test.go rename to satellite/metabase/aliaspiece_test.go index 2459ffd32..a6ad30d49 100644 --- a/satellite/metainfo/metabase/aliaspiece_test.go +++ b/satellite/metabase/aliaspiece_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) func TestAliasPieces(t *testing.T) { diff --git a/satellite/metainfo/metabase/bench_expired_test.go b/satellite/metabase/bench_expired_test.go similarity index 99% rename from satellite/metainfo/metabase/bench_expired_test.go rename to satellite/metabase/bench_expired_test.go index 0d76da550..dd64ad60a 100644 --- a/satellite/metainfo/metabase/bench_expired_test.go +++ b/satellite/metabase/bench_expired_test.go @@ -13,7 +13,7 @@ import ( "storj.io/common/storj" "storj.io/common/testcontext" "storj.io/common/testrand" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) var letters = []rune("abcdefghijklmnopqrstuvwxyz") diff --git a/satellite/metainfo/metabase/bench_test.go b/satellite/metabase/bench_test.go similarity index 99% rename from satellite/metainfo/metabase/bench_test.go rename to satellite/metabase/bench_test.go index 01e689596..c0d89f9b0 100644 --- a/satellite/metainfo/metabase/bench_test.go +++ b/satellite/metabase/bench_test.go @@ -17,7 +17,7 @@ import ( "storj.io/common/testcontext" "storj.io/common/testrand" "storj.io/common/uuid" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) func Benchmark(b *testing.B) { diff --git a/satellite/metainfo/metabase/commit.go b/satellite/metabase/commit.go similarity index 100% rename from satellite/metainfo/metabase/commit.go rename to satellite/metabase/commit.go diff --git a/satellite/metainfo/metabase/commit_object.go b/satellite/metabase/commit_object.go similarity index 100% rename from satellite/metainfo/metabase/commit_object.go rename to satellite/metabase/commit_object.go diff --git a/satellite/metainfo/metabase/commit_object_test.go b/satellite/metabase/commit_object_test.go similarity index 99% rename from satellite/metainfo/metabase/commit_object_test.go rename to satellite/metabase/commit_object_test.go index 5422b3617..9ba7f1d4b 100644 --- a/satellite/metainfo/metabase/commit_object_test.go +++ b/satellite/metabase/commit_object_test.go @@ -10,7 +10,7 @@ import ( "storj.io/common/storj" "storj.io/common/testcontext" "storj.io/common/testrand" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) func TestCommitObjectWithSegments(t *testing.T) { diff --git a/satellite/metainfo/metabase/commit_test.go b/satellite/metabase/commit_test.go similarity index 99% rename from satellite/metainfo/metabase/commit_test.go rename to satellite/metabase/commit_test.go index 31689bc08..37efffade 100644 --- a/satellite/metainfo/metabase/commit_test.go +++ b/satellite/metabase/commit_test.go @@ -14,7 +14,7 @@ import ( "storj.io/common/testcontext" "storj.io/common/testrand" "storj.io/common/uuid" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) var defaultTestRedundancy = storj.RedundancyScheme{ diff --git a/satellite/metainfo/metabase/common.go b/satellite/metabase/common.go similarity index 100% rename from satellite/metainfo/metabase/common.go rename to satellite/metabase/common.go diff --git a/satellite/metainfo/metabase/common_test.go b/satellite/metabase/common_test.go similarity index 99% rename from satellite/metainfo/metabase/common_test.go rename to satellite/metabase/common_test.go index dc3bb47e9..6897b9066 100644 --- a/satellite/metainfo/metabase/common_test.go +++ b/satellite/metabase/common_test.go @@ -11,7 +11,7 @@ import ( "storj.io/common/testrand" "storj.io/common/uuid" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) func TestParseBucketPrefixInvalid(t *testing.T) { diff --git a/satellite/metainfo/metabase/consts_test.go b/satellite/metabase/consts_test.go similarity index 100% rename from satellite/metainfo/metabase/consts_test.go rename to satellite/metabase/consts_test.go diff --git a/satellite/metainfo/metabase/db.go b/satellite/metabase/db.go similarity index 100% rename from satellite/metainfo/metabase/db.go rename to satellite/metabase/db.go diff --git a/satellite/metainfo/metabase/db_migrate_test.go b/satellite/metabase/db_migrate_test.go similarity index 98% rename from satellite/metainfo/metabase/db_migrate_test.go rename to satellite/metabase/db_migrate_test.go index e5f35f1f5..1a3b13ada 100644 --- a/satellite/metainfo/metabase/db_migrate_test.go +++ b/satellite/metabase/db_migrate_test.go @@ -13,7 +13,7 @@ import ( "storj.io/common/testcontext" "storj.io/common/testrand" "storj.io/common/uuid" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/satellitedb/satellitedbtest" ) diff --git a/satellite/metainfo/metabase/db_test.go b/satellite/metabase/db_test.go similarity index 98% rename from satellite/metainfo/metabase/db_test.go rename to satellite/metabase/db_test.go index d1222a8c4..3f206fdb9 100644 --- a/satellite/metainfo/metabase/db_test.go +++ b/satellite/metabase/db_test.go @@ -14,7 +14,7 @@ import ( "storj.io/common/testcontext" _ "storj.io/storj/private/dbutil/cockroachutil" // register cockroach driver - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/satellitedb/satellitedbtest" ) diff --git a/satellite/metainfo/metabase/delete.go b/satellite/metabase/delete.go similarity index 100% rename from satellite/metainfo/metabase/delete.go rename to satellite/metabase/delete.go diff --git a/satellite/metainfo/metabase/delete_bucket.go b/satellite/metabase/delete_bucket.go similarity index 100% rename from satellite/metainfo/metabase/delete_bucket.go rename to satellite/metabase/delete_bucket.go diff --git a/satellite/metainfo/metabase/delete_bucket_test.go b/satellite/metabase/delete_bucket_test.go similarity index 99% rename from satellite/metainfo/metabase/delete_bucket_test.go rename to satellite/metabase/delete_bucket_test.go index 3464a8db2..392aef759 100644 --- a/satellite/metainfo/metabase/delete_bucket_test.go +++ b/satellite/metabase/delete_bucket_test.go @@ -12,7 +12,7 @@ import ( "storj.io/common/storj" "storj.io/common/testcontext" "storj.io/common/uuid" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) func TestDeleteBucketObjects(t *testing.T) { diff --git a/satellite/metainfo/metabase/delete_expired.go b/satellite/metabase/delete_expired.go similarity index 100% rename from satellite/metainfo/metabase/delete_expired.go rename to satellite/metabase/delete_expired.go diff --git a/satellite/metainfo/metabase/delete_expired_test.go b/satellite/metabase/delete_expired_test.go similarity index 98% rename from satellite/metainfo/metabase/delete_expired_test.go rename to satellite/metabase/delete_expired_test.go index 0c131e465..56670c42a 100644 --- a/satellite/metainfo/metabase/delete_expired_test.go +++ b/satellite/metabase/delete_expired_test.go @@ -9,7 +9,7 @@ import ( "storj.io/common/storj" "storj.io/common/testcontext" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) func TestDeleteExpiredObjects(t *testing.T) { diff --git a/satellite/metainfo/metabase/delete_test.go b/satellite/metabase/delete_test.go similarity index 99% rename from satellite/metainfo/metabase/delete_test.go rename to satellite/metabase/delete_test.go index 6d570e776..01c7d1f90 100644 --- a/satellite/metainfo/metabase/delete_test.go +++ b/satellite/metabase/delete_test.go @@ -11,7 +11,7 @@ import ( "storj.io/common/testcontext" "storj.io/common/testrand" "storj.io/common/uuid" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) func TestDeletePendingObject(t *testing.T) { diff --git a/satellite/metainfo/metabase/encoding.go b/satellite/metabase/encoding.go similarity index 100% rename from satellite/metainfo/metabase/encoding.go rename to satellite/metabase/encoding.go diff --git a/satellite/metainfo/metabase/get.go b/satellite/metabase/get.go similarity index 100% rename from satellite/metainfo/metabase/get.go rename to satellite/metabase/get.go diff --git a/satellite/metainfo/metabase/get_test.go b/satellite/metabase/get_test.go similarity index 99% rename from satellite/metainfo/metabase/get_test.go rename to satellite/metabase/get_test.go index a6e8338e7..3c4c8d8cc 100644 --- a/satellite/metainfo/metabase/get_test.go +++ b/satellite/metabase/get_test.go @@ -10,7 +10,7 @@ import ( "storj.io/common/storj" "storj.io/common/testcontext" "storj.io/common/testrand" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) func TestGetObjectExactVersion(t *testing.T) { diff --git a/satellite/metainfo/metabase/iterator.go b/satellite/metabase/iterator.go similarity index 100% rename from satellite/metainfo/metabase/iterator.go rename to satellite/metabase/iterator.go diff --git a/satellite/metainfo/metabase/iterator_test.go b/satellite/metabase/iterator_test.go similarity index 99% rename from satellite/metainfo/metabase/iterator_test.go rename to satellite/metabase/iterator_test.go index ccf67c085..12330bc6b 100644 --- a/satellite/metainfo/metabase/iterator_test.go +++ b/satellite/metabase/iterator_test.go @@ -13,7 +13,7 @@ import ( "storj.io/common/testcontext" "storj.io/common/testrand" "storj.io/common/uuid" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) func TestIterateObjects(t *testing.T) { diff --git a/satellite/metainfo/metabase/iterator_util_test.go b/satellite/metabase/iterator_util_test.go similarity index 100% rename from satellite/metainfo/metabase/iterator_util_test.go rename to satellite/metabase/iterator_util_test.go diff --git a/satellite/metainfo/metabase/list.go b/satellite/metabase/list.go similarity index 100% rename from satellite/metainfo/metabase/list.go rename to satellite/metabase/list.go diff --git a/satellite/metainfo/metabase/list_segments.go b/satellite/metabase/list_segments.go similarity index 100% rename from satellite/metainfo/metabase/list_segments.go rename to satellite/metabase/list_segments.go diff --git a/satellite/metainfo/metabase/list_segments_test.go b/satellite/metabase/list_segments_test.go similarity index 99% rename from satellite/metainfo/metabase/list_segments_test.go rename to satellite/metabase/list_segments_test.go index e600d1679..407e0fc70 100644 --- a/satellite/metainfo/metabase/list_segments_test.go +++ b/satellite/metabase/list_segments_test.go @@ -10,7 +10,7 @@ import ( "storj.io/common/storj" "storj.io/common/testcontext" "storj.io/common/testrand" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) func TestListSegments(t *testing.T) { diff --git a/satellite/metainfo/metabase/loop.go b/satellite/metabase/loop.go similarity index 100% rename from satellite/metainfo/metabase/loop.go rename to satellite/metabase/loop.go diff --git a/satellite/metainfo/metabase/loop_test.go b/satellite/metabase/loop_test.go similarity index 99% rename from satellite/metainfo/metabase/loop_test.go rename to satellite/metabase/loop_test.go index 7118e1a68..60783de5f 100644 --- a/satellite/metainfo/metabase/loop_test.go +++ b/satellite/metabase/loop_test.go @@ -14,7 +14,7 @@ import ( "storj.io/common/testcontext" "storj.io/common/testrand" "storj.io/common/uuid" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) func TestIterateLoopObjects(t *testing.T) { diff --git a/satellite/metainfo/metabase/raw.go b/satellite/metabase/raw.go similarity index 100% rename from satellite/metainfo/metabase/raw.go rename to satellite/metabase/raw.go diff --git a/satellite/metainfo/metabase/streamstat.go b/satellite/metabase/streamstat.go similarity index 100% rename from satellite/metainfo/metabase/streamstat.go rename to satellite/metabase/streamstat.go diff --git a/satellite/metainfo/metabase/streamstat_test.go b/satellite/metabase/streamstat_test.go similarity index 98% rename from satellite/metainfo/metabase/streamstat_test.go rename to satellite/metabase/streamstat_test.go index ad1e37d22..c5094861f 100644 --- a/satellite/metainfo/metabase/streamstat_test.go +++ b/satellite/metabase/streamstat_test.go @@ -9,7 +9,7 @@ import ( "storj.io/common/storj" "storj.io/common/testcontext" "storj.io/common/testrand" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) func TestGetStreamPieceCountByNodeID(t *testing.T) { diff --git a/satellite/metainfo/metabase/test_test.go b/satellite/metabase/test_test.go similarity index 99% rename from satellite/metainfo/metabase/test_test.go rename to satellite/metabase/test_test.go index f356f2c26..a3f7d3b32 100644 --- a/satellite/metainfo/metabase/test_test.go +++ b/satellite/metabase/test_test.go @@ -19,7 +19,7 @@ import ( "storj.io/common/testcontext" "storj.io/common/testrand" "storj.io/common/uuid" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) type BeginObjectNextVersion struct { diff --git a/satellite/metainfo/metabase/update.go b/satellite/metabase/update.go similarity index 100% rename from satellite/metainfo/metabase/update.go rename to satellite/metabase/update.go diff --git a/satellite/metainfo/metabase/update_test.go b/satellite/metabase/update_test.go similarity index 99% rename from satellite/metainfo/metabase/update_test.go rename to satellite/metabase/update_test.go index 988b7c553..df5bbfa5d 100644 --- a/satellite/metainfo/metabase/update_test.go +++ b/satellite/metabase/update_test.go @@ -14,7 +14,7 @@ import ( "storj.io/common/storj" "storj.io/common/testcontext" "storj.io/common/testrand" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/storage" ) diff --git a/satellite/metainfo/metabase/util.go b/satellite/metabase/util.go similarity index 100% rename from satellite/metainfo/metabase/util.go rename to satellite/metabase/util.go diff --git a/satellite/metainfo/config.go b/satellite/metainfo/config.go index c73cf4162..115cc4ba5 100644 --- a/satellite/metainfo/config.go +++ b/satellite/metainfo/config.go @@ -17,7 +17,7 @@ import ( "storj.io/common/storj" "storj.io/common/uuid" "storj.io/storj/private/dbutil" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/metainfo/metaloop" "storj.io/storj/satellite/metainfo/piecedeletion" ) diff --git a/satellite/metainfo/db.go b/satellite/metainfo/db.go index 462126491..2df5ea902 100644 --- a/satellite/metainfo/db.go +++ b/satellite/metainfo/db.go @@ -9,7 +9,7 @@ import ( "storj.io/common/macaroon" "storj.io/common/storj" "storj.io/common/uuid" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) // BucketsDB is the interface for the database to interact with buckets. diff --git a/satellite/metainfo/endpoint_test.go b/satellite/metainfo/endpoint_test.go index e271bcaac..6f1e96c90 100644 --- a/satellite/metainfo/endpoint_test.go +++ b/satellite/metainfo/endpoint_test.go @@ -21,7 +21,7 @@ import ( "storj.io/common/testcontext" "storj.io/common/testrand" "storj.io/storj/private/testplanet" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/uplink/private/etag" "storj.io/uplink/private/metainfo" "storj.io/uplink/private/multipart" diff --git a/satellite/metainfo/expireddeletion/chore.go b/satellite/metainfo/expireddeletion/chore.go index 5b341116e..79a207c13 100644 --- a/satellite/metainfo/expireddeletion/chore.go +++ b/satellite/metainfo/expireddeletion/chore.go @@ -12,8 +12,8 @@ import ( "go.uber.org/zap" "storj.io/common/sync2" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/metainfo" - "storj.io/storj/satellite/metainfo/metabase" ) var ( diff --git a/satellite/metainfo/metainfo.go b/satellite/metainfo/metainfo.go index 1e420a5d4..72c65b41a 100644 --- a/satellite/metainfo/metainfo.go +++ b/satellite/metainfo/metainfo.go @@ -27,7 +27,7 @@ import ( "storj.io/storj/satellite/attribution" "storj.io/storj/satellite/console" "storj.io/storj/satellite/internalpb" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/metainfo/piecedeletion" "storj.io/storj/satellite/metainfo/pointerverification" "storj.io/storj/satellite/orders" diff --git a/satellite/metainfo/metainfo_test.go b/satellite/metainfo/metainfo_test.go index 527dfa0f2..bd98eefcc 100644 --- a/satellite/metainfo/metainfo_test.go +++ b/satellite/metainfo/metainfo_test.go @@ -32,8 +32,8 @@ import ( "storj.io/storj/private/testplanet" "storj.io/storj/satellite" "storj.io/storj/satellite/internalpb" + "storj.io/storj/satellite/metabase" satMetainfo "storj.io/storj/satellite/metainfo" - "storj.io/storj/satellite/metainfo/metabase" "storj.io/uplink" "storj.io/uplink/private/etag" "storj.io/uplink/private/metainfo" diff --git a/satellite/metainfo/metaloop/service.go b/satellite/metainfo/metaloop/service.go index 00802c084..39b1658b0 100644 --- a/satellite/metainfo/metaloop/service.go +++ b/satellite/metainfo/metaloop/service.go @@ -14,7 +14,7 @@ import ( "golang.org/x/time/rate" "storj.io/common/uuid" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) const batchsizeLimit = 2500 diff --git a/satellite/metainfo/metaloop/service_test.go b/satellite/metainfo/metaloop/service_test.go index 52b53e50a..e003e3c69 100644 --- a/satellite/metainfo/metaloop/service_test.go +++ b/satellite/metainfo/metaloop/service_test.go @@ -23,7 +23,7 @@ import ( "storj.io/common/testrand" "storj.io/storj/private/testplanet" "storj.io/storj/satellite" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/metainfo/metaloop" "storj.io/uplink/private/multipart" ) diff --git a/satellite/metainfo/service.go b/satellite/metainfo/service.go index f51f8b08a..b3b692308 100644 --- a/satellite/metainfo/service.go +++ b/satellite/metainfo/service.go @@ -12,7 +12,7 @@ import ( "storj.io/common/macaroon" "storj.io/common/storj" "storj.io/common/uuid" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) var ( diff --git a/satellite/metainfo/validation.go b/satellite/metainfo/validation.go index 06d536c3b..30b9c07b5 100644 --- a/satellite/metainfo/validation.go +++ b/satellite/metainfo/validation.go @@ -22,7 +22,7 @@ import ( "storj.io/common/uuid" "storj.io/storj/satellite/console" "storj.io/storj/satellite/console/consoleauth" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) var ( diff --git a/satellite/orders/endpoint.go b/satellite/orders/endpoint.go index 6de0aad24..0eccf2dcc 100644 --- a/satellite/orders/endpoint.go +++ b/satellite/orders/endpoint.go @@ -22,7 +22,7 @@ import ( "storj.io/common/storj" "storj.io/common/uuid" "storj.io/storj/private/date" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/nodeapiversion" ) diff --git a/satellite/orders/endpoint_test.go b/satellite/orders/endpoint_test.go index c36637803..40ab097d9 100644 --- a/satellite/orders/endpoint_test.go +++ b/satellite/orders/endpoint_test.go @@ -16,7 +16,7 @@ import ( "storj.io/common/testrand" "storj.io/storj/private/testplanet" "storj.io/storj/satellite/internalpb" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) func TestSettlementWithWindowEndpointManyOrders(t *testing.T) { diff --git a/satellite/orders/service.go b/satellite/orders/service.go index 84fbeea08..7f6b1085b 100644 --- a/satellite/orders/service.go +++ b/satellite/orders/service.go @@ -18,7 +18,7 @@ import ( "storj.io/common/storj" "storj.io/common/uuid" "storj.io/storj/satellite/internalpb" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/overlay" "storj.io/uplink/private/eestream" ) diff --git a/satellite/orders/service_test.go b/satellite/orders/service_test.go index 5bf2ef142..dc3033c08 100644 --- a/satellite/orders/service_test.go +++ b/satellite/orders/service_test.go @@ -12,7 +12,7 @@ import ( "storj.io/common/testcontext" "storj.io/common/testrand" "storj.io/storj/private/testplanet" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) func TestOrderLimitsEncryptedMetadata(t *testing.T) { diff --git a/satellite/orders/signer.go b/satellite/orders/signer.go index ee2361339..2e3a1f220 100644 --- a/satellite/orders/signer.go +++ b/satellite/orders/signer.go @@ -15,7 +15,7 @@ import ( "storj.io/common/signing" "storj.io/common/storj" "storj.io/storj/satellite/internalpb" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) // ErrSigner is default error class for Signer. diff --git a/satellite/orders/signer_test.go b/satellite/orders/signer_test.go index 5506626ba..92dc62f25 100644 --- a/satellite/orders/signer_test.go +++ b/satellite/orders/signer_test.go @@ -16,7 +16,7 @@ import ( "storj.io/common/testrand" "storj.io/storj/private/testplanet" "storj.io/storj/satellite" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/orders" ) diff --git a/satellite/overlay/service.go b/satellite/overlay/service.go index 4a942247a..5da0b7a2e 100644 --- a/satellite/overlay/service.go +++ b/satellite/overlay/service.go @@ -14,7 +14,7 @@ import ( "storj.io/common/pb" "storj.io/common/storj" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) // ErrEmptyNode is returned when the nodeID is empty. diff --git a/satellite/payments/stripecoinpayments/service_test.go b/satellite/payments/stripecoinpayments/service_test.go index 635cfd553..a7716142f 100644 --- a/satellite/payments/stripecoinpayments/service_test.go +++ b/satellite/payments/stripecoinpayments/service_test.go @@ -21,7 +21,7 @@ import ( "storj.io/storj/satellite" "storj.io/storj/satellite/accounting" "storj.io/storj/satellite/console" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/payments" "storj.io/storj/satellite/payments/stripecoinpayments" ) diff --git a/satellite/repair/checker/checker.go b/satellite/repair/checker/checker.go index de5b0cfbd..e70a6cbf4 100644 --- a/satellite/repair/checker/checker.go +++ b/satellite/repair/checker/checker.go @@ -17,8 +17,8 @@ import ( "storj.io/common/storj" "storj.io/common/sync2" "storj.io/storj/satellite/internalpb" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/metainfo" - "storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metainfo/metaloop" "storj.io/storj/satellite/overlay" "storj.io/storj/satellite/repair" diff --git a/satellite/repair/checker/checker_test.go b/satellite/repair/checker/checker_test.go index bf7d8e3f6..92952da76 100644 --- a/satellite/repair/checker/checker_test.go +++ b/satellite/repair/checker/checker_test.go @@ -16,7 +16,7 @@ import ( "storj.io/common/testcontext" "storj.io/common/testrand" "storj.io/storj/private/testplanet" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/storage" ) diff --git a/satellite/repair/checker/checkerstats.go b/satellite/repair/checker/checkerstats.go index 67aa073ca..5b643672d 100644 --- a/satellite/repair/checker/checkerstats.go +++ b/satellite/repair/checker/checkerstats.go @@ -8,7 +8,7 @@ import ( "github.com/spacemonkeygo/monkit/v3" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) // statsCollector holds a *stats for each redundancy scheme diff --git a/satellite/repair/checker/online.go b/satellite/repair/checker/online.go index 2b032b35d..4b36d4a4d 100644 --- a/satellite/repair/checker/online.go +++ b/satellite/repair/checker/online.go @@ -10,7 +10,7 @@ import ( "time" "storj.io/common/storj" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/overlay" ) diff --git a/satellite/repair/checker/online_test.go b/satellite/repair/checker/online_test.go index 2b4531d6a..c7aaa8b03 100644 --- a/satellite/repair/checker/online_test.go +++ b/satellite/repair/checker/online_test.go @@ -14,7 +14,7 @@ import ( "storj.io/common/storj" "storj.io/common/testcontext" "storj.io/common/testrand" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/overlay" ) diff --git a/satellite/repair/irreparable/irreparable.go b/satellite/repair/irreparable/irreparable.go index 63ea716a6..0a56a5a0e 100644 --- a/satellite/repair/irreparable/irreparable.go +++ b/satellite/repair/irreparable/irreparable.go @@ -7,7 +7,7 @@ import ( "context" "storj.io/storj/satellite/internalpb" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" ) // DB stores information about repairs that have failed. diff --git a/satellite/repair/irreparable/irreparable_test.go b/satellite/repair/irreparable/irreparable_test.go index 51fc258f9..d79261e34 100644 --- a/satellite/repair/irreparable/irreparable_test.go +++ b/satellite/repair/irreparable/irreparable_test.go @@ -16,7 +16,7 @@ import ( "storj.io/storj/private/testplanet" "storj.io/storj/satellite" "storj.io/storj/satellite/internalpb" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/satellitedb/satellitedbtest" ) diff --git a/satellite/repair/repair_test.go b/satellite/repair/repair_test.go index 2bf0d1305..8ac404753 100644 --- a/satellite/repair/repair_test.go +++ b/satellite/repair/repair_test.go @@ -23,7 +23,7 @@ import ( "storj.io/common/uuid" "storj.io/storj/private/testplanet" "storj.io/storj/satellite" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/overlay" "storj.io/storj/satellite/repair/checker" "storj.io/storj/storage" diff --git a/satellite/repair/repairer/segments.go b/satellite/repair/repairer/segments.go index 3e83fe8cc..9e75e8834 100644 --- a/satellite/repair/repairer/segments.go +++ b/satellite/repair/repairer/segments.go @@ -17,8 +17,8 @@ import ( "storj.io/common/rpc" "storj.io/common/signing" "storj.io/common/storj" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/metainfo" - "storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/orders" "storj.io/storj/satellite/overlay" "storj.io/storj/satellite/repair/checker" diff --git a/satellite/satellitedb/bucketsdb.go b/satellite/satellitedb/bucketsdb.go index 44bacd950..e0386529e 100644 --- a/satellite/satellitedb/bucketsdb.go +++ b/satellite/satellitedb/bucketsdb.go @@ -11,7 +11,7 @@ import ( "storj.io/common/macaroon" "storj.io/common/storj" "storj.io/common/uuid" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/satellitedb/dbx" ) diff --git a/satellite/satellitedb/containment.go b/satellite/satellitedb/containment.go index b21022def..30bdd7f62 100644 --- a/satellite/satellitedb/containment.go +++ b/satellite/satellitedb/containment.go @@ -14,7 +14,7 @@ import ( "storj.io/common/pb" "storj.io/common/storj" "storj.io/storj/satellite/audit" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/satellitedb/dbx" ) diff --git a/satellite/satellitedb/gracefulexit.go b/satellite/satellitedb/gracefulexit.go index c35ffd0ab..224f06947 100644 --- a/satellite/satellitedb/gracefulexit.go +++ b/satellite/satellitedb/gracefulexit.go @@ -17,7 +17,7 @@ import ( "storj.io/storj/private/dbutil/pgutil" "storj.io/storj/private/tagsql" "storj.io/storj/satellite/gracefulexit" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/satellitedb/dbx" ) diff --git a/satellite/satellitedb/irreparabledb.go b/satellite/satellitedb/irreparabledb.go index e42283c48..280141f09 100644 --- a/satellite/satellitedb/irreparabledb.go +++ b/satellite/satellitedb/irreparabledb.go @@ -10,7 +10,7 @@ import ( "storj.io/common/pb" "storj.io/storj/satellite/internalpb" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/satellitedb/dbx" ) diff --git a/satellite/satellitedb/projectaccounting.go b/satellite/satellitedb/projectaccounting.go index 4efc11fcf..b58dec3a4 100644 --- a/satellite/satellitedb/projectaccounting.go +++ b/satellite/satellitedb/projectaccounting.go @@ -18,7 +18,7 @@ import ( "storj.io/storj/private/dbutil" "storj.io/storj/private/dbutil/pgutil" "storj.io/storj/satellite/accounting" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/orders" "storj.io/storj/satellite/satellitedb/dbx" ) diff --git a/storagenode/orders/service_test.go b/storagenode/orders/service_test.go index 3aba7c9ae..30a5ebc9e 100644 --- a/storagenode/orders/service_test.go +++ b/storagenode/orders/service_test.go @@ -15,7 +15,7 @@ import ( "storj.io/common/testcontext" "storj.io/common/testrand" "storj.io/storj/private/testplanet" - "storj.io/storj/satellite/metainfo/metabase" + "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/overlay" "storj.io/storj/storagenode" "storj.io/storj/storagenode/orders"