lint

bnb-chain · Oct 10, 2023 · d2da041 · d2da041
1 parent 93d721e
commit d2da041
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/e2e/core/basesuite.go b/e2e/core/basesuite.go
@@ -126,9 +126,9 @@ func (s *BaseSuite) InitChain() {
 
 func (s *BaseSuite) SetupSuite() {
 	s.Config = InitConfig()
-	//initValidatorOnce.Do(func() {
-	//	s.InitChain()
-	//})
+	initValidatorOnce.Do(func() {
+		s.InitChain()
+	})
 
 	s.Client, _ = client.NewGreenfieldClient(s.Config.TendermintAddr, s.Config.ChainId)
 	tmClient := client.NewTendermintClient(s.Config.TendermintAddr)

diff --git a/proto/greenfield/storage/events.proto b/proto/greenfield/storage/events.proto
@@ -105,7 +105,7 @@ message EventCreateObject {
   string bucket_name = 3;
   // object_name define the name of object
   string object_name = 4;
-  // bucket_id define an u256 id for object
+  // bucket_id define an u256 id for bucket
   string bucket_id = 6 [
     (cosmos_proto.scalar) = "cosmos.Uint",
     (gogoproto.customtype) = "Uint",
@@ -499,7 +499,7 @@ message EventMigrationBucket {
   string operator = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
   // The name of the bucket to be migrated
   string bucket_name = 2;
-  // bucket_id define an u256 id for object
+  // bucket_id define an u256 id for bucket
   string bucket_id = 3 [
     (cosmos_proto.scalar) = "cosmos.Uint",
     (gogoproto.customtype) = "Uint",
@@ -515,7 +515,7 @@ message EventCancelMigrationBucket {
   string operator = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
   // The name of the bucket to be migrated
   string bucket_name = 2;
-  // bucket_id define an u256 id for object
+  // bucket_id define an u256 id for bucket
   string bucket_id = 3 [
     (cosmos_proto.scalar) = "cosmos.Uint",
     (gogoproto.customtype) = "Uint",
@@ -528,7 +528,7 @@ message EventRejectMigrateBucket {
   string operator = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
   // The name of the bucket to be migrated
   string bucket_name = 2;
-  // bucket_id define an u256 id for object
+  // bucket_id define an u256 id for bucket
   string bucket_id = 3 [
     (cosmos_proto.scalar) = "cosmos.Uint",
     (gogoproto.customtype) = "Uint",
@@ -542,7 +542,7 @@ message EventCompleteMigrationBucket {
   string operator = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
   // The name of the bucket to be migrated
   string bucket_name = 2;
-  // bucket_id define an u256 id for object
+  // bucket_id define an u256 id for bucket
   string bucket_id = 3 [
     (cosmos_proto.scalar) = "cosmos.Uint",
     (gogoproto.customtype) = "Uint",

diff --git a/x/storage/keeper/keeper.go b/x/storage/keeper/keeper.go
@@ -2087,7 +2087,7 @@ func (k Keeper) RejectBucketMigration(ctx sdk.Context, operator sdk.AccAddress,
 
 	migrationBucketInfo, found := k.GetMigrationBucketInfo(ctx, bucketInfo.Id)
 	if !found {
-		panic("migration bucket key not found for a migrating bucket. Should not happen")
+		return types.ErrMigrationBucketFailed.Wrapf("reject bucket migration failed due to the migrate bucket info not found.")
 	}
 
 	sp := k.spKeeper.MustGetStorageProvider(ctx, migrationBucketInfo.DstSpId)

diff --git a/x/storage/types/events.pb.go b/x/storage/types/events.pb.go