Merge pull request #1081 from jshufro/jms/moreci

Add more linters

Author: 0xfornax

.golangci.yml

@@ -1,8 +1,5 @@
 version: "2"
 linters:
-  default: none 
-  enable:
-    - staticcheck
   settings:
     staticcheck:
       checks:
@@ -18,6 +15,10 @@ linters:
         - -ST1020
         - -ST1021
         - -ST1022
+    errcheck:
+      exclude-functions:
+        - (*os.File).Close
+
 
 formatters:
   enable:

bindings/dao/protocol/dao.go

@@ -248,7 +248,10 @@ func GetMultiChallengeStatesFast(rp *rocketpool.RocketPool, multicallAddress com
 			for j := i; j < max; j++ {
 				propID := big.NewInt(int64(proposalIds[j]))
 				challengedIndex := big.NewInt(int64(challengedIndices[j]))
-				mc.AddCall(rocketDAOProtocolVerifier, &rawStates[j], "getChallengeState", propID, challengedIndex)
+				err = mc.AddCall(rocketDAOProtocolVerifier, &rawStates[j], "getChallengeState", propID, challengedIndex)
+				if err != nil {
+					return fmt.Errorf("error adding challenge state call for proposal %d / index %d: %w", proposalIds[j], challengedIndices[j], err)
+				}
 			}
 			_, err = mc.FlexibleCall(true, opts)
 			if err != nil {

bindings/dao/protocol/verify.go

@@ -3,7 +3,6 @@ package minipool
 import (
 	"fmt"
 	"strings"
-	"sync"
 
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
@@ -77,12 +76,3 @@ func createMinipoolContractFromAbi(rp *rocketpool.RocketPool, address common.Add
 		Client:   rp.Client,
 	}, nil
 }
-
-// Get a minipool contract
-var rocketMinipoolLock sync.Mutex
-
-func getMinipoolContract(rp *rocketpool.RocketPool, minipoolAddress common.Address, opts *bind.CallOpts) (*rocketpool.Contract, error) {
-	rocketMinipoolLock.Lock()
-	defer rocketMinipoolLock.Unlock()
-	return rp.MakeContract("rocketMinipool", minipoolAddress, opts)
-}

bindings/minipool/minipool-constructor.go

@@ -575,7 +575,7 @@ func (mp *minipool_v2) GetPrestakeEvent(intervalSize *big.Int, opts *bind.CallOp
 
 	// Decode the event
 	prestakeEvent := new(MinipoolPrestakeEvent)
-	mp.Contract.Contract.UnpackLog(prestakeEvent, "MinipoolPrestaked", log)
+	err = mp.Contract.Contract.UnpackLog(prestakeEvent, "MinipoolPrestaked", log)
 	if err != nil {
 		return PrestakeData{}, fmt.Errorf("Error unpacking prestake data: %w", err)
 	}

bindings/minipool/minipool-contract-v2.go

@@ -616,7 +616,7 @@ func (mp *minipool_v3) GetPrestakeEvent(intervalSize *big.Int, opts *bind.CallOp
 
 	// Decode the event
 	prestakeEvent := new(MinipoolPrestakeEvent)
-	mp.Contract.Contract.UnpackLog(prestakeEvent, "MinipoolPrestaked", log)
+	err = mp.Contract.Contract.UnpackLog(prestakeEvent, "MinipoolPrestaked", log)
 	if err != nil {
 		return PrestakeData{}, fmt.Errorf("Error unpacking prestake data: %w", err)
 	}

bindings/minipool/minipool-contract-v3.go

@@ -69,8 +69,14 @@ func GetNodeInfoSnapshotFast(rp *rocketpool.RocketPool, blockNumber uint32, mult
 			for j := i; j < max; j++ {
 				nodeAddress := nodeAddresses[j]
 				votingInfos[j].NodeAddress = nodeAddress
-				mc.AddCall(rocketNetworkVoting, &votingInfos[j].VotingPower, "getVotingPower", nodeAddress, blockNumber)
-				mc.AddCall(rocketNetworkVoting, &votingInfos[j].Delegate, "getDelegate", nodeAddress, blockNumber)
+				err = mc.AddCall(rocketNetworkVoting, &votingInfos[j].VotingPower, "getVotingPower", nodeAddress, blockNumber)
+				if err != nil {
+					return fmt.Errorf("error adding voting power call for node %s: %w", nodeAddress.Hex(), err)
+				}
+				err = mc.AddCall(rocketNetworkVoting, &votingInfos[j].Delegate, "getDelegate", nodeAddress, blockNumber)
+				if err != nil {
+					return fmt.Errorf("error adding delegate call for node %s: %w", nodeAddress.Hex(), err)
+				}
 			}
 			_, err = mc.FlexibleCall(true, opts)
 			if err != nil {

bindings/network/voting.go

@@ -185,7 +185,10 @@ func GetNodeAddressesFast(rp *rocketpool.RocketPool, multicallAddress common.Add
 				return err
 			}
 			for j := i; j < max; j++ {
-				mc.AddCall(rocketNodeManager, &addresses[j], "getNodeAt", big.NewInt(int64(j)))
+				err = mc.AddCall(rocketNodeManager, &addresses[j], "getNodeAt", big.NewInt(int64(j)))
+				if err != nil {
+					return fmt.Errorf("error adding node at call for index %d: %w", j, err)
+				}
 			}
 			_, err = mc.FlexibleCall(true, opts)
 			if err != nil {

bindings/node/node.go

@@ -155,25 +155,6 @@ func (c *Contract) estimateGasLimit(opts *bind.TransactOpts, input []byte) (uint
 
 }
 
-// Wait for a transaction to be mined and get a tx receipt
-func (c *Contract) getTransactionReceipt(tx *types.Transaction) (*types.Receipt, error) {
-
-	// Wait for transaction to be mined
-	txReceipt, err := bind.WaitMined(context.Background(), c.Client, tx)
-	if err != nil {
-		return nil, err
-	}
-
-	// Check transaction status
-	if txReceipt.Status == 0 {
-		return txReceipt, errors.New("Transaction failed with status 0")
-	}
-
-	// Return
-	return txReceipt, nil
-
-}
-
 // Get contract events from a transaction
 // eventPrototype must be an event struct type
 // Returns a slice of untyped values; assert returned events to event struct type

bindings/rocketpool/contract.go

@@ -194,10 +194,16 @@ func NewNetworkContracts(rp *rocketpool.RocketPool, multicallerAddress common.Ad
 	// Add the address and ABI getters to multicall
 	for i, wrapper := range wrappers {
 		// Add the address getter
-		contracts.Multicaller.AddCall(contracts.RocketStorage, &wrappers[i].address, "getAddress", [32]byte(crypto.Keccak256Hash([]byte("contract.address"), []byte(wrapper.name))))
+		err := contracts.Multicaller.AddCall(contracts.RocketStorage, &wrappers[i].address, "getAddress", [32]byte(crypto.Keccak256Hash([]byte("contract.address"), []byte(wrapper.name))))
+		if err != nil {
+			return nil, fmt.Errorf("error adding address getter for %s: %w", wrapper.name, err)
+		}
 
 		// Add the ABI getter
-		contracts.Multicaller.AddCall(contracts.RocketStorage, &wrappers[i].abiEncoded, "getString", [32]byte(crypto.Keccak256Hash([]byte("contract.abi"), []byte(wrapper.name))))
+		err = contracts.Multicaller.AddCall(contracts.RocketStorage, &wrappers[i].abiEncoded, "getString", [32]byte(crypto.Keccak256Hash([]byte("contract.abi"), []byte(wrapper.name))))
+		if err != nil {
+			return nil, fmt.Errorf("error adding ABI getter for %s: %w", wrapper.name, err)
+		}
 	}
 
 	// Run the multi-getter