From 1cbddc34e102eadd06b6f4997f465180eaf8f211 Mon Sep 17 00:00:00 2001
From: Daniel Liu <139250065@qq.com>
Date: Mon, 3 Nov 2025 15:15:39 +0800
Subject: [PATCH] XDPoS/engines, core: fix non idiomatic "comma ok" boolean
 name, close XFN-126 (#1690)

---
 consensus/XDPoS/engines/engine_v1/engine.go       | 4 ++--
 consensus/XDPoS/engines/engine_v2/verifyHeader.go | 4 ++--
 core/blockchain.go                                | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/consensus/XDPoS/engines/engine_v1/engine.go b/consensus/XDPoS/engines/engine_v1/engine.go
index 0679d803cb..f4043b364f 100644
--- a/consensus/XDPoS/engines/engine_v1/engine.go
+++ b/consensus/XDPoS/engines/engine_v1/engine.go
@@ -134,8 +134,8 @@ func (x *XDPoS_v1) VerifyHeaders(chain consensus.ChainReader, headers []*types.H
 }
 
 func (x *XDPoS_v1) verifyHeaderWithCache(chain consensus.ChainReader, header *types.Header, parents []*types.Header, fullVerify bool, verifyCheckpoint bool) error {
-	_, check := x.verifiedHeaders.Get(header.Hash())
-	if check {
+	_, ok := x.verifiedHeaders.Get(header.Hash())
+	if ok {
 		return nil
 	}
 	err := x.verifyHeader(chain, header, parents, fullVerify, verifyCheckpoint)
diff --git a/consensus/XDPoS/engines/engine_v2/verifyHeader.go b/consensus/XDPoS/engines/engine_v2/verifyHeader.go
index 86c21d7abb..a6db7a781d 100644
--- a/consensus/XDPoS/engines/engine_v2/verifyHeader.go
+++ b/consensus/XDPoS/engines/engine_v2/verifyHeader.go
@@ -28,8 +28,8 @@ func (x *XDPoS_v2) verifyHeader(chain consensus.ChainReader, header *types.Heade
 		}
 	}
 
-	_, check := x.verifiedHeaders.Get(header.Hash())
-	if check {
+	_, ok := x.verifiedHeaders.Get(header.Hash())
+	if ok {
 		return nil
 	}
 
diff --git a/core/blockchain.go b/core/blockchain.go
index 68b8e4f90c..b74169ba2f 100644
--- a/core/blockchain.go
+++ b/core/blockchain.go
@@ -1943,11 +1943,11 @@ func (bc *BlockChain) InsertBlock(block *types.Block) error {
 
 func (bc *BlockChain) PrepareBlock(block *types.Block) (err error) {
 	defer log.Debug("Done prepare block ", "number", block.NumberU64(), "hash", block.Hash(), "validator", block.Header().Validator, "err", err)
-	if _, check := bc.resultProcess.Get(block.Hash()); check {
+	if _, ok := bc.resultProcess.Get(block.Hash()); ok {
 		log.Debug("Stop prepare a block because the result cached", "number", block.NumberU64(), "hash", block.Hash(), "validator", block.Header().Validator)
 		return nil
 	}
-	if _, check := bc.calculatingBlock.Get(block.Hash()); check {
+	if _, ok := bc.calculatingBlock.Get(block.Hash()); ok {
 		log.Debug("Stop prepare a block because inserting", "number", block.NumberU64(), "hash", block.Hash(), "validator", block.Header().Validator)
 		return nil
 	}
@@ -1971,7 +1971,7 @@ func (bc *BlockChain) PrepareBlock(block *types.Block) (err error) {
 func (bc *BlockChain) getResultBlock(block *types.Block, verifiedM2 bool) (*ResultProcessBlock, error) {
 	var calculatedBlock *CalculatedBlock
 	if verifiedM2 {
-		if result, check := bc.resultProcess.Get(block.HashNoValidator()); check {
+		if result, ok := bc.resultProcess.Get(block.HashNoValidator()); ok {
 			log.Debug("Get result block from cache ", "number", block.NumberU64(), "hash", block.Hash(), "hash no validator", block.HashNoValidator())
 			return result, nil
 		}
@@ -2201,7 +2201,7 @@ func (bc *BlockChain) insertBlock(block *types.Block) ([]interface{}, []*types.L
 		events        = make([]interface{}, 0, 1)
 		coalescedLogs []*types.Log
 	)
-	if _, check := bc.downloadingBlock.Get(block.Hash()); check {
+	if _, ok := bc.downloadingBlock.Get(block.Hash()); ok {
 		log.Debug("Stop fetcher a block because downloading", "number", block.NumberU64(), "hash", block.Hash())
 		return events, coalescedLogs, nil
 	}