[NOD-1568] Add staticcheck checks (#1150)

This commit is contained in:
Ori Newman 2020-11-25 01:43:51 -08:00 committed by GitHub
parent 3bad9ec1eb
commit 5b2fae0457
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 10 deletions

View File

@ -26,7 +26,7 @@ func (f *FlowContext) OnNewBlock(block *externalapi.DomainBlock) error {
for _, newBlock := range newBlocks {
blocklogger.LogBlock(block)
f.Domain().MiningManager().HandleNewBlockTransactions(newBlock.Transactions)
_ = f.Domain().MiningManager().HandleNewBlockTransactions(newBlock.Transactions)
if f.onBlockAddedToDAGHandler != nil {
err := f.onBlockAddedToDAGHandler(newBlock)

View File

@ -26,7 +26,7 @@ RUN golint -set_exit_status ./...
# RUN aligncheck ./...
# RUN structcheck -e ./...
# RUN varcheck -e ./...
RUN staticcheck -checks SA4006 ./...
RUN staticcheck -checks "SA4006,SA4008,SA4009,SA4010,SA5003,SA1004,SA1014,SA1021,SA1023,SA1024,SA1025,SA1026,SA1027,SA1028,SA2000,SA2001,SA2003,SA4000,SA4001,SA4003,SA4004,SA4011,SA4012,SA4013,SA4014,SA4015,SA4016,SA4017,SA4018,SA4019,SA4020,SA4021,SA4022,SA4023,SA5000,SA5002,SA5004,SA5005,SA5007,SA5008,SA5009,SA5010,SA5011,SA5012,SA6001,SA6002,SA9001,SA9002,SA9003,SA9004,SA9005,SA9006,ST1019" ./...
RUN GOOS=linux go build -a -installsuffix cgo -o kaspad .
# Remove the line below and uncomment the line after it for testing with coverage

View File

@ -26,7 +26,7 @@ func (d *dbTransaction) Commit() error {
}
func (d *dbTransaction) RollbackUnlessClosed() error {
return d.RollbackUnlessClosed()
return d.transaction.RollbackUnlessClosed()
}
func newDBTransaction(transaction database.Transaction) model.DBTransaction {

View File

@ -48,7 +48,7 @@ func (csm *consensusStateManager) verifyUTXO(block *externalapi.DomainBlock, blo
log.Tracef("Coinbase transaction validation passed for block %s", blockHash)
log.Tracef("Validating transactions against past UTXO for block %s", blockHash)
err = csm.validateBlockTransactionsAgainstPastUTXO(block, blockHash, pastUTXODiff, err)
err = csm.validateBlockTransactionsAgainstPastUTXO(block, blockHash, pastUTXODiff)
if err != nil {
return err
}
@ -58,7 +58,7 @@ func (csm *consensusStateManager) verifyUTXO(block *externalapi.DomainBlock, blo
}
func (csm *consensusStateManager) validateBlockTransactionsAgainstPastUTXO(block *externalapi.DomainBlock,
blockHash *externalapi.DomainHash, pastUTXODiff *model.UTXODiff, err error) error {
blockHash *externalapi.DomainHash, pastUTXODiff *model.UTXODiff) error {
log.Tracef("validateBlockTransactionsAgainstPastUTXO start for block %s", blockHash)
defer log.Tracef("validateBlockTransactionsAgainstPastUTXO end for block %s", blockHash)

View File

@ -858,7 +858,7 @@ func (mp *mempool) Transactions() []*consensusexternalapi.DomainTransaction {
// from the mempool and the orphan pool, and it also removes
// from the mempool transactions that double spend a
// transaction that is already in the DAG
func (mp *mempool) HandleNewBlockTransactions(txs []*consensusexternalapi.DomainTransaction) {
func (mp *mempool) HandleNewBlockTransactions(txs []*consensusexternalapi.DomainTransaction) []*consensusexternalapi.DomainTransaction {
// Protect concurrent access.
mp.mtx.Lock()
defer mp.mtx.Unlock()
@ -886,6 +886,8 @@ func (mp *mempool) HandleNewBlockTransactions(txs []*consensusexternalapi.Domain
acceptedTxs = append(acceptedTxs, acceptedOrphan.DomainTransaction)
}
}
return acceptedTxs
}
func (mp *mempool) RemoveTransactions(txs []*consensusexternalapi.DomainTransaction) {

View File

@ -10,7 +10,7 @@ import (
type MiningManager interface {
GetBlockTemplate(coinbaseData *consensusexternalapi.DomainCoinbaseData) (*consensusexternalapi.DomainBlock, error)
GetTransaction(transactionID *consensusexternalapi.DomainTransactionID) (*consensusexternalapi.DomainTransaction, bool)
HandleNewBlockTransactions(txs []*consensusexternalapi.DomainTransaction)
HandleNewBlockTransactions(txs []*consensusexternalapi.DomainTransaction) []*consensusexternalapi.DomainTransaction
ValidateAndInsertTransaction(transaction *consensusexternalapi.DomainTransaction, allowOrphan bool) error
}
@ -25,8 +25,8 @@ func (mm *miningManager) GetBlockTemplate(coinbaseData *consensusexternalapi.Dom
}
// HandleNewBlock handles the transactions for a new block that was just added to the DAG
func (mm *miningManager) HandleNewBlockTransactions(txs []*consensusexternalapi.DomainTransaction) {
mm.mempool.HandleNewBlockTransactions(txs)
func (mm *miningManager) HandleNewBlockTransactions(txs []*consensusexternalapi.DomainTransaction) []*consensusexternalapi.DomainTransaction {
return mm.mempool.HandleNewBlockTransactions(txs)
}
// ValidateAndInsertTransaction validates the given transaction, and

View File

@ -7,7 +7,7 @@ import (
// Mempool maintains a set of known transactions that
// are intended to be mined into new blocks
type Mempool interface {
HandleNewBlockTransactions(txs []*consensusexternalapi.DomainTransaction)
HandleNewBlockTransactions(txs []*consensusexternalapi.DomainTransaction) []*consensusexternalapi.DomainTransaction
Transactions() []*consensusexternalapi.DomainTransaction
ValidateAndInsertTransaction(transaction *consensusexternalapi.DomainTransaction, allowOrphan bool) error
RemoveTransactions(txs []*consensusexternalapi.DomainTransaction)