testsuite: bump storj/storj

Some removed test methods require adjusting. Change-Id: I534cbf583c1633beb4b48268f99317414ee9d0a4
storj · Apr 8, 2024 · e1a5c5b · e1a5c5b
1 parent 4ad5621
commit e1a5c5b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 35 deletions.
diff --git a/testsuite/go.mod b/testsuite/go.mod
@@ -14,8 +14,8 @@ require (
 	storj.io/common v0.0.0-20240325183111-3a1a80390ccd
 	storj.io/drpc v0.0.34
 	storj.io/infectious v0.0.2
-	storj.io/storj v1.91.0-alpha.0.20240402100624-858a5767e8c9
-	storj.io/uplink v1.12.3-0.20240325204957-7e1a1e616922
+	storj.io/storj v1.91.0-alpha.0.20240405184421-d601509eca53
+	storj.io/uplink v1.12.3-0.20240405162132-4ad5621e6841
 )
 
 require (

diff --git a/testsuite/go.sum b/testsuite/go.sum
@@ -752,5 +752,5 @@ storj.io/monkit-jaeger v0.0.0-20240221095020-52b0792fa6cd h1:XkLxAvogynNQu/1gM/F
 storj.io/monkit-jaeger v0.0.0-20240221095020-52b0792fa6cd/go.mod h1:nwyyJiAFAPRu81qBfAE5cBGkVXROYSNJu9pGXLtStHE=
 storj.io/picobuf v0.0.3 h1:xAUPB5ZUGfxkqd3bnw3zp01kkWb9wlhg4vtZWUs2S9A=
 storj.io/picobuf v0.0.3/go.mod h1:4V4xelV1RSCck5GgmkL/Txw9l6IfX3XcBzegmL5Kudo=
-storj.io/storj v1.91.0-alpha.0.20240402100624-858a5767e8c9 h1:IZx3DUa5YxFxAOaOnRe70pCzF1rPAcCjxQ6vrNmVPsM=
-storj.io/storj v1.91.0-alpha.0.20240402100624-858a5767e8c9/go.mod h1:yodDOtqRUl5I826lmPzxuahsBHjaScBi9LTE6tRDhPw=
+storj.io/storj v1.91.0-alpha.0.20240405184421-d601509eca53 h1:EBCglNJeZz3S6RSBEDODg9F0A8gqS5yy/6CfrejjJuI=
+storj.io/storj v1.91.0-alpha.0.20240405184421-d601509eca53/go.mod h1:yodDOtqRUl5I826lmPzxuahsBHjaScBi9LTE6tRDhPw=
diff --git a/testsuite/multipart_test.go b/testsuite/multipart_test.go
@@ -20,7 +20,6 @@ import (
 	"storj.io/common/testcontext"
 	"storj.io/common/testrand"
 	"storj.io/storj/private/testplanet"
-	"storj.io/storj/satellite/metabase"
 	"storj.io/uplink"
 	"storj.io/uplink/private/testuplink"
 )
@@ -436,15 +435,7 @@ func TestUploadPart_CheckNoEmptyInlineSegment(t *testing.T) {
 		require.Equal(t, expectedData, data)
 
 		// verify that part has 3 segments and no empty inline segment at the end
-		objects, err := planet.Satellites[0].Metabase.DB.TestingAllCommittedObjects(ctx, planet.Uplinks[0].Projects[0].ID, bucket)
-		require.NoError(t, err)
-		require.Len(t, objects, 1)
-
-		segments, err := planet.Satellites[0].Metabase.DB.TestingAllObjectSegments(ctx, metabase.ObjectLocation{
-			ProjectID:  planet.Uplinks[0].Projects[0].ID,
-			BucketName: bucket,
-			ObjectKey:  objects[0].ObjectKey,
-		})
+		segments, err := planet.Satellites[0].Metabase.DB.TestingAllSegments(ctx)
 		require.NoError(t, err)
 		require.Len(t, segments, 3)
 		require.NotZero(t, segments[2].PlainSize)

diff --git a/testsuite/private/metainfo/client_test.go b/testsuite/private/metainfo/client_test.go
@@ -22,7 +22,7 @@ func TestGetObject_RedundancySchemePerSegment(t *testing.T) {
 		err := planet.Uplinks[0].Upload(ctx, planet.Satellites[0], "super-bucket", "super-object", testrand.Bytes(10*memory.KiB))
 		require.NoError(t, err)
 
-		objects, err := planet.Satellites[0].Metabase.DB.TestingAllCommittedObjects(ctx, planet.Uplinks[0].Projects[0].ID, "super-bucket")
+		objects, err := planet.Satellites[0].Metabase.DB.TestingAllObjects(ctx)
 		require.NoError(t, err)
 		require.Len(t, objects, 1)
 

diff --git a/testsuite/private/testuplink/uplink_test.go b/testsuite/private/testuplink/uplink_test.go
@@ -23,7 +23,6 @@ import (
 	"storj.io/common/testrand"
 	"storj.io/drpc"
 	"storj.io/storj/private/testplanet"
-	"storj.io/storj/satellite/metabase"
 	"storj.io/uplink"
 	"storj.io/uplink/private/testuplink"
 )
@@ -55,15 +54,7 @@ func TestWithMaxSegmentSize_Upload(t *testing.T) {
 		require.Equal(t, expectedData, data)
 
 		// verify we have two segments instead of one
-		objects, err := planet.Satellites[0].Metabase.DB.TestingAllCommittedObjects(ctx, planet.Uplinks[0].Projects[0].ID, "super-bucket")
-		require.NoError(t, err)
-		require.Len(t, objects, 1)
-
-		segments, err := planet.Satellites[0].Metabase.DB.TestingAllObjectSegments(ctx, metabase.ObjectLocation{
-			ProjectID:  planet.Uplinks[0].Projects[0].ID,
-			BucketName: "super-bucket",
-			ObjectKey:  objects[0].ObjectKey,
-		})
+		segments, err := planet.Satellites[0].Metabase.DB.TestingAllSegments(ctx)
 		require.NoError(t, err)
 		require.Equal(t, 2, len(segments))
 	})

diff --git a/testsuite/uplink/metainfo/uplink_test.go b/testsuite/uplink/metainfo/uplink_test.go
@@ -12,7 +12,6 @@ import (
 	"storj.io/common/testcontext"
 	"storj.io/common/testrand"
 	"storj.io/storj/private/testplanet"
-	"storj.io/storj/satellite/metabase"
 	"storj.io/uplink/private/testuplink"
 )
 
@@ -38,15 +37,7 @@ func TestMultisegmentUploadWithoutInlineSegment(t *testing.T) {
 		// in the past object with size equal to multiplication of max segment size was uploaded
 		// as remote segments + one additional inline segment, after upload code path refactor we
 		// are uploading now only 2 remote segments without last inline segment
-		objects, err := planet.Satellites[0].Metabase.DB.TestingAllCommittedObjects(ctx, planet.Uplinks[0].Projects[0].ID, "testbucket")
-		require.NoError(t, err)
-		require.Len(t, objects, 1)
-
-		segments, err := planet.Satellites[0].Metabase.DB.TestingAllObjectSegments(ctx, metabase.ObjectLocation{
-			ProjectID:  planet.Uplinks[0].Projects[0].ID,
-			BucketName: "testbucket",
-			ObjectKey:  objects[0].ObjectKey,
-		})
+		segments, err := planet.Satellites[0].Metabase.DB.TestingAllSegments(ctx)
 		require.NoError(t, err)
 		require.Len(t, segments, 2)
 		require.EqualValues(t, 20*memory.KiB, segments[0].PlainSize)