JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

satellite/metabase: move package one level higher

Browse Source 
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
This commit is contained in:
Egon Elbre 2021-04-21 15:42:57 +03:00
parent 2ee3030275
commit 267506bb20
105 changed files with 83 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/metabase-createdat-migration/main.go
View File

@ -15,8 +15,8 @@ import (
"go.uber.org/zap/zapcore" "go.uber.org/zap/zapcore"
"storj.io/common/uuid" "storj.io/common/uuid"
"storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/metainfo" "storj.io/storj/satellite/metainfo"
"storj.io/storj/satellite/metainfo/metabase"
) )
// Config defines configuration for migration. // Config defines configuration for migration.

2
cmd/metabase-createdat-migration/main_test.go
View File

@ -19,8 +19,8 @@ import (
migrator "storj.io/storj/cmd/metabase-createdat-migration" migrator "storj.io/storj/cmd/metabase-createdat-migration"
"storj.io/storj/private/dbutil" "storj.io/storj/private/dbutil"
"storj.io/storj/private/dbutil/tempdb" "storj.io/storj/private/dbutil/tempdb"
"storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/metainfo" "storj.io/storj/satellite/metainfo"
"storj.io/storj/satellite/metainfo/metabase"
"storj.io/storj/satellite/satellitedb/satellitedbtest" "storj.io/storj/satellite/satellitedb/satellitedbtest"
) )

2
satellite/accounting/billing_test.go
View File

@ -16,7 +16,7 @@ import (
"storj.io/common/uuid" "storj.io/common/uuid"
"storj.io/storj/private/testplanet" "storj.io/storj/private/testplanet"
"storj.io/storj/satellite/accounting" "storj.io/storj/satellite/accounting"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
func TestBilling_DownloadWithoutExpansionFactor(t *testing.T) { func TestBilling_DownloadWithoutExpansionFactor(t *testing.T) {

2
satellite/accounting/bucketstats.go
View File

@ -4,7 +4,7 @@
package accounting package accounting
import ( import (
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
// BucketTally contains information about aggregate data stored in a bucket. // BucketTally contains information about aggregate data stored in a bucket.

2
satellite/accounting/db.go
View File

@ -11,7 +11,7 @@ import (
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/common/uuid" "storj.io/common/uuid"
"storj.io/storj/satellite/compensation" "storj.io/storj/satellite/compensation"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/orders" "storj.io/storj/satellite/orders"
) )

2
satellite/accounting/db_test.go
View File

@ -20,7 +20,7 @@ import (
"storj.io/storj/satellite" "storj.io/storj/satellite"
"storj.io/storj/satellite/accounting" "storj.io/storj/satellite/accounting"
"storj.io/storj/satellite/console" "storj.io/storj/satellite/console"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/satellitedb/satellitedbtest" "storj.io/storj/satellite/satellitedb/satellitedbtest"
) )

2
satellite/accounting/projectusage_test.go
View File

@ -28,7 +28,7 @@ import (
"storj.io/storj/private/testplanet" "storj.io/storj/private/testplanet"
"storj.io/storj/satellite" "storj.io/storj/satellite"
"storj.io/storj/satellite/accounting" "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/orders"
"storj.io/storj/satellite/satellitedb/satellitedbtest" "storj.io/storj/satellite/satellitedb/satellitedbtest"
) )

2
satellite/accounting/tally/tally.go
View File

@ -15,7 +15,7 @@ import (
"storj.io/common/sync2" "storj.io/common/sync2"
"storj.io/common/uuid" "storj.io/common/uuid"
"storj.io/storj/satellite/accounting" "storj.io/storj/satellite/accounting"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/metainfo/metaloop" "storj.io/storj/satellite/metainfo/metaloop"
) )

2
satellite/accounting/tally/tally_test.go
View File

@ -21,7 +21,7 @@ import (
"storj.io/storj/private/teststorj" "storj.io/storj/private/teststorj"
"storj.io/storj/satellite/accounting" "storj.io/storj/satellite/accounting"
"storj.io/storj/satellite/accounting/tally" "storj.io/storj/satellite/accounting/tally"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
func TestDeleteTalliesBefore(t *testing.T) { func TestDeleteTalliesBefore(t *testing.T) {

2
satellite/audit/containment.go
View File

@ -10,7 +10,7 @@ import (
"storj.io/common/pb" "storj.io/common/pb"
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
var ( var (

2
satellite/audit/disqualification_test.go
View File

@ -19,7 +19,7 @@ import (
"storj.io/storj/private/testplanet" "storj.io/storj/private/testplanet"
"storj.io/storj/satellite" "storj.io/storj/satellite"
"storj.io/storj/satellite/audit" "storj.io/storj/satellite/audit"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/overlay" "storj.io/storj/satellite/overlay"
) )

2
satellite/audit/getshare_test.go
View File

@ -19,7 +19,7 @@ import (
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/storj/private/testplanet" "storj.io/storj/private/testplanet"
"storj.io/storj/satellite/audit" "storj.io/storj/satellite/audit"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
type mockConnector struct { type mockConnector struct {

2
satellite/audit/queue_test.go
View File

@ -13,7 +13,7 @@ import (
"storj.io/common/errs2" "storj.io/common/errs2"
"storj.io/common/testcontext" "storj.io/common/testcontext"
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
func TestQueues(t *testing.T) { func TestQueues(t *testing.T) {

2
satellite/audit/reservoir.go
View File

@ -8,7 +8,7 @@ import (
"time" "time"
"storj.io/common/uuid" "storj.io/common/uuid"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/metainfo/metaloop" "storj.io/storj/satellite/metainfo/metaloop"
) )

2
satellite/audit/reverify_test.go
View File

@ -23,7 +23,7 @@ import (
"storj.io/storj/private/testplanet" "storj.io/storj/private/testplanet"
"storj.io/storj/satellite" "storj.io/storj/satellite"
"storj.io/storj/satellite/audit" "storj.io/storj/satellite/audit"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
"storj.io/storj/storagenode" "storj.io/storj/storagenode"
) )

2
satellite/audit/verifier.go
View File

@ -23,8 +23,8 @@ import (
"storj.io/common/rpc" "storj.io/common/rpc"
"storj.io/common/rpc/rpcstatus" "storj.io/common/rpc/rpcstatus"
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/metainfo" "storj.io/storj/satellite/metainfo"
"storj.io/storj/satellite/metainfo/metabase"
"storj.io/storj/satellite/orders" "storj.io/storj/satellite/orders"
"storj.io/storj/satellite/overlay" "storj.io/storj/satellite/overlay"
"storj.io/uplink/private/piecestore" "storj.io/uplink/private/piecestore"

2
satellite/audit/verifier_test.go
View File

@ -25,7 +25,7 @@ import (
"storj.io/storj/private/testplanet" "storj.io/storj/private/testplanet"
"storj.io/storj/satellite" "storj.io/storj/satellite"
"storj.io/storj/satellite/audit" "storj.io/storj/satellite/audit"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
"storj.io/storj/storagenode" "storj.io/storj/storagenode"
) )

2
satellite/audit/verifier_unit_test.go
View File

@ -15,7 +15,7 @@ import (
"storj.io/common/pkcrypto" "storj.io/common/pkcrypto"
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
func TestFailingAudit(t *testing.T) { func TestFailingAudit(t *testing.T) {

2
satellite/console/buckets.go
View File

@ -9,7 +9,7 @@ import (
"storj.io/common/macaroon" "storj.io/common/macaroon"
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/common/uuid" "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. // Buckets is the interface for the database to interact with buckets.

2
satellite/gc/gc_test.go
View File

@ -25,7 +25,7 @@ import (
"storj.io/storj/private/testplanet" "storj.io/storj/private/testplanet"
"storj.io/storj/satellite" "storj.io/storj/satellite"
"storj.io/storj/satellite/gc" "storj.io/storj/satellite/gc"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
"storj.io/storj/storage" "storj.io/storj/storage"
"storj.io/storj/storagenode" "storj.io/storj/storagenode"
"storj.io/uplink/private/etag" "storj.io/uplink/private/etag"

2
satellite/gracefulexit/chore_test.go
View File

@ -20,7 +20,7 @@ import (
"storj.io/storj/private/testplanet" "storj.io/storj/private/testplanet"
"storj.io/storj/satellite" "storj.io/storj/satellite"
"storj.io/storj/satellite/gracefulexit" "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/overlay"
"storj.io/storj/satellite/satellitedb/satellitedbtest" "storj.io/storj/satellite/satellitedb/satellitedbtest"
"storj.io/uplink/private/etag" "storj.io/uplink/private/etag"

2
satellite/gracefulexit/db.go
View File

@ -8,7 +8,7 @@ import (
"time" "time"
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
// Progress represents the persisted graceful exit progress record. // Progress represents the persisted graceful exit progress record.

2
satellite/gracefulexit/db_test.go
View File

@ -15,7 +15,7 @@ import (
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/storj/satellite" "storj.io/storj/satellite"
"storj.io/storj/satellite/gracefulexit" "storj.io/storj/satellite/gracefulexit"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/satellitedb/satellitedbtest" "storj.io/storj/satellite/satellitedb/satellitedbtest"
) )

2
satellite/gracefulexit/endpoint.go
View File

@ -21,8 +21,8 @@ import (
"storj.io/common/signing" "storj.io/common/signing"
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/common/sync2" "storj.io/common/sync2"
"storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/metainfo" "storj.io/storj/satellite/metainfo"
"storj.io/storj/satellite/metainfo/metabase"
"storj.io/storj/satellite/orders" "storj.io/storj/satellite/orders"
"storj.io/storj/satellite/overlay" "storj.io/storj/satellite/overlay"
"storj.io/uplink/private/eestream" "storj.io/uplink/private/eestream"

2
satellite/gracefulexit/endpoint_test.go
View File

@ -31,8 +31,8 @@ import (
"storj.io/storj/private/testblobs" "storj.io/storj/private/testblobs"
"storj.io/storj/private/testplanet" "storj.io/storj/private/testplanet"
"storj.io/storj/satellite" "storj.io/storj/satellite"
"storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/metainfo" "storj.io/storj/satellite/metainfo"
"storj.io/storj/satellite/metainfo/metabase"
"storj.io/storj/satellite/overlay" "storj.io/storj/satellite/overlay"
"storj.io/storj/storagenode" "storj.io/storj/storagenode"
"storj.io/storj/storagenode/gracefulexit" "storj.io/storj/storagenode/gracefulexit"

2
satellite/gracefulexit/gracefulexit_test.go
View File

@ -15,7 +15,7 @@ import (
"storj.io/common/testcontext" "storj.io/common/testcontext"
"storj.io/storj/private/testplanet" "storj.io/storj/private/testplanet"
"storj.io/storj/satellite/gracefulexit" "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/overlay"
) )

2
satellite/gracefulexit/pending.go
View File

@ -9,7 +9,7 @@ import (
"storj.io/common/pb" "storj.io/common/pb"
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
// PendingFinishedPromise for waiting for information about finished state. // PendingFinishedPromise for waiting for information about finished state.

2
satellite/gracefulexit/pending_test.go
View File

@ -18,7 +18,7 @@ import (
"storj.io/common/testcontext" "storj.io/common/testcontext"
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/storj/satellite/gracefulexit" "storj.io/storj/satellite/gracefulexit"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
func TestPendingBasic(t *testing.T) { func TestPendingBasic(t *testing.T) {

2
satellite/inspector/inspector.go
View File

@ -15,8 +15,8 @@ import (
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/common/uuid" "storj.io/common/uuid"
"storj.io/storj/satellite/internalpb" "storj.io/storj/satellite/internalpb"
"storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/metainfo" "storj.io/storj/satellite/metainfo"
"storj.io/storj/satellite/metainfo/metabase"
"storj.io/storj/satellite/overlay" "storj.io/storj/satellite/overlay"
) )

2
satellite/inspector/inspector_test.go
View File

@ -20,7 +20,7 @@ import (
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/storj/private/testplanet" "storj.io/storj/private/testplanet"
"storj.io/storj/satellite/internalpb" "storj.io/storj/satellite/internalpb"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
"storj.io/uplink/private/eestream" "storj.io/uplink/private/eestream"
) )

0
satellite/metainfo/metabase/alias.go → satellite/metabase/alias.go
View File

2
satellite/metainfo/metabase/alias_test.go → satellite/metabase/alias_test.go
View File

@ -12,7 +12,7 @@ import (
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/common/testcontext" "storj.io/common/testcontext"
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
func TestNodeAliases(t *testing.T) { func TestNodeAliases(t *testing.T) {

0
satellite/metainfo/metabase/aliascache.go → satellite/metabase/aliascache.go
View File

2
satellite/metainfo/metabase/aliascache_test.go → satellite/metabase/aliascache_test.go
View File

@ -17,7 +17,7 @@ import (
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/common/testcontext" "storj.io/common/testcontext"
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
func TestNodeAliasCache(t *testing.T) { func TestNodeAliasCache(t *testing.T) {

0
satellite/metainfo/metabase/aliaspiece.go → satellite/metabase/aliaspiece.go
View File

2
satellite/metainfo/metabase/aliaspiece_test.go → satellite/metabase/aliaspiece_test.go
View File

@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
func TestAliasPieces(t *testing.T) { func TestAliasPieces(t *testing.T) {

2
satellite/metainfo/metabase/bench_expired_test.go → satellite/metabase/bench_expired_test.go
View File

@ -13,7 +13,7 @@ import (
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/common/testcontext" "storj.io/common/testcontext"
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
var letters = []rune("abcdefghijklmnopqrstuvwxyz") var letters = []rune("abcdefghijklmnopqrstuvwxyz")

2
satellite/metainfo/metabase/bench_test.go → satellite/metabase/bench_test.go
View File

@ -17,7 +17,7 @@ import (
"storj.io/common/testcontext" "storj.io/common/testcontext"
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/common/uuid" "storj.io/common/uuid"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
func Benchmark(b *testing.B) { func Benchmark(b *testing.B) {

0
satellite/metainfo/metabase/commit.go → satellite/metabase/commit.go
View File

0
satellite/metainfo/metabase/commit_object.go → satellite/metabase/commit_object.go
View File

2
satellite/metainfo/metabase/commit_object_test.go → satellite/metabase/commit_object_test.go
View File

@ -10,7 +10,7 @@ import (
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/common/testcontext" "storj.io/common/testcontext"
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
func TestCommitObjectWithSegments(t *testing.T) { func TestCommitObjectWithSegments(t *testing.T) {

2
satellite/metainfo/metabase/commit_test.go → satellite/metabase/commit_test.go
View File

@ -14,7 +14,7 @@ import (
"storj.io/common/testcontext" "storj.io/common/testcontext"
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/common/uuid" "storj.io/common/uuid"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
var defaultTestRedundancy = storj.RedundancyScheme{ var defaultTestRedundancy = storj.RedundancyScheme{

0
satellite/metainfo/metabase/common.go → satellite/metabase/common.go
View File

2
satellite/metainfo/metabase/common_test.go → satellite/metabase/common_test.go
View File

@ -11,7 +11,7 @@ import (
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/common/uuid" "storj.io/common/uuid"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
func TestParseBucketPrefixInvalid(t *testing.T) { func TestParseBucketPrefixInvalid(t *testing.T) {

0
satellite/metainfo/metabase/consts_test.go → satellite/metabase/consts_test.go
View File

0
satellite/metainfo/metabase/db.go → satellite/metabase/db.go
View File

2
satellite/metainfo/metabase/db_migrate_test.go → satellite/metabase/db_migrate_test.go
View File

@ -13,7 +13,7 @@ import (
"storj.io/common/testcontext" "storj.io/common/testcontext"
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/common/uuid" "storj.io/common/uuid"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/satellitedb/satellitedbtest" "storj.io/storj/satellite/satellitedb/satellitedbtest"
) )

2
satellite/metainfo/metabase/db_test.go → satellite/metabase/db_test.go
View File

@ -14,7 +14,7 @@ import (
"storj.io/common/testcontext" "storj.io/common/testcontext"
_ "storj.io/storj/private/dbutil/cockroachutil" // register cockroach driver _ "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" "storj.io/storj/satellite/satellitedb/satellitedbtest"
) )

0
satellite/metainfo/metabase/delete.go → satellite/metabase/delete.go
View File

0
satellite/metainfo/metabase/delete_bucket.go → satellite/metabase/delete_bucket.go
View File

2
satellite/metainfo/metabase/delete_bucket_test.go → satellite/metabase/delete_bucket_test.go
View File

@ -12,7 +12,7 @@ import (
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/common/testcontext" "storj.io/common/testcontext"
"storj.io/common/uuid" "storj.io/common/uuid"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
func TestDeleteBucketObjects(t *testing.T) { func TestDeleteBucketObjects(t *testing.T) {

0
satellite/metainfo/metabase/delete_expired.go → satellite/metabase/delete_expired.go
View File

2
satellite/metainfo/metabase/delete_expired_test.go → satellite/metabase/delete_expired_test.go
View File

@ -9,7 +9,7 @@ import (
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/common/testcontext" "storj.io/common/testcontext"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
func TestDeleteExpiredObjects(t *testing.T) { func TestDeleteExpiredObjects(t *testing.T) {

2
satellite/metainfo/metabase/delete_test.go → satellite/metabase/delete_test.go
View File

@ -11,7 +11,7 @@ import (
"storj.io/common/testcontext" "storj.io/common/testcontext"
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/common/uuid" "storj.io/common/uuid"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
func TestDeletePendingObject(t *testing.T) { func TestDeletePendingObject(t *testing.T) {

0
satellite/metainfo/metabase/encoding.go → satellite/metabase/encoding.go
View File

0
satellite/metainfo/metabase/get.go → satellite/metabase/get.go
View File

2
satellite/metainfo/metabase/get_test.go → satellite/metabase/get_test.go
View File

@ -10,7 +10,7 @@ import (
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/common/testcontext" "storj.io/common/testcontext"
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
func TestGetObjectExactVersion(t *testing.T) { func TestGetObjectExactVersion(t *testing.T) {

0
satellite/metainfo/metabase/iterator.go → satellite/metabase/iterator.go
View File

2
satellite/metainfo/metabase/iterator_test.go → satellite/metabase/iterator_test.go
View File

@ -13,7 +13,7 @@ import (
"storj.io/common/testcontext" "storj.io/common/testcontext"
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/common/uuid" "storj.io/common/uuid"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
func TestIterateObjects(t *testing.T) { func TestIterateObjects(t *testing.T) {

0
satellite/metainfo/metabase/iterator_util_test.go → satellite/metabase/iterator_util_test.go
View File

0
satellite/metainfo/metabase/list.go → satellite/metabase/list.go
View File

0
satellite/metainfo/metabase/list_segments.go → satellite/metabase/list_segments.go
View File

2
satellite/metainfo/metabase/list_segments_test.go → satellite/metabase/list_segments_test.go
View File

@ -10,7 +10,7 @@ import (
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/common/testcontext" "storj.io/common/testcontext"
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
func TestListSegments(t *testing.T) { func TestListSegments(t *testing.T) {

0
satellite/metainfo/metabase/loop.go → satellite/metabase/loop.go
View File

2
satellite/metainfo/metabase/loop_test.go → satellite/metabase/loop_test.go
View File

@ -14,7 +14,7 @@ import (
"storj.io/common/testcontext" "storj.io/common/testcontext"
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/common/uuid" "storj.io/common/uuid"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
func TestIterateLoopObjects(t *testing.T) { func TestIterateLoopObjects(t *testing.T) {

0
satellite/metainfo/metabase/raw.go → satellite/metabase/raw.go
View File

0
satellite/metainfo/metabase/streamstat.go → satellite/metabase/streamstat.go
View File

2
satellite/metainfo/metabase/streamstat_test.go → satellite/metabase/streamstat_test.go
View File

@ -9,7 +9,7 @@ import (
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/common/testcontext" "storj.io/common/testcontext"
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
func TestGetStreamPieceCountByNodeID(t *testing.T) { func TestGetStreamPieceCountByNodeID(t *testing.T) {

2
satellite/metainfo/metabase/test_test.go → satellite/metabase/test_test.go
View File

@ -19,7 +19,7 @@ import (
"storj.io/common/testcontext" "storj.io/common/testcontext"
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/common/uuid" "storj.io/common/uuid"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
type BeginObjectNextVersion struct { type BeginObjectNextVersion struct {

0
satellite/metainfo/metabase/update.go → satellite/metabase/update.go
View File

2
satellite/metainfo/metabase/update_test.go → satellite/metabase/update_test.go
View File

@ -14,7 +14,7 @@ import (
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/common/testcontext" "storj.io/common/testcontext"
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
"storj.io/storj/storage" "storj.io/storj/storage"
) )

0
satellite/metainfo/metabase/util.go → satellite/metabase/util.go
View File

2
satellite/metainfo/config.go
View File

@ -17,7 +17,7 @@ import (
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/common/uuid" "storj.io/common/uuid"
"storj.io/storj/private/dbutil" "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/metaloop"
"storj.io/storj/satellite/metainfo/piecedeletion" "storj.io/storj/satellite/metainfo/piecedeletion"
) )

2
satellite/metainfo/db.go
View File

@ -9,7 +9,7 @@ import (
"storj.io/common/macaroon" "storj.io/common/macaroon"
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/common/uuid" "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. // BucketsDB is the interface for the database to interact with buckets.

2
satellite/metainfo/endpoint_test.go
View File

@ -21,7 +21,7 @@ import (
"storj.io/common/testcontext" "storj.io/common/testcontext"
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/storj/private/testplanet" "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/etag"
"storj.io/uplink/private/metainfo" "storj.io/uplink/private/metainfo"
"storj.io/uplink/private/multipart" "storj.io/uplink/private/multipart"

2
satellite/metainfo/expireddeletion/chore.go
View File

@ -12,8 +12,8 @@ import (
"go.uber.org/zap" "go.uber.org/zap"
"storj.io/common/sync2" "storj.io/common/sync2"
"storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/metainfo" "storj.io/storj/satellite/metainfo"
"storj.io/storj/satellite/metainfo/metabase"
) )
var ( var (

2
satellite/metainfo/metainfo.go
View File

@ -27,7 +27,7 @@ import (
"storj.io/storj/satellite/attribution" "storj.io/storj/satellite/attribution"
"storj.io/storj/satellite/console" "storj.io/storj/satellite/console"
"storj.io/storj/satellite/internalpb" "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/piecedeletion"
"storj.io/storj/satellite/metainfo/pointerverification" "storj.io/storj/satellite/metainfo/pointerverification"
"storj.io/storj/satellite/orders" "storj.io/storj/satellite/orders"

2
satellite/metainfo/metainfo_test.go
View File

@ -32,8 +32,8 @@ import (
"storj.io/storj/private/testplanet" "storj.io/storj/private/testplanet"
"storj.io/storj/satellite" "storj.io/storj/satellite"
"storj.io/storj/satellite/internalpb" "storj.io/storj/satellite/internalpb"
"storj.io/storj/satellite/metabase"
satMetainfo "storj.io/storj/satellite/metainfo" satMetainfo "storj.io/storj/satellite/metainfo"
"storj.io/storj/satellite/metainfo/metabase"
"storj.io/uplink" "storj.io/uplink"
"storj.io/uplink/private/etag" "storj.io/uplink/private/etag"
"storj.io/uplink/private/metainfo" "storj.io/uplink/private/metainfo"

2
satellite/metainfo/metaloop/service.go
View File

@ -14,7 +14,7 @@ import (
"golang.org/x/time/rate" "golang.org/x/time/rate"
"storj.io/common/uuid" "storj.io/common/uuid"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
const batchsizeLimit = 2500 const batchsizeLimit = 2500

2
satellite/metainfo/metaloop/service_test.go
View File

@ -23,7 +23,7 @@ import (
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/storj/private/testplanet" "storj.io/storj/private/testplanet"
"storj.io/storj/satellite" "storj.io/storj/satellite"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/metainfo/metaloop" "storj.io/storj/satellite/metainfo/metaloop"
"storj.io/uplink/private/multipart" "storj.io/uplink/private/multipart"
) )

2
satellite/metainfo/service.go
View File

@ -12,7 +12,7 @@ import (
"storj.io/common/macaroon" "storj.io/common/macaroon"
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/common/uuid" "storj.io/common/uuid"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
var ( var (

2
satellite/metainfo/validation.go
View File

@ -22,7 +22,7 @@ import (
"storj.io/common/uuid" "storj.io/common/uuid"
"storj.io/storj/satellite/console" "storj.io/storj/satellite/console"
"storj.io/storj/satellite/console/consoleauth" "storj.io/storj/satellite/console/consoleauth"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
var ( var (

2
satellite/orders/endpoint.go
View File

@ -22,7 +22,7 @@ import (
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/common/uuid" "storj.io/common/uuid"
"storj.io/storj/private/date" "storj.io/storj/private/date"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/nodeapiversion" "storj.io/storj/satellite/nodeapiversion"
) )

2
satellite/orders/endpoint_test.go
View File

@ -16,7 +16,7 @@ import (
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/storj/private/testplanet" "storj.io/storj/private/testplanet"
"storj.io/storj/satellite/internalpb" "storj.io/storj/satellite/internalpb"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
func TestSettlementWithWindowEndpointManyOrders(t *testing.T) { func TestSettlementWithWindowEndpointManyOrders(t *testing.T) {

2
satellite/orders/service.go
View File

@ -18,7 +18,7 @@ import (
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/common/uuid" "storj.io/common/uuid"
"storj.io/storj/satellite/internalpb" "storj.io/storj/satellite/internalpb"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/overlay" "storj.io/storj/satellite/overlay"
"storj.io/uplink/private/eestream" "storj.io/uplink/private/eestream"
) )

2
satellite/orders/service_test.go
View File

@ -12,7 +12,7 @@ import (
"storj.io/common/testcontext" "storj.io/common/testcontext"
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/storj/private/testplanet" "storj.io/storj/private/testplanet"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
func TestOrderLimitsEncryptedMetadata(t *testing.T) { func TestOrderLimitsEncryptedMetadata(t *testing.T) {

2
satellite/orders/signer.go
View File

@ -15,7 +15,7 @@ import (
"storj.io/common/signing" "storj.io/common/signing"
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/storj/satellite/internalpb" "storj.io/storj/satellite/internalpb"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
// ErrSigner is default error class for Signer. // ErrSigner is default error class for Signer.

2
satellite/orders/signer_test.go
View File

@ -16,7 +16,7 @@ import (
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/storj/private/testplanet" "storj.io/storj/private/testplanet"
"storj.io/storj/satellite" "storj.io/storj/satellite"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/orders" "storj.io/storj/satellite/orders"
) )

2
satellite/overlay/service.go
View File

@ -14,7 +14,7 @@ import (
"storj.io/common/pb" "storj.io/common/pb"
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
// ErrEmptyNode is returned when the nodeID is empty. // ErrEmptyNode is returned when the nodeID is empty.

2
satellite/payments/stripecoinpayments/service_test.go
View File

@ -21,7 +21,7 @@ import (
"storj.io/storj/satellite" "storj.io/storj/satellite"
"storj.io/storj/satellite/accounting" "storj.io/storj/satellite/accounting"
"storj.io/storj/satellite/console" "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"
"storj.io/storj/satellite/payments/stripecoinpayments" "storj.io/storj/satellite/payments/stripecoinpayments"
) )

2
satellite/repair/checker/checker.go
View File

@ -17,8 +17,8 @@ import (
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/common/sync2" "storj.io/common/sync2"
"storj.io/storj/satellite/internalpb" "storj.io/storj/satellite/internalpb"
"storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/metainfo" "storj.io/storj/satellite/metainfo"
"storj.io/storj/satellite/metainfo/metabase"
"storj.io/storj/satellite/metainfo/metaloop" "storj.io/storj/satellite/metainfo/metaloop"
"storj.io/storj/satellite/overlay" "storj.io/storj/satellite/overlay"
"storj.io/storj/satellite/repair" "storj.io/storj/satellite/repair"

2
satellite/repair/checker/checker_test.go
View File

@ -16,7 +16,7 @@ import (
"storj.io/common/testcontext" "storj.io/common/testcontext"
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/storj/private/testplanet" "storj.io/storj/private/testplanet"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
"storj.io/storj/storage" "storj.io/storj/storage"
) )

2
satellite/repair/checker/checkerstats.go
View File

@ -8,7 +8,7 @@ import (
"github.com/spacemonkeygo/monkit/v3" "github.com/spacemonkeygo/monkit/v3"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
// statsCollector holds a *stats for each redundancy scheme // statsCollector holds a *stats for each redundancy scheme

2
satellite/repair/checker/online.go
View File

@ -10,7 +10,7 @@ import (
"time" "time"
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/overlay" "storj.io/storj/satellite/overlay"
) )

2
satellite/repair/checker/online_test.go
View File

@ -14,7 +14,7 @@ import (
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/common/testcontext" "storj.io/common/testcontext"
"storj.io/common/testrand" "storj.io/common/testrand"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/overlay" "storj.io/storj/satellite/overlay"
) )

2
satellite/repair/irreparable/irreparable.go
View File

@ -7,7 +7,7 @@ import (
"context" "context"
"storj.io/storj/satellite/internalpb" "storj.io/storj/satellite/internalpb"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
) )
// DB stores information about repairs that have failed. // DB stores information about repairs that have failed.

2
satellite/repair/irreparable/irreparable_test.go
View File

@ -16,7 +16,7 @@ import (
"storj.io/storj/private/testplanet" "storj.io/storj/private/testplanet"
"storj.io/storj/satellite" "storj.io/storj/satellite"
"storj.io/storj/satellite/internalpb" "storj.io/storj/satellite/internalpb"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/satellitedb/satellitedbtest" "storj.io/storj/satellite/satellitedb/satellitedbtest"
) )

2
satellite/repair/repair_test.go
View File

@ -23,7 +23,7 @@ import (
"storj.io/common/uuid" "storj.io/common/uuid"
"storj.io/storj/private/testplanet" "storj.io/storj/private/testplanet"
"storj.io/storj/satellite" "storj.io/storj/satellite"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/overlay" "storj.io/storj/satellite/overlay"
"storj.io/storj/satellite/repair/checker" "storj.io/storj/satellite/repair/checker"
"storj.io/storj/storage" "storj.io/storj/storage"

2
satellite/repair/repairer/segments.go
View File

@ -17,8 +17,8 @@ import (
"storj.io/common/rpc" "storj.io/common/rpc"
"storj.io/common/signing" "storj.io/common/signing"
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/metainfo" "storj.io/storj/satellite/metainfo"
"storj.io/storj/satellite/metainfo/metabase"
"storj.io/storj/satellite/orders" "storj.io/storj/satellite/orders"
"storj.io/storj/satellite/overlay" "storj.io/storj/satellite/overlay"
"storj.io/storj/satellite/repair/checker" "storj.io/storj/satellite/repair/checker"

2
satellite/satellitedb/bucketsdb.go
View File

@ -11,7 +11,7 @@ import (
"storj.io/common/macaroon" "storj.io/common/macaroon"
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/common/uuid" "storj.io/common/uuid"
"storj.io/storj/satellite/metainfo/metabase" "storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/satellitedb/dbx" "storj.io/storj/satellite/satellitedb/dbx"
) )

Some files were not shown because too many files have changed in this diff Show More