forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-24 15:44:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 GitHub
parent 2c40021f71
commit d5a03ab9e9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
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

@ -2830,7 +2830,7 @@ func (bc *BlockChain) logExchangeData(block *types.Block) {
}
txMatchBatchData, err := ExtractTradingTransactions(block.Transactions())
if err != nil {
log.Crit("failed to extract matching transaction", "err", err)
log.Error("failed to extract matching transaction", "err", err)
return
}
if len(txMatchBatchData) == 0 {
@ -2858,7 +2858,7 @@ func (bc *BlockChain) logExchangeData(block *types.Block) {
)
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
}
cacheKey := crypto.Keccak256Hash(txMatchBatch.TxHash.Bytes(), tradingstate.GetMatchingResultCacheKey(takerOrderInTx).Bytes())
@ -2876,7 +2876,7 @@ func (bc *BlockChain) logExchangeData(block *types.Block) {
txMatchTime := time.Unix(int64(block.Header().Time), 0).UTC()
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
}
}
@ -2898,7 +2898,8 @@ func (bc *BlockChain) logLendingData(block *types.Block) {
}
batches, err := ExtractLendingTransactions(block.Transactions())
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()
defer func() {
@ -2931,7 +2932,8 @@ func (bc *BlockChain) logLendingData(block *types.Block) {
statedb, _ := bc.State()
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
}
}
}
@ -2940,7 +2942,8 @@ func (bc *BlockChain) logLendingData(block *types.Block) {
if block.Number().Uint64()%bc.chainConfig.XDPoS.Epoch == common.LiquidateLendingTradeBlock {
finalizedTx, err := ExtractLendingFinalizedTradeTransactions(block.Transactions())
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{}
finalizedData, ok := bc.finalizedTrade.Get(finalizedTx.TxHash)
@ -2949,7 +2952,8 @@ func (bc *BlockChain) logLendingData(block *types.Block) {
}
if len(finalizedTrades) > 0 {
if err := lendingService.UpdateLiquidatedTrade(block.Time(), 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

@ -519,13 +519,13 @@ func (b *EthAPIBackend) GetVotersRewards(masternodeAddr common.Address) map[comm
signers, err := contracts.GetRewardForCheckpoint(engine, chain, lastCheckpointBlock.Header(), rCheckpoint, totalSigner)
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
}
rewardSigners, err := contracts.CalculateRewardForSigner(chainReward, signers, *totalSigner)
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
}
@ -539,7 +539,7 @@ func (b *EthAPIBackend) GetVotersRewards(masternodeAddr common.Address) map[comm
if signer == masternodeAddr {
rewards, err := contracts.CalculateRewardForHolders(foundationWalletAddr, state, masternodeAddr, calcReward, number)
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
}
voterResults = rewards