Skip to content

Commit

Permalink
chore: enables the govet shadow check and fixes issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@jkongie
jkongie committed Oct 8, 2024
1 parent f675380 commit 8c46c19
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 51 deletions.
6 changes: 3 additions & 3 deletions .golangci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ linters-settings:
min-len: 5
goimports:
local-prefixes: github.com/smartcontractkit/mcms
# govet:
# enable:
# - shadow
govet:
enable:
- shadow
nlreturn:
block-size: 2
revive:
Expand Down
14 changes: 8 additions & 6 deletions pkg/proposal/mcms/executor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,11 @@ func (e *Executor) CheckQuorum(client bind.ContractBackend, chain ChainIdentifie

recoveredSigners := make([]common.Address, len(e.Proposal.Signatures))
for i, sig := range e.Proposal.Signatures {
recoveredAddr, err := sig.Recover(hash)
if err != nil {
return false, err
recoveredAddr, rerr := sig.Recover(hash)
if rerr != nil {
return false, rerr
}

recoveredSigners[i] = recoveredAddr
}

Expand Down Expand Up @@ -229,10 +230,11 @@ func (e *Executor) ValidateSignatures(clients map[ChainIdentifier]ContractDeploy

recoveredSigners := make([]common.Address, len(e.Proposal.Signatures))
for i, sig := range e.Proposal.Signatures {
recoveredAddr, err := sig.Recover(hash)
if err != nil {
return false, err
recoveredAddr, rerr := sig.Recover(hash)
if rerr != nil {
return false, rerr
}

recoveredSigners[i] = recoveredAddr
}

Expand Down
56 changes: 28 additions & 28 deletions pkg/proposal/mcms/executor_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,12 +300,12 @@ func TestExecutor_ExecuteE2E_SingleChainMultipleSignerSingleTX_Success(t *testin

// Sign the hash
for i := range 3 {
sig, err := crypto.Sign(hash.Bytes(), keys[i])
require.NoError(t, err)
sig, serr := crypto.Sign(hash.Bytes(), keys[i])
require.NoError(t, serr)

// Construct a signature
sigObj, err := NewSignatureFromBytes(sig)
require.NoError(t, err)
sigObj, serr := NewSignatureFromBytes(sig)
require.NoError(t, serr)
proposal.Signatures = append(proposal.Signatures, sigObj)
}

Expand Down Expand Up @@ -392,8 +392,8 @@ func TestExecutor_ExecuteE2E_SingleChainSingleSignerMultipleTX_Success(t *testin

operations := make([]ChainOperation, 4)
for i, role := range []common.Hash{proposerRole, bypasserRole, cancellerRole, executorRole} {
data, err := timelockAbi.Pack("grantRole", role, mcms.Address())
require.NoError(t, err)
data, perr := timelockAbi.Pack("grantRole", role, mcms.Address())
require.NoError(t, perr)
operations[i] = ChainOperation{
ChainIdentifier: TestChain1,
Operation: Operation{
Expand Down Expand Up @@ -466,8 +466,8 @@ func TestExecutor_ExecuteE2E_SingleChainSingleSignerMultipleTX_Success(t *testin
sim.Commit()

// Wait for the transaction to be mined
receipt, err := bind.WaitMined(auths[0].Context, sim, tx)
require.NoError(t, err)
receipt, merr := bind.WaitMined(auths[0].Context, sim, tx)
require.NoError(t, merr)
assert.NotNil(t, receipt)
assert.Equal(t, types.ReceiptStatusSuccessful, receipt.Status)
}
Expand Down Expand Up @@ -530,8 +530,8 @@ func TestExecutor_ExecuteE2E_SingleChainMultipleSignerMultipleTX_Success(t *test

operations := make([]ChainOperation, 4)
for i, role := range []common.Hash{proposerRole, bypasserRole, cancellerRole, executorRole} {
data, err := timelockAbi.Pack("grantRole", role, mcms.Address())
require.NoError(t, err)
data, perr := timelockAbi.Pack("grantRole", role, mcms.Address())
require.NoError(t, perr)
operations[i] = ChainOperation{
ChainIdentifier: TestChain1,
Operation: Operation{
Expand Down Expand Up @@ -571,12 +571,12 @@ func TestExecutor_ExecuteE2E_SingleChainMultipleSignerMultipleTX_Success(t *test

// Sign the hash
for i := range 3 {
sig, err := crypto.Sign(hash.Bytes(), keys[i])
require.NoError(t, err)
sig, serr := crypto.Sign(hash.Bytes(), keys[i])
require.NoError(t, serr)

// Construct a signature
sigObj, err := NewSignatureFromBytes(sig)
require.NoError(t, err)
sigObj, serr := NewSignatureFromBytes(sig)
require.NoError(t, serr)
proposal.Signatures = append(proposal.Signatures, sigObj)
}

Expand Down Expand Up @@ -606,8 +606,8 @@ func TestExecutor_ExecuteE2E_SingleChainMultipleSignerMultipleTX_Success(t *test
sim.Commit()

// Wait for the transaction to be mined
receipt, err := bind.WaitMined(auths[0].Context, sim, tx)
require.NoError(t, err)
receipt, merr := bind.WaitMined(auths[0].Context, sim, tx)
require.NoError(t, merr)
assert.NotNil(t, receipt)
assert.Equal(t, types.ReceiptStatusSuccessful, receipt.Status)
}
Expand Down Expand Up @@ -670,8 +670,8 @@ func TestExecutor_ExecuteE2E_SingleChainMultipleSignerMultipleTX_FailureMissingQ

operations := make([]ChainOperation, 4)
for i, role := range []common.Hash{proposerRole, bypasserRole, cancellerRole, executorRole} {
data, err := timelockAbi.Pack("grantRole", role, mcms.Address())
require.NoError(t, err)
data, perr := timelockAbi.Pack("grantRole", role, mcms.Address())
require.NoError(t, perr)
operations[i] = ChainOperation{
ChainIdentifier: TestChain1,
Operation: Operation{
Expand Down Expand Up @@ -711,12 +711,12 @@ func TestExecutor_ExecuteE2E_SingleChainMultipleSignerMultipleTX_FailureMissingQ

// Sign the hash
for i := range 2 {
sig, err := crypto.Sign(hash.Bytes(), keys[i])
require.NoError(t, err)
sig, serr := crypto.Sign(hash.Bytes(), keys[i])
require.NoError(t, serr)

// Construct a signature
sigObj, err := NewSignatureFromBytes(sig)
require.NoError(t, err)
sigObj, serr := NewSignatureFromBytes(sig)
require.NoError(t, serr)
proposal.Signatures = append(proposal.Signatures, sigObj)
}

Expand Down Expand Up @@ -774,8 +774,8 @@ func TestExecutor_ExecuteE2E_SingleChainMultipleSignerMultipleTX_FailureInvalidS

operations := make([]ChainOperation, 4)
for i, role := range []common.Hash{proposerRole, bypasserRole, cancellerRole, executorRole} {
data, err := timelockAbi.Pack("grantRole", role, mcms.Address())
require.NoError(t, err)
data, perr := timelockAbi.Pack("grantRole", role, mcms.Address())
require.NoError(t, perr)
operations[i] = ChainOperation{
ChainIdentifier: TestChain1,
Operation: Operation{
Expand Down Expand Up @@ -815,12 +815,12 @@ func TestExecutor_ExecuteE2E_SingleChainMultipleSignerMultipleTX_FailureInvalidS

// Sign the hash
for i := range 3 {
sig, err := crypto.Sign(hash.Bytes(), keys[i])
require.NoError(t, err)
sig, serr := crypto.Sign(hash.Bytes(), keys[i])
require.NoError(t, serr)

// Construct a signature
sigObj, err := NewSignatureFromBytes(sig)
require.NoError(t, err)
sigObj, serr := NewSignatureFromBytes(sig)
require.NoError(t, serr)
proposal.Signatures = append(proposal.Signatures, sigObj)
}

Expand Down
28 changes: 14 additions & 14 deletions pkg/proposal/timelock/mcm_with_timelock_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -478,8 +478,8 @@ func TestE2E_ValidScheduleAndExecuteProposalOneTx(t *testing.T) {
// Check all the logs
var operationId common.Hash
for _, log := range receipt.Logs {
event, err := timelock.ParseCallScheduled(*log)
if err == nil {
event, perr := timelock.ParseCallScheduled(*log)
if perr == nil {
operationId = event.Id
}
}
Expand Down Expand Up @@ -649,8 +649,8 @@ func TestE2E_ValidScheduleAndCancelProposalOneTx(t *testing.T) {
// Check all the logs
var operationId common.Hash
for _, log := range receipt.Logs {
event, err := timelock.ParseCallScheduled(*log)
if err == nil {
event, perr := timelock.ParseCallScheduled(*log)
if perr == nil {
operationId = event.Id
}
}
Expand Down Expand Up @@ -872,8 +872,8 @@ func TestE2E_ValidScheduleAndExecuteProposalOneBatchTx(t *testing.T) {

operations := make([]mcms.Operation, 3)
for i, role := range []common.Hash{proposerRole, bypasserRole, cancellerRole} {
data, err := timelockAbi.Pack("grantRole", role, auths[0].From)
require.NoError(t, err)
data, perr := timelockAbi.Pack("grantRole", role, auths[0].From)
require.NoError(t, perr)
operations[i] = mcms.Operation{
To: timelock.Address(),
Value: big.NewInt(0),
Expand Down Expand Up @@ -973,8 +973,8 @@ func TestE2E_ValidScheduleAndExecuteProposalOneBatchTx(t *testing.T) {
// Check all the logs
var operationId common.Hash
for _, log := range receipt.Logs {
event, err := timelock.ParseCallScheduled(*log)
if err == nil {
event, perr := timelock.ParseCallScheduled(*log)
if perr == nil {
operationId = event.Id
}
}
Expand Down Expand Up @@ -1072,8 +1072,8 @@ func TestE2E_ValidScheduleAndCancelProposalOneBatchTx(t *testing.T) {

operations := make([]mcms.Operation, 3)
for i, role := range []common.Hash{proposerRole, bypasserRole, cancellerRole} {
data, err := timelockAbi.Pack("grantRole", role, auths[0].From)
require.NoError(t, err)
data, perr := timelockAbi.Pack("grantRole", role, auths[0].From)
require.NoError(t, perr)
operations[i] = mcms.Operation{
To: timelock.Address(),
Value: big.NewInt(0),
Expand Down Expand Up @@ -1173,8 +1173,8 @@ func TestE2E_ValidScheduleAndCancelProposalOneBatchTx(t *testing.T) {
// Check all the logs
var operationId common.Hash
for _, log := range receipt.Logs {
event, err := timelock.ParseCallScheduled(*log)
if err == nil {
event, perr := timelock.ParseCallScheduled(*log)
if perr == nil {
operationId = event.Id
}
}
Expand Down Expand Up @@ -1284,8 +1284,8 @@ func TestE2E_ValidBypassProposalOneBatchTx(t *testing.T) {

operations := make([]mcms.Operation, 3)
for i, role := range []common.Hash{proposerRole, bypasserRole, cancellerRole} {
data, err := timelockAbi.Pack("grantRole", role, auths[0].From)
require.NoError(t, err)
data, perr := timelockAbi.Pack("grantRole", role, auths[0].From)
require.NoError(t, perr)
operations[i] = mcms.Operation{
To: timelock.Address(),
Value: big.NewInt(0),
Expand Down

0 comments on commit 8c46c19

Please sign in to comment.