Minor. (#17630)

Author: pavel-raykov

core/chains/evm/txmgr/broadcaster_test.go

@@ -775,9 +775,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_ResumingFromCrash(t *testing.T) {
 	t.Run("cannot be more than one transaction per address in an unfinished state", func(t *testing.T) {
 		db := testutils.NewSqlxDB(t)
 		txStore := cltest.NewTestTxStore(t, db)
-
-		ethKeyStore := cltest.NewKeyStore(t, db).Eth()
-		_, fromAddress := cltest.RandomKey{Nonce: nextNonce.Int64()}.MustInsertWithState(t, ethKeyStore)
+		fromAddress := testutils.NewAddress()
 
 		firstInProgress := txmgr.Tx{
 			FromAddress:    fromAddress,

core/chains/evm/txmgr/confirmer_test.go

@@ -719,8 +719,7 @@ func TestEthConfirmer_RebroadcastWhereNecessary_WithConnectivityCheck(t *testing
 
 		ctx := t.Context()
 		txStore := cltest.NewTestTxStore(t, db)
-		ethKeyStore := cltest.NewKeyStore(t, db).Eth()
-		_, fromAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
+		fromAddress := testutils.NewAddress()
 
 		estimator := gasmocks.NewEvmEstimator(t)
 		newEst := func(logger.Logger) gas.EvmEstimator { return estimator }
@@ -766,8 +765,7 @@ func TestEthConfirmer_RebroadcastWhereNecessary_WithConnectivityCheck(t *testing
 
 		ctx := t.Context()
 		txStore := cltest.NewTestTxStore(t, db)
-		ethKeyStore := cltest.NewKeyStore(t, db).Eth()
-		_, fromAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
+		fromAddress := testutils.NewAddress()
 
 		estimator := gasmocks.NewEvmEstimator(t)
 		estimator.On("BumpDynamicFee", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(gas.DynamicFee{}, pkgerrors.Wrapf(fees.ErrConnectivity, "transaction..."))
@@ -813,14 +811,12 @@ func TestEthConfirmer_RebroadcastWhereNecessary_MaxFeeScenario(t *testing.T) {
 	ctx := t.Context()
 
 	ethClient := clienttest.NewClientWithDefaultChainID(t)
-	ethKeyStore := cltest.NewKeyStore(t, db).Eth()
 
 	evmcfg := configtest.NewChainScopedConfig(t, func(c *toml.EVMConfig) {
 		c.GasEstimator.PriceMax = assets.GWei(500)
 	})
 
-	_, _ = cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
-	_, fromAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
+	fromAddress := testutils.NewAddress()
 
 	kst := &keystest.FakeChainStore{Addresses: keystest.Addresses{fromAddress}}
 	// Use a mock keystore for this test

core/chains/evm/txmgr/evm_tx_store_benchmark_test.go

@@ -39,8 +39,7 @@ func BenchmarkTxStoreCreateTransaction(b *testing.B) {
 		b.Run(bs.name, func(b *testing.B) {
 			db := testutils.NewSqlxDB(b)
 			txStore := newTxStore(b, db)
-			kst := cltest.NewKeyStore(b, db)
-			_, fromAddress := cltest.MustInsertRandomKey(b, kst.Eth())
+			fromAddress := testutils.NewAddress()
 			gasLimit := uint64(1000)
 			payload := []byte{1, 2, 3}
 			ethClient := clienttest.NewClientWithDefaultChainID(b)
@@ -87,8 +86,7 @@ func BenchmarkTxStoreFindAttemptsRequiringReceiptFetch(b *testing.B) {
 			txStore := NewTestTxStore(b, db)
 			ctx := tests.Context(b)
 			blockNum := int64(100)
-			kst := cltest.NewKeyStore(b, db)
-			_, fromAddress := cltest.MustInsertRandomKey(b, kst.Eth())
+			fromAddress := testutils.NewAddress()
 
 			var nonce = evmtypes.Nonce(0)
 			for i := 0; i < bs.size; i++ {
@@ -132,8 +130,7 @@ func BenchmarkFindTxesByIDs(b *testing.B) {
 			db := testutils.NewSqlxDB(b)
 			txStore := NewTestTxStore(b, db)
 			ctx := tests.Context(b)
-			ethKeyStore := cltest.NewKeyStore(b, db).Eth()
-			_, fromAddress := cltest.MustInsertRandomKeyReturningState(b, ethKeyStore)
+			fromAddress := testutils.NewAddress()
 
 			var etxIDs []int64
 			for i := 0; i < bs.size; i++ {
@@ -159,8 +156,7 @@ func BenchmarkFindConfirmedTxesReceipts(b *testing.B) {
 			db := testutils.NewSqlxDB(b)
 			txStore := NewTestTxStore(b, db)
 			finalizedBlockNum := int64(100)
-			kst := cltest.NewKeyStore(b, db)
-			_, fromAddress := cltest.MustInsertRandomKey(b, kst.Eth())
+			fromAddress := testutils.NewAddress()
 
 			for i := 0; i < bs.size; i++ {
 				mustInsertConfirmedEthTxWithReceipt(b, txStore, fromAddress, int64(i), finalizedBlockNum)