validation should handle the int/uint type convert

diff --git a/blockchain/reactor.go b/blockchain/reactor.go
index bf62ea6..26a83f0 100644 (file)
--- a/blockchain/reactor.go
+++ b/blockchain/reactor.go
@@ -353,7 +353,7 @@ func (bcR *BlockchainReactor) Receive(chID byte, src *p2p.Peer, msgBytes []byte)
                if err != nil {
                        return
                }
-               bcR.txPool.AddTransaction(tx, block.BlockHeader.Height, uint64(gas))
+               bcR.txPool.AddTransaction(tx, block.BlockHeader.Height, gas)
                go bcR.BroadcastTransaction(tx)
        default:
                bcR.Logger.Error(cmn.Fmt("Unknown message type %v", reflect.TypeOf(msg)))

diff --git a/protocol/validation/validation.go b/protocol/validation/validation.go
index 2db6627..b6efc6c 100644 (file)
--- a/protocol/validation/validation.go
+++ b/protocol/validation/validation.go
@@ -535,7 +535,7 @@ func ValidateBlock(b, prev *bc.Block) error {
                if err != nil {
                        return errors.Wrapf(err, "validity of transaction %d of %d", i, len(b.Transactions))
                }
-               coinbaseValue += uint64(txBTMValue)
+               coinbaseValue += txBTMValue
        }
 
        // check the coinbase output entry value
@@ -579,7 +579,7 @@ func validateBlockAgainstPrev(b, prev *bc.Block) error {
 }
 
 // ValidateTx validates a transaction.
-func ValidateTx(tx *bc.Tx, block *bc.Block) (int64, error) {
+func ValidateTx(tx *bc.Tx, block *bc.Block) (uint64, error) {
        if tx.TxHeader.SerializedSize > maxTxSize {
                return 0, errWrongTransactionSize
        }
@@ -596,5 +596,5 @@ func ValidateTx(tx *bc.Tx, block *bc.Block) (int64, error) {
        }
 
        err := checkValid(vs, tx.TxHeader)
-       return vs.gas.BTMValue, err
+       return uint64(vs.gas.BTMValue), err
 }