lint

cmd/hack/hack.go

@@ -2321,7 +2321,7 @@ func runBlock(ibs *state.IntraBlockState, txnWriter state.StateWriter, blockWrit
 
 	if !vmConfig.ReadOnly {
 		// Finalize the block, applying any consensus engine specific extras (e.g. block rewards)
-		if _, err := engine.FinalizeAndAssemble(chainConfig, header, ibs, block.Transactions(), block.Uncles(), receipts, nil, nil, nil); err != nil {
+		if _, err := engine.FinalizeAndAssemble(chainConfig, header, ibs, block.Transactions(), block.Uncles(), receipts, nil, nil, nil, nil); err != nil {
 			return nil, fmt.Errorf("finalize of block %d failed: %v", block.NumberU64(), err)
 		}
 

cmd/state/commands/opcode_tracer.go

@@ -686,7 +686,7 @@ func runBlock(ibs *state.IntraBlockState, txnWriter state.StateWriter, blockWrit
 
 	if !vmConfig.ReadOnly {
 		// Finalize the block, applying any consensus engine specific extras (e.g. block rewards)
-		if _, err := engine.FinalizeAndAssemble(chainConfig, header, ibs, block.Transactions(), block.Uncles(), receipts, nil, nil, nil); err != nil {
+		if _, err := engine.FinalizeAndAssemble(chainConfig, header, ibs, block.Transactions(), block.Uncles(), receipts, nil, nil, nil, nil); err != nil {
 			return nil, fmt.Errorf("finalize of block %d failed: %v", block.NumberU64(), err)
 		}
 

consensus/aura/aura.go

@@ -262,6 +262,8 @@ func epochTransitionFor2(chain consensus.ChainHeaderReader, e consensus.EpochRea
 	}
 	return EpochTransition{BlockNumber: num, BlockHash: hash, ProofRlp: transitionProof}, true
 }
+
+//nolint
 func epochTransitionFor(chain consensus.ChainHeaderReader, e consensus.EpochReader, parentHash common.Hash) (transition EpochTransition, ok bool) {
 	// slow path: loop back block by block
 	for {
@@ -541,22 +543,26 @@ func (c *AuRa) VerifyFamily(chain consensus.ChainHeaderReader, header *types.Hea
 func (c *AuRa) verifyFamily(chain consensus.ChainHeaderReader, e consensus.EpochReader, header *types.Header, call consensus.Call) error {
 	// TODO: I call it from Initialize - because looks like no much reason to have separated "verifyFamily" call
 
+	//nolint
 	step, err := headerStep(header)
 	if err != nil {
 		return err
 	}
 	parent := chain.GetHeader(header.ParentHash, header.Number.Uint64()-1)
+	//nolint
 	parentStep, err := headerStep(parent)
 	if err != nil {
 		return err
 	}
+	//nolint
 	validators, setNumber, err := c.epochSet(chain, e, header, call)
 	if err != nil {
 		return err
 	}
 	return nil
 
 	// Ensure header is from the step after parent.
+	//nolint
 	if step == parentStep ||
 		(header.Number.Uint64() >= c.cfg.ValidateStepTransition && step <= parentStep) {
 		log.Debug("[engine] Multiple blocks proposed for step", "num", parentStep)
@@ -865,6 +871,9 @@ func (c *AuRa) Finalize(cc *params.ChainConfig, header *types.Header, state *sta
 	// check_and_lock_block -> check_epoch_end_signal END
 
 	finalized, err := buildFinality(c.EpochManager, chain, e, c.cfg.Validators, header, call)
+	if err != nil {
+		return err
+	}
 	epochEndProof, err := isEpochEnd(chain, e, finalized, header)
 	if err != nil {
 		return err

consensus/aura/validators.go

@@ -341,6 +341,8 @@ type ReportQueueItem struct {
 	blockNum uint64
 	data     []byte
 }
+
+//nolint
 type ReportQueue struct {
 	sync.RWMutex
 	list *list.List
@@ -354,7 +356,7 @@ func (q *ReportQueue) push(addr common.Address, blockNum uint64, data []byte) {
 }
 
 // Filters reports of validators that have already been reported or are banned.
-
+//nolint
 func (q *ReportQueue) filter(abi aurainterfaces.ValidatorSetABI, client client, ourAddr, contractAddr common.Address) error {
 	q.Lock()
 	defer q.Unlock()
@@ -384,6 +386,7 @@ func (q *ReportQueue) filter(abi aurainterfaces.ValidatorSetABI, client client,
 }
 
 // Removes reports from the queue if it contains more than `MAX_QUEUED_REPORTS` entries.
+//nolint
 func (q *ReportQueue) truncate() {
 	// The maximum number of reports to keep queued.
 	const MaxQueuedReports = 10
@@ -439,6 +442,7 @@ func NewValidatorSafeContract(contractAddress common.Address, posdaoTransition *
 //
 // Returns a list of contract calls to be pushed onto the new block.
 //func generateEngineTransactions(_first bool, _header *types.Header, _call SystemCall) -> Result<Vec<(Address, Bytes)>, EthcoreError>
+//nolint
 func (s *ValidatorSafeContract) epochSet2(num uint64, chain consensus.ChainHeaderReader, call consensus.Call) (SimpleList, common.Hash, error) {
 	l, ok := s.getList(call)
 	if !ok {
@@ -512,6 +516,7 @@ func (s *ValidatorSafeContract) epochSet(first bool, num uint64, setProof []byte
 }
 
 // check a first proof: fetch the validator set at the given block.
+//nolint
 func checkFirstValidatorSetProof(contract_address common.Address, oldHeader *types.Header, dbItems [][]byte) ([]common.Address, error) {
 	/*
 		fn check_first_proof(