Skip to content

Commit 60f19b2

Browse files
authored
Merge branch 'main' into multi_grpc
2 parents c9528b5 + 381a354 commit 60f19b2

37 files changed

+726
-142
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
- [\#810](https://github.com/cosmos/evm/pull/810) Fix integration test suite to resolve lock contention problem from external app injection
1111
- [\#811](https://github.com/cosmos/evm/pull/811) Use sdk's DefaultBondDenom for default evm denom in genesis.
1212
- [\#823](https://github.com/cosmos/evm/pull/823) Remove authz dependency from test suite and EvmApp interface
13+
- [\#829](https://github.com/cosmos/evm/pull/829) Seperate test app interface
1314

1415
### FEATURES
1516

@@ -31,6 +32,7 @@
3132
- [\#800](https://github.com/cosmos/evm/pull/800) Fix denom exponent validation in virtual fee deduct in vm module.
3233
- [\#817](https://github.com/cosmos/evm/pull/817) Align GetCoinbaseAddress to handle empty proposer address in contexts like CheckTx where proposer doesn't exist.
3334
- [\#816](https://github.com/cosmos/evm/pull/816) Avoid nil pointer when RPC requests execute before evmCoinInfo initialization in PreBlock with defaultEvmCoinInfo fallback.
35+
- [\#828](https://github.com/cosmos/evm/pull/828) Validate decimals before conversion to prevent panic when coininfo is missing in historical queries.
3436

3537
## v0.5.0
3638

evmd/tests/integration/ante/ante_test.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,24 @@ package ante
33
import (
44
"testing"
55

6+
evm "github.com/cosmos/evm"
67
"github.com/cosmos/evm/evmd/tests/integration"
78
"github.com/cosmos/evm/tests/integration/ante"
9+
testapp "github.com/cosmos/evm/testutil/app"
810
)
911

1012
func TestAnte_Integration(t *testing.T) {
11-
ante.TestIntegrationAnteHandler(t, integration.CreateEvmd)
13+
create := testapp.ToEvmAppCreator[evm.AnteIntegrationApp](integration.CreateEvmd, "evm.AnteIntegrationApp")
14+
ante.TestIntegrationAnteHandler(t, create)
1215
}
1316

1417
func BenchmarkAnteHandler(b *testing.B) {
18+
create := testapp.ToEvmAppCreator[evm.AnteIntegrationApp](integration.CreateEvmd, "evm.AnteIntegrationApp")
1519
// Run the benchmark with a mock EVM app
16-
ante.RunBenchmarkAnteHandler(b, integration.CreateEvmd)
20+
ante.RunBenchmarkAnteHandler(b, create)
1721
}
1822

1923
func TestValidateHandlerOptions(t *testing.T) {
20-
ante.RunValidateHandlerOptionsTest(t, integration.CreateEvmd)
24+
create := testapp.ToEvmAppCreator[evm.AnteIntegrationApp](integration.CreateEvmd, "evm.AnteIntegrationApp")
25+
ante.RunValidateHandlerOptionsTest(t, create)
2126
}

evmd/tests/integration/ante/evm_unit_ante_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@ package ante
33
import (
44
"testing"
55

6+
evm "github.com/cosmos/evm"
67
"github.com/stretchr/testify/suite"
78

89
"github.com/cosmos/evm/evmd/tests/integration"
910
"github.com/cosmos/evm/tests/integration/ante"
11+
testapp "github.com/cosmos/evm/testutil/app"
1012
)
1113

1214
func TestEvmUnitAnteTestSuite(t *testing.T) {
13-
suite.Run(t, ante.NewEvmUnitAnteTestSuite(integration.CreateEvmd))
15+
create := testapp.ToEvmAppCreator[evm.AnteIntegrationApp](integration.CreateEvmd, "evm.AnteIntegrationApp")
16+
suite.Run(t, ante.NewEvmUnitAnteTestSuite(create))
1417
}

evmd/tests/integration/backend_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@ import (
55

66
"github.com/stretchr/testify/suite"
77

8+
evm "github.com/cosmos/evm"
89
"github.com/cosmos/evm/tests/integration/rpc/backend"
10+
testapp "github.com/cosmos/evm/testutil/app"
911
)
1012

1113
func TestBackend(t *testing.T) {
12-
s := backend.NewTestSuite(CreateEvmd)
14+
create := testapp.ToEvmAppCreator[evm.IntegrationNetworkApp](CreateEvmd, "evm.IntegrationNetworkApp")
15+
s := backend.NewTestSuite(create)
1316
suite.Run(t, s)
1417
}

evmd/tests/integration/eip712_test.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,18 @@ import (
55

66
"github.com/stretchr/testify/suite"
77

8+
evm "github.com/cosmos/evm"
89
"github.com/cosmos/evm/tests/integration/eip712"
10+
testapp "github.com/cosmos/evm/testutil/app"
911
)
1012

1113
func TestEIP712TestSuite(t *testing.T) {
12-
s := eip712.NewTestSuite(CreateEvmd, false)
14+
create := testapp.ToEvmAppCreator[evm.IntegrationNetworkApp](CreateEvmd, "evm.IntegrationNetworkApp")
15+
s := eip712.NewTestSuite(create, false)
1316
suite.Run(t, s)
1417

1518
// Note that we don't test the Legacy EIP-712 Extension, since that case
1619
// is sufficiently covered by the AnteHandler tests.
17-
s = eip712.NewTestSuite(CreateEvmd, true)
20+
s = eip712.NewTestSuite(create, true)
1821
suite.Run(t, s)
1922
}

evmd/tests/integration/eip7702/eip7702_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@ package eip7702
33
import (
44
"testing"
55

6+
evm "github.com/cosmos/evm"
67
"github.com/cosmos/evm/evmd/tests/integration"
78
"github.com/cosmos/evm/tests/integration/eip7702"
9+
testapp "github.com/cosmos/evm/testutil/app"
810
)
911

1012
func TestEIP7702IntegrationTestSuite(t *testing.T) {
11-
eip7702.TestEIP7702IntegrationTestSuite(t, integration.CreateEvmd)
13+
create := testapp.ToEvmAppCreator[evm.IntegrationNetworkApp](integration.CreateEvmd, "evm.IntegrationNetworkApp")
14+
eip7702.TestEIP7702IntegrationTestSuite(t, create)
1215
}

evmd/tests/integration/eips/eips_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@ package eips_test
33
import (
44
"testing"
55

6+
evm "github.com/cosmos/evm"
67
"github.com/cosmos/evm/evmd/tests/integration"
78
"github.com/cosmos/evm/tests/integration/eips"
9+
testapp "github.com/cosmos/evm/testutil/app"
810
//nolint:revive // dot imports are fine for Ginkgo
911
//nolint:revive // dot imports are fine for Ginkgo
1012
)
1113

1214
func TestEIPs(t *testing.T) {
13-
eips.RunTests(t, integration.CreateEvmd)
15+
create := testapp.ToEvmAppCreator[evm.IntegrationNetworkApp](integration.CreateEvmd, "evm.IntegrationNetworkApp")
16+
eips.RunTests(t, create)
1417
}

evmd/tests/integration/ibc_callbacks_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@ import (
55

66
"github.com/stretchr/testify/suite"
77

8+
evm "github.com/cosmos/evm"
89
"github.com/cosmos/evm/tests/integration/x/ibc/callbacks"
10+
testapp "github.com/cosmos/evm/testutil/app"
911
)
1012

1113
func TestIBCCallback(t *testing.T) {
12-
suite.Run(t, callbacks.NewKeeperTestSuite(CreateEvmd))
14+
create := testapp.ToEvmAppCreator[evm.IBCCallbackIntegrationApp](CreateEvmd, "evm.IBCCallbackIntegrationApp")
15+
suite.Run(t, callbacks.NewKeeperTestSuite(create))
1316
}

evmd/tests/integration/ibc_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@ import (
55

66
"github.com/stretchr/testify/suite"
77

8+
evm "github.com/cosmos/evm"
89
"github.com/cosmos/evm/tests/integration/x/ibc"
10+
testapp "github.com/cosmos/evm/testutil/app"
911
)
1012

1113
func TestIBCKeeperTestSuite(t *testing.T) {
12-
s := ibc.NewKeeperTestSuite(CreateEvmd)
14+
create := testapp.ToEvmAppCreator[evm.IBCIntegrationApp](CreateEvmd, "evm.IBCIntegrationApp")
15+
s := ibc.NewKeeperTestSuite(create)
1316
suite.Run(t, s)
1417
}

evmd/tests/integration/indexer_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@ package integration
33
import (
44
"testing"
55

6+
evm "github.com/cosmos/evm"
67
"github.com/cosmos/evm/tests/integration/indexer"
8+
testapp "github.com/cosmos/evm/testutil/app"
79
)
810

911
func TestKVIndexer(t *testing.T) {
10-
indexer.TestKVIndexer(t, CreateEvmd)
12+
create := testapp.ToEvmAppCreator[evm.IntegrationNetworkApp](CreateEvmd, "evm.IntegrationNetworkApp")
13+
indexer.TestKVIndexer(t, create)
1114
}

0 commit comments

Comments
 (0)