Fixed broken tests after merge

core/chains/evm/txmgr/stuck_tx_detector_test.go

@@ -36,17 +36,13 @@
 	t.Parallel()
 
 	db := pgtest.NewSqlxDB(t)
-	config := newTestChainScopedConfig(t)
 	txStore := cltest.NewTestTxStore(t, db)
-	ethKeyStore := cltest.NewKeyStore(t, db, config.Database()).Eth()
+	ethKeyStore := cltest.NewKeyStore(t, db).Eth()
 	_, fromAddress := cltest.MustInsertRandomKey(t, ethKeyStore)
 
-	estimator := gasmocks.NewEvmEstimator(t)
-	newEst := func(logger.Logger) gas.EvmEstimator { return estimator }
 	lggr := logger.Test(t)
-	ge := config.EVM().GasEstimator()
-	feeEstimator := gas.NewWrappedEvmEstimator(lggr, newEst, ge.EIP1559DynamicFees(), nil, ge)
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
+	feeEstimator := gasmocks.NewEvmFeeEstimator(t)
 	autoPurgeCfg := testAutoPurgeConfig{
 		autoPurgeStuckTxs: false,
 	}
@@ -63,17 +59,14 @@
 	t.Parallel()
 
 	db := pgtest.NewSqlxDB(t)
-	config := newTestChainScopedConfig(t)
+	_, config := newTestChainScopedConfig(t)
 	txStore := cltest.NewTestTxStore(t, db)
-	ethKeyStore := cltest.NewKeyStore(t, db, config.Database()).Eth()
+	ethKeyStore := cltest.NewKeyStore(t, db).Eth()
 	ctx := testutils.Context(t)
 
-	estimator := gasmocks.NewEvmEstimator(t)
-	newEst := func(logger.Logger) gas.EvmEstimator { return estimator }
 	lggr := logger.Test(t)
-	ge := config.EVM().GasEstimator()
-	feeEstimator := gas.NewWrappedEvmEstimator(lggr, newEst, ge.EIP1559DynamicFees(), nil, ge)
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
+	feeEstimator := gasmocks.NewEvmFeeEstimator(t)
 	stuckTxDetector := txmgr.NewStuckTxDetector(lggr, testutils.FixtureChainID, "", config.EVM().Transactions().AutoPurge(), feeEstimator, txStore, ethClient)
 
 	t.Run("returns empty list if no unconfimed transactions found", func(t *testing.T) {
@@ -120,19 +113,16 @@
 	t.Parallel()
 
 	db := pgtest.NewSqlxDB(t)
-	config := newTestChainScopedConfig(t)
 	txStore := cltest.NewTestTxStore(t, db)
-	ethKeyStore := cltest.NewKeyStore(t, db, config.Database()).Eth()
+	ethKeyStore := cltest.NewKeyStore(t, db).Eth()
 	ctx := testutils.Context(t)
 
-	estimator := gasmocks.NewEvmEstimator(t)
-	newEst := func(logger.Logger) gas.EvmEstimator { return estimator }
 	lggr := logger.Test(t)
-	ge := config.EVM().GasEstimator()
-	feeEstimator := gas.NewWrappedEvmEstimator(lggr, newEst, ge.EIP1559DynamicFees(), nil, ge)
+	feeEstimator := gasmocks.NewEvmFeeEstimator(t)
 	// Return 10 gwei as market gas price
 	marketGasPrice := tenGwei
-	estimator.On("GetLegacyGas", mock.Anything, []byte{}, uint64(0), mock.Anything).Return(marketGasPrice, uint64(0), nil)
+	fee := gas.EvmFee{Legacy: marketGasPrice}
+	feeEstimator.On("GetFee", mock.Anything, []byte{}, uint64(0), mock.Anything).Return(fee, uint64(0), nil)
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
 	autoPurgeThreshold := uint32(5)
 	autoPurgeMinAttempts := uint32(3)
@@ -222,16 +212,12 @@
 	t.Parallel()
 
 	db := pgtest.NewSqlxDB(t)
-	config := newTestChainScopedConfig(t)
 	txStore := cltest.NewTestTxStore(t, db)
-	ethKeyStore := cltest.NewKeyStore(t, db, config.Database()).Eth()
+	ethKeyStore := cltest.NewKeyStore(t, db).Eth()
 	ctx := testutils.Context(t)
 
-	estimator := gasmocks.NewEvmEstimator(t)
-	newEst := func(logger.Logger) gas.EvmEstimator { return estimator }
 	lggr := logger.Test(t)
-	ge := config.EVM().GasEstimator()
-	feeEstimator := gas.NewWrappedEvmEstimator(lggr, newEst, ge.EIP1559DynamicFees(), nil, ge)
+	feeEstimator := gasmocks.NewEvmFeeEstimator(t)
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
 	autoPurgeCfg := testAutoPurgeConfig{
 		autoPurgeStuckTxs: true,
@@ -288,16 +274,12 @@
 	t.Parallel()
 
 	db := pgtest.NewSqlxDB(t)
-	config := newTestChainScopedConfig(t)
 	txStore := cltest.NewTestTxStore(t, db)
-	ethKeyStore := cltest.NewKeyStore(t, db, config.Database()).Eth()
+	ethKeyStore := cltest.NewKeyStore(t, db).Eth()
 	ctx := testutils.Context(t)
 
-	estimator := gasmocks.NewEvmEstimator(t)
-	newEst := func(logger.Logger) gas.EvmEstimator { return estimator }
 	lggr := logger.Test(t)
-	ge := config.EVM().GasEstimator()
-	feeEstimator := gas.NewWrappedEvmEstimator(lggr, newEst, ge.EIP1559DynamicFees(), nil, ge)
+	feeEstimator := gasmocks.NewEvmFeeEstimator(t)
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
 	blockNum := int64(100)
 
@@ -313,7 +295,7 @@
 		attempts2 := tx2.TxAttempts[0]
 
 		testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
 			res.Write([]byte(fmt.Sprintf(`{"errcode": 0,"errmsg": "","data": {"%s": 1, "%s": 0}}`, attempts1.Hash, attempts2.Hash)))
 		}))
 		defer func() { testServer.Close() }()
 		testUrl, err := url.Parse(testServer.URL)