feat: format code

bnb-chain · Nov 2, 2023 · 85bb01e · 85bb01e
1 parent aef412f
commit 85bb01e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/modular/approver/approve_task.go b/modular/approver/approve_task.go
@@ -155,9 +155,9 @@ func (a *ApprovalModular) HandleMigrateBucketApprovalTask(ctx context.Context, t
 	}
 
 	// check src sp has enough quota
-	success, err := a.migrateBucketQuotaCheck(ctx, task)
-	if err != nil {
-		return success, err
+	allow, err := a.migrateBucketQuotaCheck(ctx, task)
+	if err != nil || !allow {
+		return allow, err
 	}
 
 	// begin to sign the new approval task
@@ -244,9 +244,9 @@ func (a *ApprovalModular) migrateBucketQuotaCheck(ctx context.Context, task core
 		signature []byte
 		err       error
 	)
-	msgMigrateBucket := task.GetMigrateBucketInfo()
-	log.CtxDebugw(ctx, "start to check migrate bucket bucket info", "migrate_bucket_info", msgMigrateBucket)
-	bucketMeta, _, err := a.baseApp.GfSpClient().GetBucketMeta(ctx, msgMigrateBucket.GetBucketName(), true)
+	migrateBucketMsg := task.GetMigrateBucketInfo()
+	log.CtxDebugw(ctx, "start to check source sp whether has enough quota to execute bucket migration", "migrate_bucket_msg", migrateBucketMsg)
+	bucketMeta, _, err := a.baseApp.GfSpClient().GetBucketMeta(ctx, migrateBucketMsg.GetBucketName(), true)
 	if err != nil {
 		return false, err
 	}
@@ -259,21 +259,21 @@ func (a *ApprovalModular) migrateBucketQuotaCheck(ctx context.Context, task core
 		return false, ErrSignerWithDetail("failed to query sp info, error: " + err.Error())
 	}
 
-	queryMsg := &gfsptask.GfSpBucketMigrationInfo{BucketId: bucketID}
-	queryMsg.ExpireTime = time.Now().Unix() + SigExpireTimeSecond
-	signature, err = a.baseApp.GfSpClient().SignBucketMigrationInfo(context.Background(), queryMsg)
+	bucketMigrationInfo := &gfsptask.GfSpBucketMigrationInfo{BucketId: bucketID}
+	bucketMigrationInfo.ExpireTime = time.Now().Unix() + SigExpireTimeSecond
+	signature, err = a.baseApp.GfSpClient().SignBucketMigrationInfo(context.Background(), bucketMigrationInfo)
 	if err != nil {
-		log.Errorw("failed to sign migrate bucket", "migrate_bucket_info", queryMsg, "error", err)
+		log.Errorw("failed to sign migrate bucket", "bucket_migration_info", bucketMigrationInfo, "error", err)
 		return false, err
 	} else {
-		queryMsg.SetSignature(signature)
+		bucketMigrationInfo.SetSignature(signature)
 	}
-	err = a.baseApp.GfSpClient().QuerySPHasEnoughQuotaForMigrateBucket(ctx, srcSP.GetEndpoint(), queryMsg)
+	err = a.baseApp.GfSpClient().QuerySPHasEnoughQuotaForMigrateBucket(ctx, srcSP.GetEndpoint(), bucketMigrationInfo)
 	if err != nil {
 		log.CtxErrorw(ctx, "failed to check src SP migrate bucket quota", "src_sp", srcSP, "bucket_id", bucketID, "error", err)
 		return false, ErrSignerWithDetail("failed to check src SP migrate bucket quota, error: " + err.Error())
 	}
 
-	log.CtxDebugw(ctx, "succeed to check migrate bucket info", "migrate_bucket_info", msgMigrateBucket)
+	log.CtxDebugw(ctx, "succeed to check bucket source sp quota for bucket migration", "migrate_bucket_msg", migrateBucketMsg)
 	return true, nil
 }
diff --git a/modular/blocksyncer/blocksyncer_options.go b/modular/blocksyncer/blocksyncer_options.go
@@ -564,6 +564,6 @@ func (b *BlockSyncerModular) syncBucketSize() error {
 			offset = right
 		}
 	}
-	log.Info("sync bucket size success")
+	log.Info("succeed to sync bucket size")
 	return nil
 }
diff --git a/modular/gater/migrate_handler.go b/modular/gater/migrate_handler.go
@@ -117,7 +117,7 @@ func (g *GateModular) checkMigrateBucketQuotaAuth(reqCtx *RequestContext, migrat
 			// metadata service support cancel & completion migrate bucket
 			return true, bucketMigrationInfo, nil
 		}
-		log.Errorw("failed to verify migrate gvg permission", "bucket_migration_info", bucketMigrationInfo,
+		log.Errorw("failed to verify migrate bucket permission", "bucket_migration_info", bucketMigrationInfo,
 			"dest_sp", sp.GetId(), "effect", effect, "error", err)
 		return false, bucketMigrationInfo, err
 	}
@@ -134,7 +134,7 @@ func (g *GateModular) verifySignatureAndSP(reqCtx *RequestContext, migrateBucket
 	)
 	migrateBucketMsg, err = hex.DecodeString(migrateBucketMsgHeader)
 	if err != nil {
-		log.Errorw("failed to parse migrate gvg header", "migrate_gvg_header", migrateBucketMsg, "error", err)
+		log.Errorw("failed to parse migrate bucket msg header", "migrate_bucket_header", migrateBucketMsg, "error", err)
 		return false, &gfsptask.GfSpBucketMigrationInfo{}, sp, ErrDecodeMsg
 	}
 	bucketMigrationInfo := gfsptask.GfSpBucketMigrationInfo{}
@@ -144,7 +144,7 @@ func (g *GateModular) verifySignatureAndSP(reqCtx *RequestContext, migrateBucket
 		return false, &bucketMigrationInfo, sp, err
 	}
 	if bucketMigrationInfo.GetExpireTime() < time.Now().Unix() {
-		log.Errorw("failed to check migrate gvg expire time", "bucket_migration_info", bucketMigrationInfo)
+		log.Errorw("failed to check migrate bucket expire time", "bucket_migration_info", bucketMigrationInfo)
 		return false, &bucketMigrationInfo, sp, ErrNoPermission
 	}
 	destSPAddr, err := reqCtx.verifyTaskSignature(bucketMigrationInfo.GetSignBytes(), bucketMigrationInfo.GetSignature())
@@ -388,7 +388,7 @@ func (g *GateModular) getLatestBucketQuotaHandler(w http.ResponseWriter, r *http
 		return
 	}
 	if !allowMigrate {
-		log.CtxErrorw(reqCtx.Context(), "no permission to migrate piece", "bucket_migration_info", bucketMigrationInfo)
+		log.CtxErrorw(reqCtx.Context(), "no permission to get latest bucket quota", "bucket_migration_info", bucketMigrationInfo)
 		err = ErrNoPermission
 		return
 	}
@@ -445,7 +445,7 @@ func (g *GateModular) preMigrateBucketHandler(w http.ResponseWriter, r *http.Req
 		return
 	}
 	if !allowMigrate {
-		log.CtxErrorw(reqCtx.Context(), "no permission to migrate piece", "bucket_migration_info", bucketMigrationInfo)
+		log.CtxErrorw(reqCtx.Context(), "no permission to pre migrate bucket", "bucket_migration_info", bucketMigrationInfo)
 		err = ErrNoPermission
 		return
 	}
@@ -525,7 +525,7 @@ func (g *GateModular) postMigrateBucketHandler(w http.ResponseWriter, r *http.Re
 		return
 	}
 	if !allowMigrate {
-		log.CtxErrorw(reqCtx.Context(), "no permission to migrate piece", "bucket_migration_info", bucketMigrationInfo)
+		log.CtxErrorw(reqCtx.Context(), "no permission to post migrate bucket", "bucket_migration_info", bucketMigrationInfo)
 		err = ErrNoPermission
 		return
 	}
@@ -611,7 +611,7 @@ func (g *GateModular) sufficientQuotaForBucketMigrationHandler(w http.ResponseWr
 		return
 	}
 	if !allowMigrate {
-		log.CtxErrorw(reqCtx.Context(), "no permission to migrate piece", "bucket_migration_info", bucketMigrationInfo)
+		log.CtxErrorw(reqCtx.Context(), "no permission to check source sp has enough quota", "bucket_migration_info", bucketMigrationInfo)
 		err = ErrNoPermission
 		return
 	}