Skip to content

Commit 22ef4d1

Browse files
jshufrojshufro
committed
Enable revive linter
1 parent feed08c commit 22ef4d1

92 files changed

Lines changed: 409 additions & 439 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.golangci.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
version: "2"
22
linters:
3+
enable:
4+
- revive
35
settings:
6+
revive:
7+
enable-default-rules: true
8+
rules:
9+
- name: exported
10+
disabled: true
11+
- name: var-naming
12+
disabled: true
13+
- name: package-comments
14+
disabled: true
15+
- name: unused-parameter
16+
disabled: true
17+
- name: error-strings
18+
disabled: true
419
staticcheck:
520
checks:
621
- all

‎bindings/dao/protocol/verify.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,9 @@ func GetMultiChallengeStatesFast(rp *rocketpool.RocketPool, multicallAddress com
233233
rawStates := make([]uint8, count)
234234
for i := uint64(0); i < count; i += challengeStateBatchSize {
235235
i := i
236-
max := i + challengeStateBatchSize
237-
if max > count {
238-
max = count
236+
m := i + challengeStateBatchSize
237+
if m > count {
238+
m = count
239239
}
240240

241241
// Load details
@@ -245,7 +245,7 @@ func GetMultiChallengeStatesFast(rp *rocketpool.RocketPool, multicallAddress com
245245
if err != nil {
246246
return err
247247
}
248-
for j := i; j < max; j++ {
248+
for j := i; j < m; j++ {
249249
propID := big.NewInt(int64(proposalIds[j]))
250250
challengedIndex := big.NewInt(int64(challengedIndices[j]))
251251
err = mc.AddCall(rocketDAOProtocolVerifier, &rawStates[j], "getChallengeState", propID, challengedIndex)

‎bindings/deposit/deposit.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,21 +73,21 @@ func Deposit(rp *rocketpool.RocketPool, opts *bind.TransactOpts) (common.Hash, e
7373
}
7474

7575
// Estimate the gas of AssignDeposits
76-
func EstimateAssignDepositsGas(rp *rocketpool.RocketPool, max *big.Int, opts *bind.TransactOpts) (rocketpool.GasInfo, error) {
76+
func EstimateAssignDepositsGas(rp *rocketpool.RocketPool, m *big.Int, opts *bind.TransactOpts) (rocketpool.GasInfo, error) {
7777
rocketDepositPool, err := getRocketDepositPool(rp, nil)
7878
if err != nil {
7979
return rocketpool.GasInfo{}, err
8080
}
81-
return rocketDepositPool.GetTransactionGasInfo(opts, "assignDeposits", max)
81+
return rocketDepositPool.GetTransactionGasInfo(opts, "assignDeposits", m)
8282
}
8383

8484
// Assign deposits
85-
func AssignDeposits(rp *rocketpool.RocketPool, max *big.Int, opts *bind.TransactOpts) (common.Hash, error) {
85+
func AssignDeposits(rp *rocketpool.RocketPool, m *big.Int, opts *bind.TransactOpts) (common.Hash, error) {
8686
rocketDepositPool, err := getRocketDepositPool(rp, nil)
8787
if err != nil {
8888
return common.Hash{}, err
8989
}
90-
tx, err := rocketDepositPool.Transact(opts, "assignDeposits", max)
90+
tx, err := rocketDepositPool.Transact(opts, "assignDeposits", m)
9191
if err != nil {
9292
return common.Hash{}, fmt.Errorf("error assigning deposits: %w", err)
9393
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,6 @@ func getRocketMinipoolManager(rp *rocketpool.RocketPool, address *common.Address
544544
defer rocketMinipoolManagerLock.Unlock()
545545
if address == nil {
546546
return rp.VersionManager.V1_0_0.GetContract("rocketMinipoolManager", opts)
547-
} else {
548-
return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketMinipoolManager", *address)
549547
}
548+
return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketMinipoolManager", *address)
550549
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ func getRocketClaimNode(rp *rocketpool.RocketPool, address *common.Address, opts
126126
defer rocketClaimNodeLock.Unlock()
127127
if address == nil {
128128
return rp.VersionManager.V1_0_0.GetContract("rocketClaimNode", opts)
129-
} else {
130-
return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketClaimNode", *address)
131129
}
130+
return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketClaimNode", *address)
132131
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ func getRocketRewardsPool(rp *rocketpool.RocketPool, address *common.Address, op
151151
defer rocketRewardsPoolLock.Unlock()
152152
if address == nil {
153153
return rp.VersionManager.V1_0_0.GetContract("rocketRewardsPool", opts)
154-
} else {
155-
return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketRewardsPool", *address)
156154
}
155+
return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketRewardsPool", *address)
157156
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ func getRocketClaimTrustedNode(rp *rocketpool.RocketPool, address *common.Addres
126126
defer rocketClaimTrustedNodeLock.Unlock()
127127
if address == nil {
128128
return rp.VersionManager.V1_0_0.GetContract("rocketClaimTrustedNode", opts)
129-
} else {
130-
return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketClaimTrustedNode", *address)
131129
}
130+
return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketClaimTrustedNode", *address)
132131
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ func getRocketMinipoolManager(rp *rocketpool.RocketPool, address *common.Address
6969
defer rocketMinipoolManagerLock.Unlock()
7070
if address == nil {
7171
return rp.VersionManager.V1_0_0.GetContract("rocketMinipoolManager", opts)
72-
} else {
73-
return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketMinipoolManager", *address)
7472
}
73+
return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketMinipoolManager", *address)
7574
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,6 @@ func getRocketRewardsPool(rp *rocketpool.RocketPool, address *common.Address, op
300300
defer rocketRewardsPoolLock.Unlock()
301301
if address == nil {
302302
return rp.VersionManager.V1_1_0_RC1.GetContract("rocketRewardsPool", opts)
303-
} else {
304-
return rp.VersionManager.V1_1_0_RC1.GetContractWithAddress("rocketRewardsPool", *address)
305303
}
304+
return rp.VersionManager.V1_1_0_RC1.GetContractWithAddress("rocketRewardsPool", *address)
306305
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ func getRocketMinipoolFactory(rp *rocketpool.RocketPool, address *common.Address
3131
defer rocketMinipoolFactoryLock.Unlock()
3232
if address == nil {
3333
return rp.VersionManager.V1_1_0.GetContract("rocketMinipoolFactory", opts)
34-
} else {
35-
return rp.VersionManager.V1_1_0.GetContractWithAddress("rocketMinipoolFactory", *address)
3634
}
35+
return rp.VersionManager.V1_1_0.GetContractWithAddress("rocketMinipoolFactory", *address)
3736
}

0 commit comments

Comments
 (0)