From 85e2480e9fec47b0cd7c2955b0ff9fe0e238583e Mon Sep 17 00:00:00 2001 From: Yahtoo Ma Date: Tue, 28 Aug 2018 14:53:15 +0800 Subject: [PATCH] Del core ValidateBlock --- protocol/validation/block.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/protocol/validation/block.go b/protocol/validation/block.go index e25e50df..fb102439 100644 --- a/protocol/validation/block.go +++ b/protocol/validation/block.go @@ -78,22 +78,22 @@ func ValidateBlock(b *bc.Block, parent *state.BlockNode) error { return err } - blockGasSum := uint64(0) - coinbaseAmount := consensus.BlockSubsidy(b.BlockHeader.Height) + //blockGasSum := uint64(0) + //coinbaseAmount := consensus.BlockSubsidy(b.BlockHeader.Height) b.TransactionStatus = bc.NewTransactionStatus() - for i, tx := range b.Transactions { - gasStatus, err := ValidateTx(tx, b) - if !gasStatus.GasValid { - return errors.Wrapf(err, "validate of transaction %d of %d", i, len(b.Transactions)) - } + //for i, tx := range b.Transactions { + //gasStatus, err := ValidateTx(tx, b) + //if !gasStatus.GasValid { + // return errors.Wrapf(err, "validate of transaction %d of %d", i, len(b.Transactions)) + //} - b.TransactionStatus.SetStatus(i, err != nil) - coinbaseAmount += gasStatus.BTMValue - if blockGasSum += uint64(gasStatus.GasUsed); blockGasSum > consensus.MaxBlockGas { - return errOverBlockLimit - } - } + //b.TransactionStatus.SetStatus(i, err != nil) + //coinbaseAmount += gasStatus.BTMValue + //if blockGasSum += uint64(gasStatus.GasUsed); blockGasSum > consensus.MaxBlockGas { + // return errOverBlockLimit + //} + //} //if err := checkCoinbaseAmount(b, coinbaseAmount); err != nil { // return err -- 2.11.0