fix: unit test errors

bnb-chain · Jan 12, 2024 · 0d2aa2f · 0d2aa2f
1 parent 4015cd5
commit 0d2aa2f
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 74 deletions.
diff --git a/x/storage/keeper/cross_app_bucket.go b/x/storage/keeper/cross_app_bucket.go
@@ -206,25 +206,25 @@ func (app *BucketApp) handleMirrorBucketFailAckPackage(ctx sdk.Context, appCtx *
 }
 
 func (app *BucketApp) handleMirrorBucketSynPackage(ctx sdk.Context, header *sdk.CrossChainAppContext, synPackage *types.MirrorBucketSynPackage) sdk.ExecuteResult {
-	app.storageKeeper.Logger(ctx).Error("received mirror bucket syn package ")
+	app.storageKeeper.Logger(ctx).Error("received mirror bucket syn package")
 
 	return sdk.ExecuteResult{}
 }
 
 func (app *BucketApp) handleCreateBucketAckPackage(ctx sdk.Context, appCtx *sdk.CrossChainAppContext, ackPackage *types.CreateBucketAckPackage) sdk.ExecuteResult {
-	app.storageKeeper.Logger(ctx).Error("received create bucket ack package ")
+	app.storageKeeper.Logger(ctx).Error("received create bucket ack package")
 
 	return sdk.ExecuteResult{}
 }
 
 func (app *BucketApp) handleCreateBucketFailAckPackage(ctx sdk.Context, appCtx *sdk.CrossChainAppContext, synPackage *types.CreateBucketSynPackage) sdk.ExecuteResult {
-	app.storageKeeper.Logger(ctx).Error("received create bucket fail ack package ")
+	app.storageKeeper.Logger(ctx).Error("received create bucket fail ack package")
 
 	return sdk.ExecuteResult{}
 }
 
 func (app *BucketApp) handleCreateBucketFailAckPackageV2(ctx sdk.Context, appCtx *sdk.CrossChainAppContext, synPackage *types.CreateBucketSynPackageV2) sdk.ExecuteResult {
-	app.storageKeeper.Logger(ctx).Error("received create bucket fail ack package ")
+	app.storageKeeper.Logger(ctx).Error("received create bucket fail ack package")
 
 	return sdk.ExecuteResult{}
 }

diff --git a/x/storage/keeper/cross_app_bucket_test.go b/x/storage/keeper/cross_app_bucket_test.go
@@ -228,19 +228,24 @@ func (s *TestSuite) TestFailAckCreateBucket() {
 	storageKeeper.EXPECT().Logger(gomock.Any()).Return(s.ctx.Logger()).AnyTimes()
 
 	app := keeper.NewBucketApp(storageKeeper)
-	createSynPackage := types.CreateBucketSynPackage{
-		Creator:          sample.RandAccAddress(),
-		BucketName:       "bucketname",
-		ExtraData:        []byte("extra data"),
-		PaymentAddress:   sample.RandAccAddress(),
-		PrimarySpAddress: sample.RandAccAddress(),
+	createSynPackage := types.CreateBucketSynPackageV2{
+		Creator:                        sample.RandAccAddress(),
+		BucketName:                     "bucketName",
+		Visibility:                     0,
+		PaymentAddress:                 sample.RandAccAddress(),
+		PrimarySpAddress:               sample.RandAccAddress(),
+		PrimarySpApprovalExpiredHeight: 0,
+		GlobalVirtualGroupFamilyId:     0,
+		PrimarySpApprovalSignature:     nil,
+		ChargedReadQuota:               0,
+		ExtraData:                      []byte("extra data"),
 	}
 	serializedSynPackage := createSynPackage.MustSerialize()
 	serializedSynPackage = append([]byte{types.OperationCreateBucket}, serializedSynPackage...)
 
 	storageKeeper.EXPECT().GetSourceTypeByChainId(gomock.Any(), gomock.Any()).Return(types.SOURCE_TYPE_BSC_CROSS_CHAIN, nil).AnyTimes()
 
-	// case 1:  normal case
+	// case 1: normal case
 	res := app.ExecuteFailAckPackage(s.ctx, &sdk.CrossChainAppContext{}, serializedSynPackage)
 	s.Require().NoError(res.Err)
 }

diff --git a/x/storage/types/crosschain.go b/x/storage/types/crosschain.go
@@ -608,7 +608,7 @@ func DeserializeCreateBucketSynPackage(serializedPackage []byte) (interface{}, e
 }
 
 func (p CreateBucketSynPackageV2) MustSerialize() []byte {
-	encodedBytes, err := createBucketSynPackageStructArgs.Pack(&CreateBucketSynPackageV2Struct{
+	encodedBytes, err := createBucketSynPackageV2StructArgs.Pack(&CreateBucketSynPackageV2Struct{
 		Creator:                        common.BytesToAddress(p.Creator),
 		BucketName:                     p.BucketName,
 		Visibility:                     p.Visibility,

diff --git a/x/storage/types/message_object_test.go b/x/storage/types/message_object_test.go
@@ -190,70 +190,72 @@ func TestMsgCopyObject_ValidateBasic(t *testing.T) {
 			},
 			err: ErrInvalidApproval,
 		},
-		// {
-		// 	name: "invalid src bucket name",
-		// 	msg: MsgCopyObject{
-		// 		Operator:      sample.RandAccAddressHex(),
-		// 		SrcBucketName: "1.1.1.1",
-		// 		SrcObjectName: testObjectName,
-		// 		DstBucketName: "dst" + testBucketName,
-		// 		DstObjectName: "dst" + testObjectName,
-		// 		DstPrimarySpApproval: &common.Approval{
-		// 			ExpiredHeight: 100,
-		// 			Sig:           []byte("xxx"),
-		// 		},
-		// 	},
-		// 	err: gnfderrors.ErrInvalidBucketName,
-		// },
-		// {
-		// 	name: "invalid src object name",
-		// 	msg: MsgCopyObject{
-		// 		Operator:      sample.RandAccAddressHex(),
-		// 		SrcBucketName: testBucketName,
-		// 		SrcObjectName: "",
-		// 		DstBucketName: "dst" + testBucketName,
-		// 		DstObjectName: "dst" + testObjectName,
-		// 		DstPrimarySpApproval: &common.Approval{
-		// 			ExpiredHeight: 100,
-		// 			Sig:           []byte("xxx"),
-		// 		},
-		// 	},
-		// 	err: gnfderrors.ErrInvalidObjectName,
-		// },
-		// {
-		// 	name: "invalid dest bucket name",
-		// 	msg: MsgCopyObject{
-		// 		Operator:      sample.RandAccAddressHex(),
-		// 		SrcBucketName: testBucketName,
-		// 		SrcObjectName: testObjectName,
-		// 		DstBucketName: "1.1.1.1",
-		// 		DstObjectName: "dst" + testObjectName,
-		// 		DstPrimarySpApproval: &common.Approval{
-		// 			ExpiredHeight: 100,
-		// 			Sig:           []byte("xxx"),
-		// 		},
-		// 	},
-		// 	err: gnfderrors.ErrInvalidBucketName,
-		// },
-		// {
-		// 	name: "invalid dest object name",
-		// 	msg: MsgCopyObject{
-		// 		Operator:      sample.RandAccAddressHex(),
-		// 		SrcBucketName: testBucketName,
-		// 		SrcObjectName: testObjectName,
-		// 		DstBucketName: "dst" + testBucketName,
-		// 		DstObjectName: "",
-		// 		DstPrimarySpApproval: &common.Approval{
-		// 			ExpiredHeight: 100,
-		// 			Sig:           []byte("xxx"),
-		// 		},
-		// 	},
-		// 	err: gnfderrors.ErrInvalidObjectName,
-		// },
+		{
+			name: "invalid src bucket name",
+			msg: MsgCopyObject{
+				Operator:      sample.RandAccAddressHex(),
+				SrcBucketName: "1.1.1.1",
+				SrcObjectName: testObjectName,
+				DstBucketName: "dst" + testBucketName,
+				DstObjectName: "dst" + testObjectName,
+				DstPrimarySpApproval: &common.Approval{
+					ExpiredHeight: 100,
+					Sig:           []byte("xxx"),
+				},
+			},
+			err: gnfderrors.ErrInvalidBucketName,
+		},
+		{
+			name: "invalid src object name",
+			msg: MsgCopyObject{
+				Operator:      sample.RandAccAddressHex(),
+				SrcBucketName: testBucketName,
+				SrcObjectName: "",
+				DstBucketName: "dst" + testBucketName,
+				DstObjectName: "dst" + testObjectName,
+				DstPrimarySpApproval: &common.Approval{
+					ExpiredHeight: 100,
+					Sig:           []byte("xxx"),
+				},
+			},
+			err: gnfderrors.ErrInvalidObjectName,
+		},
+		{
+			name: "invalid dest bucket name",
+			msg: MsgCopyObject{
+				Operator:      sample.RandAccAddressHex(),
+				SrcBucketName: testBucketName,
+				SrcObjectName: testObjectName,
+				DstBucketName: "1.1.1.1",
+				DstObjectName: "dst" + testObjectName,
+				DstPrimarySpApproval: &common.Approval{
+					ExpiredHeight: 100,
+					Sig:           []byte("xxx"),
+				},
+			},
+			err: gnfderrors.ErrInvalidBucketName,
+		},
+		{
+			name: "invalid dest object name",
+			msg: MsgCopyObject{
+				Operator:      sample.RandAccAddressHex(),
+				SrcBucketName: testBucketName,
+				SrcObjectName: testObjectName,
+				DstBucketName: "dst" + testBucketName,
+				DstObjectName: "",
+				DstPrimarySpApproval: &common.Approval{
+					ExpiredHeight: 100,
+					Sig:           []byte("xxx"),
+				},
+			},
+			err: gnfderrors.ErrInvalidObjectName,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			err := tt.msg.ValidateBasic()
+			upgradeChecker := func(sdk.Context, string) bool { return true }
+			ctx := sdk.NewContext(nil, tmproto.Header{}, false, upgradeChecker, nil)
+			err := tt.msg.ValidateRuntime(ctx)
 			if tt.err != nil {
 				require.ErrorIs(t, err, tt.err)
 				return
@@ -325,7 +327,9 @@ func TestMsgSealObject_ValidateBasic(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			err := tt.msg.ValidateBasic()
+			upgradeChecker := func(sdk.Context, string) bool { return true }
+			ctx := sdk.NewContext(nil, tmproto.Header{}, false, upgradeChecker, nil)
+			err := tt.msg.ValidateRuntime(ctx)
 			if tt.err != nil {
 				require.ErrorIs(t, err, tt.err)
 				return