fix log

[bytom/vapor.git] / protocol / tx.go

diff --git a/protocol/tx.go b/protocol/tx.go
index 8ed6d7a..bdd3516 100644 (file)
--- a/protocol/tx.go
+++ b/protocol/tx.go
@@ -2,16 +2,13 @@ package protocol
 
 import (
        log "github.com/sirupsen/logrus"
-       "github.com/vapor/errors"
+
        "github.com/vapor/protocol/bc"
        "github.com/vapor/protocol/bc/types"
        "github.com/vapor/protocol/state"
        "github.com/vapor/protocol/validation"
 )
 
-// ErrBadTx is returned for transactions failing validation
-var ErrBadTx = errors.New("invalid transaction")
-
 // GetTransactionStatus return the transaction status of give block
 func (c *Chain) GetTransactionStatus(hash *bc.Hash) (*bc.TransactionStatus, error) {
        return c.store.GetTransactionStatus(hash)
@@ -26,26 +23,35 @@ func (c *Chain) GetTransactionsUtxo(view *state.UtxoViewpoint, txs []*bc.Tx) err
 // per-transaction validation results and is consulted before
 // performing full validation.
 func (c *Chain) ValidateTx(tx *types.Tx) (bool, error) {
+       if c.hasSeenTx(tx) {
+               return false, nil
+       }
+
+       c.markTransactions(tx)
+       bh := c.BestBlockHeader()
+       return c.validateTx(tx, bh)
+}
+
+// validateTx validates the given transaction without checking duplication.
+func (c *Chain) validateTx(tx *types.Tx, bh *types.BlockHeader) (bool, error) {
        if ok := c.txPool.HaveTransaction(&tx.ID); ok {
                return false, c.txPool.GetErrCache(&tx.ID)
        }
 
-       if ok := c.txPool.IsWithdrawSpent(tx); ok {
-               log.WithFields(log.Fields{"module": "ValidateTx", "error": "Cliam transactions already exist in the trading pool"}).Error("chain error")
-               return false, errors.New("Cliam transactions already exist in the trading pool")
+       if c.txPool.IsDust(tx) {
+               c.txPool.AddErrCache(&tx.ID, ErrDustTx)
+               return false, ErrDustTx
        }
 
-       bh := c.BestBlockHeader()
-       block := types.MapBlock(&types.Block{BlockHeader: *bh})
-       gasStatus, err := validation.ValidateTx(tx.Tx, block)
-       if gasStatus.GasValid == false {
+       gasStatus, err := validation.ValidateTx(tx.Tx, types.MapBlock(&types.Block{BlockHeader: *bh}))
+       if !gasStatus.GasValid {
                c.txPool.AddErrCache(&tx.ID, err)
                return false, err
        }
 
        if err != nil {
-               log.WithFields(log.Fields{"tx_id": tx.Tx.ID.String(), "error": err}).Info("transaction status fail")
+               log.WithFields(log.Fields{"module": logModule, "tx_id": tx.Tx.ID.String(), "error": err}).Info("transaction status fail")
        }
 
-       return c.txPool.ProcessTransaction(tx, err != nil, block.BlockHeader.Height, gasStatus.BTMValue)
+       return c.txPool.ProcessTransaction(tx, err != nil, bh.Height, gasStatus.BTMValue)
 }