aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBojie Wu <bojie@dexon.org>2018-10-09 13:28:45 +0800
committerWei-Ning Huang <w@dexon.org>2019-04-09 21:32:50 +0800
commitf380e368335fa323d3f914943ceb077f4413d5a3 (patch)
tree82c86f883eaa7ed07687123c0700041f1c9b13fd
parentfe80dc1710b433b49897c65d16f5d57595683c17 (diff)
downloaddexon-f380e368335fa323d3f914943ceb077f4413d5a3.tar
dexon-f380e368335fa323d3f914943ceb077f4413d5a3.tar.gz
dexon-f380e368335fa323d3f914943ceb077f4413d5a3.tar.bz2
dexon-f380e368335fa323d3f914943ceb077f4413d5a3.tar.lz
dexon-f380e368335fa323d3f914943ceb077f4413d5a3.tar.xz
dexon-f380e368335fa323d3f914943ceb077f4413d5a3.tar.zst
dexon-f380e368335fa323d3f914943ceb077f4413d5a3.zip
app: fix log message
-rw-r--r--dex/app.go16
1 files changed, 8 insertions, 8 deletions
diff --git a/dex/app.go b/dex/app.go
index 78e8a0260..35a771460 100644
--- a/dex/app.go
+++ b/dex/app.go
@@ -142,7 +142,7 @@ func (d *DexconApp) PreparePayload(position coreTypes.Position) (payload []byte,
gp := new(core.GasPool).AddGas(math.MaxUint64)
_, _, err = core.ApplyTransaction(d.blockchain.Config(), d.blockchain, nil, gp, stateDB, currentBlock.Header(), tx, &gasUsed, d.vmConfig)
if err != nil {
- log.Error("apply confirmed transaction error: %v", err)
+ log.Error("apply confirmed transaction", "error", err)
return nil, err
}
}
@@ -151,7 +151,7 @@ func (d *DexconApp) PreparePayload(position coreTypes.Position) (payload []byte,
// apply transaction to calculate total gas used, validate nonce and check available balance
_, _, err = core.ApplyTransaction(d.blockchain.Config(), d.blockchain, nil, gp, stateDB, currentBlock.Header(), tx, &totalGasUsed, d.vmConfig)
if err != nil || totalGasUsed > gasLimit {
- log.Debug("apply transaction fail error: %v, totalGasUsed: %d, gasLimit: %d", err, totalGasUsed, gasLimit)
+ log.Debug("apply transaction fail", "error", err, "totalGasUsed", totalGasUsed, "gasLimit", gasLimit)
break
}
allTxs = append(allTxs, tx)
@@ -224,7 +224,7 @@ func (d *DexconApp) VerifyBlock(block *coreTypes.Block) bool {
}
if !d.checkChain(msg.From(), chainSize, chainID) {
- log.Error("%s can not be delivered on chain %d", msg.From().String(), chainID)
+ log.Error("check chain fail", "from", msg.From().String(), "chainSize", chainSize, "chainID", chainID)
return false
}
@@ -232,7 +232,7 @@ func (d *DexconApp) VerifyBlock(block *coreTypes.Block) bool {
if !exist {
txs, err := d.blockchain.GetConfirmedTxsByAddress(block.Position.ChainID, msg.From())
if err != nil {
- log.Error("get confirmed txs by address error: %v", err)
+ log.Error("get confirmed txs by address", "error", err)
return false
}
@@ -242,7 +242,7 @@ func (d *DexconApp) VerifyBlock(block *coreTypes.Block) bool {
// confirmed txs must apply successfully
_, _, err := core.ApplyTransaction(d.blockchain.Config(), d.blockchain, nil, gp, stateDB, currentBlock.Header(), tx, &gasUsed, d.vmConfig)
if err != nil {
- log.Error("apply confirmed transaction error: %v", err)
+ log.Error("apply confirmed transaction", "error", err)
return false
}
}
@@ -251,7 +251,7 @@ func (d *DexconApp) VerifyBlock(block *coreTypes.Block) bool {
_, _, err = core.ApplyTransaction(d.blockchain.Config(), d.blockchain, nil, gp, stateDB, currentBlock.Header(), transaction, &totalGasUsed, d.vmConfig)
if err != nil {
- log.Error("apply block transaction error: %v", err)
+ log.Error("apply block transaction", "error", err)
return false
}
}
@@ -302,7 +302,7 @@ func (d *DexconApp) BlockDelivered(blockHash coreCommon.Hash, result coreTypes.F
var transactions types.Transactions
err := rlp.Decode(bytes.NewReader(block.Payload), &transactions)
if err != nil {
- log.Error("payload rlp decode error: %v", err)
+ log.Error("payload rlp decode", "error", err)
return
}
@@ -315,7 +315,7 @@ func (d *DexconApp) BlockDelivered(blockHash coreCommon.Hash, result coreTypes.F
Coinbase: common.BytesToAddress(block.ProposerID.Hash[:]),
}, transactions, nil, nil)})
if err != nil {
- log.Error("insert chain error: %v", err)
+ log.Error("insert chain", "error", err)
return
}