resolve conflicts after rebase

piplabs · Oct 1, 2024 · 7259670 · 7259670
1 parent 3d9f342
commit 7259670
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/client/x/evmengine/keeper/abci_internal_test.go b/client/x/evmengine/keeper/abci_internal_test.go
@@ -452,17 +452,17 @@ func TestKeeper_PostFinalize(t *testing.T) {
 			}
 
 			var err error
-			tt.mockEngine.EngineClient, err = ethclient.NewEngineMock()
-			require.NoError(t, err)
 
 			cmtAPI := newMockCometAPI(t, nil)
 			// set the header and proposer so we have the correct next proposer
 			header := cmtproto.Header{Height: 1, AppHash: tutil.RandomHash().Bytes()}
 			header.ProposerAddress = cmtAPI.validatorSet.Validators[0].Address
 			nxtAddr, err := k1util.PubKeyToAddress(cmtAPI.validatorSet.Validators[1].PubKey)
 			require.NoError(t, err)
-			ctx, storeService := setupCtxStore(t, &header)
+			ctx, storeKey, storeService := setupCtxStore(t, &header)
 			ctx = ctx.WithExecMode(sdk.ExecModeFinalize)
+			tt.mockEngine.EngineClient, err = ethclient.NewEngineMock(storeKey)
+			require.NoError(t, err)
 
 			k, err := NewKeeper(cdc, storeService, &tt.mockEngine, &tt.mockClient, txConfig, ak, esk, uk)
 			require.NoError(t, err)