refactor: refactor error handling in block lookup process

- Simplify error handling by changing the condition for cancellation in the block lookup process. - Add a log message for when block scanning is canceled. - Improve readability by restructuring the error check logic. Signed-off-by: Sean Zheng <[email protected]>
blackhorseya · Oct 4, 2024 · 0a9830f · 0a9830f
1 parent d201a0e
commit 0a9830f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/app/domain/block/block_service.go b/app/domain/block/block_service.go
@@ -117,7 +117,11 @@ func (i *impl) ScanBlock(req *biz.ScanBlockRequest, stream biz.BlockService_Scan
 		// 更新主鏈區塊以繼續監控新地分片區塊
 		nextSeqNo := master.SeqNo + 1
 		master, err2 = api.WaitForBlock(nextSeqNo).LookupBlock(ctx, master.Workchain, master.Shard, nextSeqNo)
-		if err2 != nil && !errors.Is(err2, context.Canceled) {
+		if errors.Is(err2, context.Canceled) {
+			ctx.Info("scan block canceled")
+			return nil
+		}
+		if err2 != nil {
 			ctx.Error("failed to lookup next block", zap.Uint32("seq_no", nextSeqNo), zap.Error(err2))
 			return err2
 		}