Merge pull request #1082 from jshufro/jms/revive

Enable revive linter

Author: 0xfornax

.golangci.yml

@@ -1,6 +1,21 @@
 version: "2"
 linters:
+  enable:
+    - revive
   settings:
+    revive:
+      enable-default-rules: true
+      rules:
+        - name: exported
+          disabled: true
+        - name: var-naming
+          disabled: true
+        - name: package-comments
+          disabled: true
+        - name: unused-parameter
+          disabled: true
+        - name: error-strings
+          disabled: true
     staticcheck:
       checks:
         - all

bindings/dao/protocol/verify.go

@@ -233,9 +233,9 @@ func GetMultiChallengeStatesFast(rp *rocketpool.RocketPool, multicallAddress com
 	rawStates := make([]uint8, count)
 	for i := uint64(0); i < count; i += challengeStateBatchSize {
 		i := i
-		max := i + challengeStateBatchSize
-		if max > count {
-			max = count
+		m := i + challengeStateBatchSize
+		if m > count {
+			m = count
 		}
 
 		// Load details
@@ -245,7 +245,7 @@ func GetMultiChallengeStatesFast(rp *rocketpool.RocketPool, multicallAddress com
 			if err != nil {
 				return err
 			}
-			for j := i; j < max; j++ {
+			for j := i; j < m; j++ {
 				propID := big.NewInt(int64(proposalIds[j]))
 				challengedIndex := big.NewInt(int64(challengedIndices[j]))
 				err = mc.AddCall(rocketDAOProtocolVerifier, &rawStates[j], "getChallengeState", propID, challengedIndex)

bindings/deposit/deposit.go

@@ -73,21 +73,21 @@ func Deposit(rp *rocketpool.RocketPool, opts *bind.TransactOpts) (common.Hash, e
 }
 
 // Estimate the gas of AssignDeposits
-func EstimateAssignDepositsGas(rp *rocketpool.RocketPool, max *big.Int, opts *bind.TransactOpts) (rocketpool.GasInfo, error) {
+func EstimateAssignDepositsGas(rp *rocketpool.RocketPool, m *big.Int, opts *bind.TransactOpts) (rocketpool.GasInfo, error) {
 	rocketDepositPool, err := getRocketDepositPool(rp, nil)
 	if err != nil {
 		return rocketpool.GasInfo{}, err
 	}
-	return rocketDepositPool.GetTransactionGasInfo(opts, "assignDeposits", max)
+	return rocketDepositPool.GetTransactionGasInfo(opts, "assignDeposits", m)
 }
 
 // Assign deposits
-func AssignDeposits(rp *rocketpool.RocketPool, max *big.Int, opts *bind.TransactOpts) (common.Hash, error) {
+func AssignDeposits(rp *rocketpool.RocketPool, m *big.Int, opts *bind.TransactOpts) (common.Hash, error) {
 	rocketDepositPool, err := getRocketDepositPool(rp, nil)
 	if err != nil {
 		return common.Hash{}, err
 	}
-	tx, err := rocketDepositPool.Transact(opts, "assignDeposits", max)
+	tx, err := rocketDepositPool.Transact(opts, "assignDeposits", m)
 	if err != nil {
 		return common.Hash{}, fmt.Errorf("error assigning deposits: %w", err)
 	}

bindings/legacy/v1.0.0/minipool/minipool.go

@@ -544,7 +544,6 @@ func getRocketMinipoolManager(rp *rocketpool.RocketPool, address *common.Address
 	defer rocketMinipoolManagerLock.Unlock()
 	if address == nil {
 		return rp.VersionManager.V1_0_0.GetContract("rocketMinipoolManager", opts)
-	} else {
-		return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketMinipoolManager", *address)
 	}
+	return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketMinipoolManager", *address)
 }

bindings/legacy/v1.0.0/rewards/node.go

@@ -126,7 +126,6 @@ func getRocketClaimNode(rp *rocketpool.RocketPool, address *common.Address, opts
 	defer rocketClaimNodeLock.Unlock()
 	if address == nil {
 		return rp.VersionManager.V1_0_0.GetContract("rocketClaimNode", opts)
-	} else {
-		return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketClaimNode", *address)
 	}
+	return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketClaimNode", *address)
 }

bindings/legacy/v1.0.0/rewards/rewards.go

@@ -151,7 +151,6 @@ func getRocketRewardsPool(rp *rocketpool.RocketPool, address *common.Address, op
 	defer rocketRewardsPoolLock.Unlock()
 	if address == nil {
 		return rp.VersionManager.V1_0_0.GetContract("rocketRewardsPool", opts)
-	} else {
-		return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketRewardsPool", *address)
 	}
+	return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketRewardsPool", *address)
 }

bindings/legacy/v1.0.0/rewards/trusted-node.go

@@ -126,7 +126,6 @@ func getRocketClaimTrustedNode(rp *rocketpool.RocketPool, address *common.Addres
 	defer rocketClaimTrustedNodeLock.Unlock()
 	if address == nil {
 		return rp.VersionManager.V1_0_0.GetContract("rocketClaimTrustedNode", opts)
-	} else {
-		return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketClaimTrustedNode", *address)
 	}
+	return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketClaimTrustedNode", *address)
 }

bindings/legacy/v1.0.0/utils/address_generation.go

@@ -69,7 +69,6 @@ func getRocketMinipoolManager(rp *rocketpool.RocketPool, address *common.Address
 	defer rocketMinipoolManagerLock.Unlock()
 	if address == nil {
 		return rp.VersionManager.V1_0_0.GetContract("rocketMinipoolManager", opts)
-	} else {
-		return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketMinipoolManager", *address)
 	}
+	return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketMinipoolManager", *address)
 }

bindings/legacy/v1.1.0-rc1/rewards/rewards.go

@@ -300,7 +300,6 @@ func getRocketRewardsPool(rp *rocketpool.RocketPool, address *common.Address, op
 	defer rocketRewardsPoolLock.Unlock()
 	if address == nil {
 		return rp.VersionManager.V1_1_0_RC1.GetContract("rocketRewardsPool", opts)
-	} else {
-		return rp.VersionManager.V1_1_0_RC1.GetContractWithAddress("rocketRewardsPool", *address)
 	}
+	return rp.VersionManager.V1_1_0_RC1.GetContractWithAddress("rocketRewardsPool", *address)
 }

bindings/legacy/v1.1.0/minipool/factory.go

@@ -31,7 +31,6 @@ func getRocketMinipoolFactory(rp *rocketpool.RocketPool, address *common.Address
 	defer rocketMinipoolFactoryLock.Unlock()
 	if address == nil {
 		return rp.VersionManager.V1_1_0.GetContract("rocketMinipoolFactory", opts)
-	} else {
-		return rp.VersionManager.V1_1_0.GetContractWithAddress("rocketMinipoolFactory", *address)
 	}
+	return rp.VersionManager.V1_1_0.GetContractWithAddress("rocketMinipoolFactory", *address)
 }