forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-22 04:36:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

core, eth: fix overuse Of log.Crit, close XFN-102 (#1648)

Browse source 
* core: fix overuse Of `log.Crit`, close XFN-102

* eth: fix overuse Of `log.Crit`, close XFN-102
This commit is contained in:
Daniel Liu 2025-11-14 18:58:36 +08:00 committed by benjamin202410
parent 8a368c4f04
commit 0a39a09c61
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/blockchain.go
View file

@ -2863,7 +2863,7 @@ func (bc *BlockChain) logExchangeData(block *types.Block) {
} }
txMatchBatchData, err := ExtractTradingTransactions(block.Transactions()) txMatchBatchData, err := ExtractTradingTransactions(block.Transactions())
if err != nil { if err != nil {
log.Crit("failed to extract matching transaction", "err", err) log.Error("failed to extract matching transaction", "err", err)
return return
} }
if len(txMatchBatchData) == 0 { if len(txMatchBatchData) == 0 {
@ -2891,7 +2891,7 @@ func (bc *BlockChain) logExchangeData(block *types.Block) {
) )
if takerOrderInTx, err = txMatch.DecodeOrder(); err != nil { if takerOrderInTx, err = txMatch.DecodeOrder(); err != nil {
log.Crit("SDK node decode takerOrderInTx failed", "txDataMatch", txMatch) log.Error("SDK node decode takerOrderInTx failed", "txDataMatch", txMatch)
return return
} }
cacheKey := crypto.Keccak256Hash(txMatchBatch.TxHash.Bytes(), tradingstate.GetMatchingResultCacheKey(takerOrderInTx).Bytes()) cacheKey := crypto.Keccak256Hash(txMatchBatch.TxHash.Bytes(), tradingstate.GetMatchingResultCacheKey(takerOrderInTx).Bytes())
@ -2909,7 +2909,7 @@ func (bc *BlockChain) logExchangeData(block *types.Block) {
txMatchTime := time.Unix(block.Header().Time.Int64(), 0).UTC() txMatchTime := time.Unix(block.Header().Time.Int64(), 0).UTC()
if err := XDCXService.SyncDataToSDKNode(takerOrderInTx, txMatchBatch.TxHash, txMatchTime, currentState, trades, rejectedOrders, &dirtyOrderCount); err != nil { if err := XDCXService.SyncDataToSDKNode(takerOrderInTx, txMatchBatch.TxHash, txMatchTime, currentState, trades, rejectedOrders, &dirtyOrderCount); err != nil {
log.Crit("failed to SyncDataToSDKNode ", "blockNumber", block.Number(), "err", err) log.Error("failed to SyncDataToSDKNode ", "blockNumber", block.Number(), "err", err)
return return
} }
} }
@ -2931,7 +2931,8 @@ func (bc *BlockChain) logLendingData(block *types.Block) {
} }
batches, err := ExtractLendingTransactions(block.Transactions()) batches, err := ExtractLendingTransactions(block.Transactions())
if err != nil { if err != nil {
log.Crit("failed to extract lending transaction", "err", err) log.Error("failed to extract lending transaction", "err", err)
return
} }
start := time.Now() start := time.Now()
defer func() { defer func() {
@ -2965,7 +2966,8 @@ func (bc *BlockChain) logLendingData(block *types.Block) {
statedb, _ := bc.State() statedb, _ := bc.State()
if err := lendingService.SyncDataToSDKNode(bc, statedb.Copy(), block, item, batch.TxHash, txMatchTime, trades, rejectedOrders, &dirtyOrderCount); err != nil { if err := lendingService.SyncDataToSDKNode(bc, statedb.Copy(), block, item, batch.TxHash, txMatchTime, trades, rejectedOrders, &dirtyOrderCount); err != nil {
log.Crit("lending: failed to SyncDataToSDKNode ", "blockNumber", block.Number(), "err", err) log.Error("lending: failed to SyncDataToSDKNode ", "blockNumber", block.Number(), "err", err)
return
} }
} }
} }
@ -2974,7 +2976,8 @@ func (bc *BlockChain) logLendingData(block *types.Block) {
if block.Number().Uint64()%bc.chainConfig.XDPoS.Epoch == common.LiquidateLendingTradeBlock { if block.Number().Uint64()%bc.chainConfig.XDPoS.Epoch == common.LiquidateLendingTradeBlock {
finalizedTx, err := ExtractLendingFinalizedTradeTransactions(block.Transactions()) finalizedTx, err := ExtractLendingFinalizedTradeTransactions(block.Transactions())
if err != nil { if err != nil {
log.Crit("failed to extract finalizedTrades transaction", "err", err) log.Error("failed to extract finalizedTrades transaction", "err", err)
return
} }
finalizedTrades := map[common.Hash]*lendingstate.LendingTrade{} finalizedTrades := map[common.Hash]*lendingstate.LendingTrade{}
finalizedData, ok := bc.finalizedTrade.Get(finalizedTx.TxHash) finalizedData, ok := bc.finalizedTrade.Get(finalizedTx.TxHash)
@ -2983,7 +2986,8 @@ func (bc *BlockChain) logLendingData(block *types.Block) {
} }
if len(finalizedTrades) > 0 { if len(finalizedTrades) > 0 {
if err := lendingService.UpdateLiquidatedTrade(block.Time().Uint64(), finalizedTx, finalizedTrades); err != nil { if err := lendingService.UpdateLiquidatedTrade(block.Time().Uint64(), finalizedTx, finalizedTrades); err != nil {
log.Crit("lending: failed to UpdateLiquidatedTrade ", "blockNumber", block.Number(), "err", err) log.Error("lending: failed to UpdateLiquidatedTrade ", "blockNumber", block.Number(), "err", err)
return
} }
} }
} }

6
eth/api_backend.go
View file

@ -489,13 +489,13 @@ func (b *EthAPIBackend) GetVotersRewards(masternodeAddr common.Address) map[comm
signers, err := contracts.GetRewardForCheckpoint(engine, chain, lastCheckpointBlock.Header(), rCheckpoint, totalSigner) signers, err := contracts.GetRewardForCheckpoint(engine, chain, lastCheckpointBlock.Header(), rCheckpoint, totalSigner)
if err != nil { if err != nil {
log.Crit("Fail to get signers for reward checkpoint", "error", err) log.Error("Fail to get signers for reward checkpoint", "error", err)
return nil return nil
} }
rewardSigners, err := contracts.CalculateRewardForSigner(chainReward, signers, *totalSigner) rewardSigners, err := contracts.CalculateRewardForSigner(chainReward, signers, *totalSigner)
if err != nil { if err != nil {
log.Crit("Fail to calculate reward for signers", "error", err) log.Error("Fail to calculate reward for signers", "error", err)
return nil return nil
} }
@ -509,7 +509,7 @@ func (b *EthAPIBackend) GetVotersRewards(masternodeAddr common.Address) map[comm
if signer == masternodeAddr { if signer == masternodeAddr {
rewards, err := contracts.CalculateRewardForHolders(foundationWalletAddr, state, masternodeAddr, calcReward, number) rewards, err := contracts.CalculateRewardForHolders(foundationWalletAddr, state, masternodeAddr, calcReward, number)
if err != nil { if err != nil {
log.Crit("Fail to calculate reward for holders.", "error", err) log.Error("Fail to calculate reward for holders.", "error", err)
return nil return nil
} }
voterResults = rewards voterResults = rewards