Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

golangci-lint #10577

Merged
merged 1 commit into from
Sep 22, 2023
+651 −624
Merged

golangci-lint #10577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/chains/evm/config/toml/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,8 @@ func (c *Chain) SetFrom(f *Chain) {
c.GasEstimator.setFrom(&f.GasEstimator)

if ks := f.KeySpecific; ks != nil {
for _, v := range ks {
for i := range ks {
v := ks[i]
if i := slices.IndexFunc(c.KeySpecific, func(k KeySpecific) bool { return k.Key == v.Key }); i == -1 {
c.KeySpecific = append(c.KeySpecific, v)
} else {
Expand Down
41 changes: 26 additions & 15 deletions core/chains/evm/txmgr/confirmer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1399,7 +1399,8 @@ func TestEthConfirmer_FindTxsRequiringRebroadcast(t *testing.T) {
etx1 := cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, nonce, fromAddress)
nonce++
attempt1_1 := etx1.TxAttempts[0]
dbAttempt := txmgr.DbEthTxAttemptFromEthTxAttempt(&attempt1_1)
var dbAttempt txmgr.DbEthTxAttempt
krehermann marked this conversation as resolved.
Show resolved Hide resolved
dbAttempt.FromTxAttempt(&attempt1_1)
require.NoError(t, db.Get(&dbAttempt, `UPDATE evm.tx_attempts SET broadcast_before_block_num=$1 WHERE id=$2 RETURNING *`, tooNew, attempt1_1.ID))
attempt1_2 := newBroadcastLegacyEthTxAttempt(t, etx1.ID)
attempt1_2.BroadcastBeforeBlockNum = &onTheMoney
Expand All @@ -1416,7 +1417,8 @@ func TestEthConfirmer_FindTxsRequiringRebroadcast(t *testing.T) {
etx2 := cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, nonce, fromAddress)
nonce++
attempt2_1 := etx2.TxAttempts[0]
dbAttempt = txmgr.DbEthTxAttemptFromEthTxAttempt(&attempt2_1)
dbAttempt = txmgr.DbEthTxAttempt{}
dbAttempt.FromTxAttempt(&attempt2_1)
require.NoError(t, db.Get(&dbAttempt, `UPDATE evm.tx_attempts SET broadcast_before_block_num=$1 WHERE id=$2 RETURNING *`, tooNew, attempt2_1.ID))

t.Run("returns nothing when the transaction has attempts that are too new", func(t *testing.T) {
Expand Down Expand Up @@ -1463,13 +1465,15 @@ func TestEthConfirmer_FindTxsRequiringRebroadcast(t *testing.T) {
etx3 := cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, nonce, fromAddress)
nonce++
attempt3_1 := etx3.TxAttempts[0]
dbAttempt = txmgr.DbEthTxAttemptFromEthTxAttempt(&attempt3_1)
dbAttempt = txmgr.DbEthTxAttempt{}
dbAttempt.FromTxAttempt(&attempt3_1)
require.NoError(t, db.Get(&dbAttempt, `UPDATE evm.tx_attempts SET broadcast_before_block_num=$1 WHERE id=$2 RETURNING *`, oldEnough, attempt3_1.ID))

// NOTE: It should ignore qualifying eth_txes from a different address
etxOther := cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, 0, otherAddress)
attemptOther1 := etxOther.TxAttempts[0]
dbAttempt = txmgr.DbEthTxAttemptFromEthTxAttempt(&attemptOther1)
dbAttempt = txmgr.DbEthTxAttempt{}
dbAttempt.FromTxAttempt(&attemptOther1)
require.NoError(t, db.Get(&dbAttempt, `UPDATE evm.tx_attempts SET broadcast_before_block_num=$1 WHERE id=$2 RETURNING *`, oldEnough, attemptOther1.ID))

t.Run("returns the transaction if it is unconfirmed with an attempt that is older than gasBumpThreshold blocks", func(t *testing.T) {
Expand Down Expand Up @@ -1519,14 +1523,16 @@ func TestEthConfirmer_FindTxsRequiringRebroadcast(t *testing.T) {
etx4 := cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, nonce, fromAddress)
nonce++
attempt4_1 := etx4.TxAttempts[0]
dbAttempt = txmgr.DbEthTxAttemptFromEthTxAttempt(&attemptOther1)
dbAttempt = txmgr.DbEthTxAttempt{}
dbAttempt.FromTxAttempt(&attempt4_1)
require.NoError(t, db.Get(&dbAttempt, `UPDATE evm.tx_attempts SET broadcast_before_block_num=$1 WHERE id=$2 RETURNING *`, oldEnough, attempt4_1.ID))

t.Run("ignores pending transactions for another key", func(t *testing.T) {
// Re-use etx3 nonce for another key, it should not affect the results for this key
etxOther := cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, (*etx3.Sequence).Int64(), otherAddress)
aOther := etxOther.TxAttempts[0]
dbAttempt = txmgr.DbEthTxAttemptFromEthTxAttempt(&aOther)
dbAttempt = txmgr.DbEthTxAttempt{}
dbAttempt.FromTxAttempt(&aOther)
require.NoError(t, db.Get(&dbAttempt, `UPDATE evm.tx_attempts SET broadcast_before_block_num=$1 WHERE id=$2 RETURNING *`, oldEnough, aOther.ID))

etxs, err := ec.FindTxsRequiringRebroadcast(testutils.Context(t), lggr, evmFromAddress, currentHead, gasBumpThreshold, 6, 0, &cltest.FixtureChainID)
Expand Down Expand Up @@ -1659,7 +1665,8 @@ func TestEthConfirmer_RebroadcastWhereNecessary_WithConnectivityCheck(t *testing

etx := cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, nonce, fromAddress, originalBroadcastAt)
attempt1 := etx.TxAttempts[0]
dbAttempt := txmgr.DbEthTxAttemptFromEthTxAttempt(&attempt1)
var dbAttempt txmgr.DbEthTxAttempt
dbAttempt.FromTxAttempt(&attempt1)
require.NoError(t, db.Get(&dbAttempt, `UPDATE evm.tx_attempts SET broadcast_before_block_num=$1 WHERE id=$2 RETURNING *`, oldEnough, attempt1.ID))

// Send transaction and assume success.
Expand Down Expand Up @@ -1703,7 +1710,8 @@ func TestEthConfirmer_RebroadcastWhereNecessary_WithConnectivityCheck(t *testing

etx := cltest.MustInsertUnconfirmedEthTxWithBroadcastDynamicFeeAttempt(t, txStore, nonce, fromAddress, originalBroadcastAt)
attempt1 := etx.TxAttempts[0]
dbAttempt := txmgr.DbEthTxAttemptFromEthTxAttempt(&attempt1)
var dbAttempt txmgr.DbEthTxAttempt
dbAttempt.FromTxAttempt(&attempt1)
require.NoError(t, db.Get(&dbAttempt, `UPDATE evm.tx_attempts SET broadcast_before_block_num=$1 WHERE id=$2 RETURNING *`, oldEnough, attempt1.ID))

// Send transaction and assume success.
Expand Down Expand Up @@ -1974,7 +1982,7 @@ func TestEthConfirmer_RebroadcastWhereNecessary(t *testing.T) {
require.Equal(t, txmgrtypes.TxAttemptBroadcast, etx.TxAttempts[3].State)
})

// Mark original tx as confirmed so we won't pick it up any more
// Mark original tx as confirmed, so we won't pick it up anymore
pgtest.MustExec(t, db, `UPDATE evm.txes SET state = 'confirmed'`)

etx2 := cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, nonce, fromAddress)
Expand Down Expand Up @@ -2083,7 +2091,7 @@ func TestEthConfirmer_RebroadcastWhereNecessary(t *testing.T) {
assert.Equal(t, txmgrtypes.TxAttemptBroadcast, etx2.TxAttempts[2].State)
})

// Original tx is confirmed so we won't pick it up any more
// Original tx is confirmed, so we won't pick it up anymore
etx3 := cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, nonce, fromAddress)
nonce++
attempt3_1 := etx3.TxAttempts[0]
Expand Down Expand Up @@ -2214,7 +2222,7 @@ func TestEthConfirmer_RebroadcastWhereNecessary(t *testing.T) {

ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *types.Transaction) bool {
return evmtypes.Nonce(tx.Nonce()) == *etx3.Sequence && gasPrice.Cmp(tx.GasPrice()) == 0
}), fromAddress).Return(clienttypes.Successful, errors.New("already known")).Once() // we already submitted at this price, now its time to bump and submit again but since we simply resubmitted rather than increasing gas price, geth already knows about this tx
}), fromAddress).Return(clienttypes.Successful, errors.New("already known")).Once() // we already submitted at this price, now it's time to bump and submit again but since we simply resubmitted rather than increasing gas price, geth already knows about this tx

// Do the thing
require.NoError(t, ec2.RebroadcastWhereNecessary(testutils.Context(t), currentHead))
Expand Down Expand Up @@ -2245,7 +2253,7 @@ func TestEthConfirmer_RebroadcastWhereNecessary(t *testing.T) {

ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *types.Transaction) bool {
return evmtypes.Nonce(tx.Nonce()) == *etx3.Sequence && gasPrice.Cmp(tx.GasPrice()) == 0
}), fromAddress).Return(clienttypes.Successful, errors.New("already known")).Once() // we already submitted at this price, now its time to bump and submit again but since we simply resubmitted rather than increasing gas price, geth already knows about this tx
}), fromAddress).Return(clienttypes.Successful, errors.New("already known")).Once() // we already submitted at this price, now it's time to bump and submit again but since we simply resubmitted rather than increasing gas price, geth already knows about this tx

// Do the thing
require.NoError(t, ec2.RebroadcastWhereNecessary(testutils.Context(t), currentHead))
Expand Down Expand Up @@ -2430,7 +2438,8 @@ func TestEthConfirmer_RebroadcastWhereNecessary_TerminallyUnderpriced_ThenGoesTh
etx := cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, nonce, fromAddress)
nonce++
legacyAttempt := etx.TxAttempts[0]
dbAttempt := txmgr.DbEthTxAttemptFromEthTxAttempt(&legacyAttempt)
var dbAttempt txmgr.DbEthTxAttempt
dbAttempt.FromTxAttempt(&legacyAttempt)
require.NoError(t, db.Get(&dbAttempt, `UPDATE evm.tx_attempts SET broadcast_before_block_num=$1 WHERE id=$2 RETURNING *`, oldEnough, legacyAttempt.ID))

// Fail a few times with terminally underpriced
Expand Down Expand Up @@ -2462,7 +2471,8 @@ func TestEthConfirmer_RebroadcastWhereNecessary_TerminallyUnderpriced_ThenGoesTh
etx := cltest.MustInsertUnconfirmedEthTxWithBroadcastDynamicFeeAttempt(t, txStore, nonce, fromAddress)
nonce++
dxFeeAttempt := etx.TxAttempts[0]
dbAttempt := txmgr.DbEthTxAttemptFromEthTxAttempt(&dxFeeAttempt)
var dbAttempt txmgr.DbEthTxAttempt
dbAttempt.FromTxAttempt(&dxFeeAttempt)
require.NoError(t, db.Get(&dbAttempt, `UPDATE evm.tx_attempts SET broadcast_before_block_num=$1 WHERE id=$2 RETURNING *`, oldEnough, dxFeeAttempt.ID))

// Fail a few times with terminally underpriced
Expand Down Expand Up @@ -2513,7 +2523,8 @@ func TestEthConfirmer_RebroadcastWhereNecessary_WhenOutOfEth(t *testing.T) {
etx := cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, nonce, fromAddress)
nonce++
attempt1_1 := etx.TxAttempts[0]
dbAttempt := txmgr.DbEthTxAttemptFromEthTxAttempt(&attempt1_1)
var dbAttempt txmgr.DbEthTxAttempt
dbAttempt.FromTxAttempt(&attempt1_1)
require.NoError(t, db.Get(&dbAttempt, `UPDATE evm.tx_attempts SET broadcast_before_block_num=$1 WHERE id=$2 RETURNING *`, oldEnough, attempt1_1.ID))
var attempt1_2 txmgr.TxAttempt

Expand Down
Loading
Loading