Merge remote-tracking branch 'node-real/main' into alpha4

# Conflicts: # turbo/rpchelper/helper.go
blxdyx · Oct 15, 2024 · 9f3ca6b · 9f3ca6b
2 parents c8a5f69 + 4df9747
commit 9f3ca6b
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/turbo/rpchelper/helper.go b/turbo/rpchelper/helper.go
@@ -87,8 +87,7 @@ func _GetBlockNumber(ctx context.Context, requireCanonical bool, blockNrOrHash r
 			}
 			if fs := parliafinality.GetFinalizationService(); fs != nil {
 				blockHash := fs.GetFinalizeBlockHash()
-				blockNum := rawdb.ReadHeaderNumber(tx, blockHash)
-				if blockNum != nil {
+				if blockNum := rawdb.ReadHeaderNumber(tx, blockHash); blockNum != nil {
 					return *blockNum, blockHash, false, true, nil
 				}
 			}
@@ -99,8 +98,7 @@ func _GetBlockNumber(ctx context.Context, requireCanonical bool, blockNrOrHash r
 		case rpc.SafeBlockNumber:
 			if fs := parliafinality.GetFinalizationService(); fs != nil {
 				blockHash := fs.GetSafeBlockHash()
-				blockNum := rawdb.ReadHeaderNumber(tx, blockHash)
-				if blockNum != nil {
+				if blockNum := rawdb.ReadHeaderNumber(tx, blockHash); blockNum != nil {
 					return *blockNum, blockHash, false, true, nil
 				}
 			}