Merge pull request #312 from mocachain/refactor/slim-testutil

refactor(testutil): drop dead helpers; use cosmos/evm's fork-neutral test fns

Author: puneet2019

CHANGELOG.md

@@ -57,6 +57,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 - (docs) [#66](https://github.com/mocachain/moca/pull/66) Update RELEASE_GUIDE.md security notes for GITHUB_TOKEN
 - (rpc) [#309](https://github.com/mocachain/moca/pull/309) Replace the in-tree JSON-RPC server (`rpc/`, ~16k LOC forked from ethermint/evmos) with `github.com/cosmos/evm/rpc`: the backend, namespaces, and the newHeads/logs/pendingTx subscriptions now come from cosmos/evm (fed by an in-process CometBFT event stream and an ante `PendingTxListener` hook on `*Moca`), and the indexer moves to cosmos/evm's `server/types.TxResult`. Gains `safe`/`finalized` block tags, `eth_getBlockReceipts`, `eth_getHeaderBy*`, `eth_createAccessList`, `debug_traceBlock`, EIP-4844/7702 tx fields, and upstream tracking. New operator knobs (app.toml + flags): `json-rpc.ws-origins`, `json-rpc.enable-profiling`, `json-rpc.allow-insecure-unlock`, `json-rpc.batch-request-limit`, `json-rpc.batch-response-max-size`; the checked-in asset configs also pin `evm.evm-chain-id` per network. A thin `server/websockets.go` shim is retained so `newHeads` emits the canonical CometBFT block hash (completes `cosmos/evm#725`); removable once that lands upstream and we bump.
 - (indexer) [#310](https://github.com/mocachain/moca/pull/310) Use `github.com/cosmos/evm/indexer` directly instead of the in-tree functional copy (same `TxResult` proto and key encoding — no reindex needed). The KV-indexer test is retained under `tests/integration/indexer` (mirroring upstream's layout), retargeted at the upstream package, since cosmos/evm publishes no test files in its module — keeping the indexer path covered against moca's forked SDK in CI. The kind e2e now runs validators with `enable-indexer = true` and asserts the tx hash actually lands in `evmindexer.db` (receipt lookups silently fall back to CometBFT `tx_search`, so a green suite alone cannot prove the indexer works).
+- (testutil) [#312](https://github.com/mocachain/moca/pull/312) Slim `testutil/`: delete dead helpers (`contract.go`, `integration.go`, `statedb.go`, `CreateEthTx`) and use `cosmos/evm/testutil`'s fork-neutral `NoOpNextFn`/`NewHeader` instead of the in-tree copies. Fork-coupled helpers (key/codec/signing, `testutil/network`, funding) are deliberately kept in-tree — swapping them would change which `ethsecp256k1` type tests exercise.
 
 ### State Machine Breaking
 

app/ante/cosmos/authz_test.go

@@ -16,11 +16,11 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
+	evmtestutil "github.com/cosmos/evm/testutil"
 	evmtypes "github.com/cosmos/evm/x/vm/types"
 	"github.com/ethereum/go-ethereum/common"
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
 	cosmosante "github.com/mocachain/moca/v2/app/ante/cosmos"
-	testutil "github.com/mocachain/moca/v2/testutil"
 	utiltx "github.com/mocachain/moca/v2/testutil/tx"
 )
 
@@ -293,7 +293,7 @@ func TestAuthzLimiterDecorator(t *testing.T) {
 			tx, err := createUnsignedTx(tc.msgs...)
 			require.NoError(t, err)
 
-			_, err = decorator.AnteHandle(ctx, tx, false, testutil.NextFn)
+			_, err = decorator.AnteHandle(ctx, tx, false, evmtestutil.NoOpNextFn)
 			if tc.expectedErr != nil {
 				require.Error(t, err)
 				require.ErrorIs(t, err, tc.expectedErr)

app/ante/cosmos/fees_test.go

@@ -1,14 +1,14 @@
 package cosmos_test
 
 import (
-	sdkmath "cosmossdk.io/math"
 	"fmt"
 	"time"
 
-	"cosmossdk.io/math"
+	sdkmath "cosmossdk.io/math"
 	"cosmossdk.io/x/feegrant"
 	sdktestutil "github.com/cosmos/cosmos-sdk/testutil/testdata"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	evmtestutil "github.com/cosmos/evm/testutil"
 	cosmosante "github.com/mocachain/moca/v2/app/ante/cosmos"
 	"github.com/mocachain/moca/v2/testutil"
 	testutiltx "github.com/mocachain/moca/v2/testutil/tx"
@@ -23,17 +23,17 @@ func (suite *AnteTestSuite) TestDeductFeeDecorator() {
 		// fee granter
 		fgAddr, _   = testutiltx.NewAccAddressAndKey()
 		initBalance = sdkmath.NewInt(1e18)
-		lowGasPrice = math.NewInt(1)
+		lowGasPrice = sdkmath.NewInt(1)
 		zero        = sdkmath.ZeroInt()
 	)
 
 	// Testcase definitions
 	testcases := []struct {
 		name        string
-		balance     math.Int
-		rewards     math.Int
+		balance     sdkmath.Int
+		rewards     sdkmath.Int
 		gas         uint64
-		gasPrice    *math.Int
+		gasPrice    *sdkmath.Int
 		feeGranter  sdk.AccAddress
 		checkTx     bool
 		simulate    bool
@@ -292,7 +292,7 @@ func (suite *AnteTestSuite) TestDeductFeeDecorator() {
 			suite.Require().NoError(err, "failed to create transaction")
 
 			// run the ante handler
-			_, err = dfd.AnteHandle(suite.ctx, tx, tc.simulate, testutil.NextFn)
+			_, err = dfd.AnteHandle(suite.ctx, tx, tc.simulate, evmtestutil.NoOpNextFn)
 
 			// assert the resulting error
 			if tc.expPass {

app/ante/cosmos/min_price_test.go

@@ -4,8 +4,8 @@ import (
 	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
+	evmtestutil "github.com/cosmos/evm/testutil"
 	cosmosante "github.com/mocachain/moca/v2/app/ante/cosmos"
-	"github.com/mocachain/moca/v2/testutil"
 	testutiltx "github.com/mocachain/moca/v2/testutil/tx"
 	"github.com/mocachain/moca/v2/utils"
 )
@@ -126,7 +126,7 @@ func (suite *AnteTestSuite) TestMinGasPriceDecorator() {
 				// s.SetupTest(et.isCheckTx)
 				ctx := suite.ctx.WithIsReCheckTx(et.isCheckTx)
 				dec := cosmosante.NewMinGasPriceDecorator(suite.app.FeeMarketKeeper, suite.app.EvmKeeper)
-				_, err := dec.AnteHandle(ctx, tc.malleate(), et.simulate, testutil.NextFn)
+				_, err := dec.AnteHandle(ctx, tc.malleate(), et.simulate, evmtestutil.NoOpNextFn)
 
 				if tc.expPass || (et.simulate && tc.allowPassOnSimulate) {
 					suite.Require().NoError(err, tc.name)