Sync coreth test cleanup v2 #1623

JonathanOppenheimer · 2025-07-09T14:19:15Z

Largely mirrors ava-labs/coreth#950, but this time I don't make mistakes 😎

Do note that this PR goes beyond a simple drop in and replace in from ava-labs/coreth#950 as the testing framework upgrade had implications for tests and functionality not included in coreth (which is why I messed up on first revision)

No breaking changes

Does not require release notes

plugin/evm/vm_test.go

JonathanOppenheimer · 2025-07-09T16:54:37Z

params/extras/config.go

@@ -38,7 +39,13 @@ var (
 	}

 	TestChainConfig = &ChainConfig{
-		AvalancheContext:   AvalancheContext{SnowCtx: utils.TestSnowContext()},
+		AvalancheContext: AvalancheContext{


If someone with additional context could explain why this is necessary here, but was able to be removed in https://github.com/ava-labs/coreth/pull/950/files#r2080300565, that would be appreciated. Did I miss something?

I think the only difference is in Verify() where we pass c.SnowCtx.NetworkUpgrades. I think we should explicitly handle that in tests.

JonathanOppenheimer · 2025-07-09T20:36:24Z

plugin/evm/vm_test.go

 	require.NoError(t, err)
 	require.EqualValues(t, feeConfig, testHighFeeConfig)
-	require.Zero(t, restartedVM.blockChain.CurrentBlock().Number.Cmp(lastChangedAt))
+	require.EqualValues(t, restartedVM.blockChain.CurrentBlock().Number, lastChangedAt)


I do not know why this changed or why it worked before. Again would appreciate another set of eyes and brain!

These two lines are functionally identical except that EqualValues assumes type compatibility?? Really lost as to why this worked.

JonathanOppenheimer · 2025-07-09T20:52:17Z

plugin/evm/vm.go

@@ -149,6 +149,7 @@ var (

 var (
 	errEmptyBlock                    = errors.New("empty block")
+	errUnsupportedFXs                = errors.New("unsupported feature extensions")


subnet-evm does upgrades

ceyonur

I frankly don't know why tests are broken and why it does not show anything. but it looks like something is broken in plugin/evm/ tests

ceyonur · 2025-07-10T09:59:55Z

params/extras/network_upgrades.go

@@ -93,19 +93,19 @@ func (n *NetworkUpgrades) SetDefaults(agoUpgrades upgrade.Config) {
 func (n *NetworkUpgrades) verifyNetworkUpgrades(agoUpgrades upgrade.Config) error {
 	defaults := GetNetworkUpgrades(agoUpgrades)
 	if err := verifyWithDefault(n.SubnetEVMTimestamp, defaults.SubnetEVMTimestamp); err != nil {
-		return fmt.Errorf("SubnetEVM fork block timestamp is invalid: %w", err)
+		return fmt.Errorf("subnetEVM fork block timestamp is invalid: %w", err)


can we revert these?

This is a linting error that error comments should not be capitalized. Still revert?

https://staticcheck.dev/docs/checks#ST1005

I guess the checker doesn't know they're proper nouns?

params/extras/config.go

ceyonur · 2025-07-10T10:11:38Z

params/extras/config.go

@@ -38,7 +39,13 @@ var (
 	}

 	TestChainConfig = &ChainConfig{
-		AvalancheContext:   AvalancheContext{SnowCtx: utils.TestSnowContext()},
+		AvalancheContext: AvalancheContext{


I think the only difference is in Verify() where we pass c.SnowCtx.NetworkUpgrades. I think we should explicitly handle that in tests.

ceyonur · 2025-07-10T10:15:14Z

plugin/evm/vm_test.go

-	testMinGasPrice int64 = 225_000_000_000
-	testKeys        []*ecdsa.PrivateKey
+	testMinGasPrice int64            = 225_000_000_000
+	testKeys                         = secp256k1.TestKeys()[:2]


shouldn't this be secp256k1.TestKeys()[:3]?

No, unlike coreth, only, the highest index of any key used is [1], so only 2 keys are necessary.

ceyonur · 2025-07-10T10:15:47Z

plugin/evm/vm_test.go

 	testEthAddrs    []common.Address // testEthAddrs[i] corresponds to testKeys[i]

 	firstTxAmount = new(big.Int).Mul(big.NewInt(testMinGasPrice), big.NewInt(21000*100))

-	genesisJSON = func(cfg *params.ChainConfig) string {
+	toGenesisJSON = func(cfg *params.ChainConfig) string {


I thought this was genesisJSON in coreth

It is; however there are multiple declarations of genesisJSON as a string, which leads to namespace collisions, so I renamed the function.

ceyonur · 2025-07-10T10:17:06Z

plugin/evm/vm_test.go

+		upgradetest.Granite: params.TestGraniteChainConfig,
+	}
+
+	genesisJSONPreSubnetEVM string


can we initialize them here as genesisJSONPreSubnetEVM = toGenesisJSON(params.TestPreSubnetEVMChainConfig)

I tried this but couldn't figure out a good way to do it - I initialized them in init() after the new ETH addresses were funded. If I did so before funding, I would get test errors about insufficient balances. In the prior rendition, static addresses were used which allowed them to be funded ahead of time.

ceyonur · 2025-07-10T10:23:22Z

utils/snow.go

-
-	return ctx
-}
-
 func NewTestValidatorState() *validatorstest.State {


we should remove this entire file

ceyonur · 2025-07-10T10:24:04Z

utils/snow_test.go

+	"github.com/stretchr/testify/require"
+)
+
+func TestNewTestSnowContext(t *testing.T) {


this test should be in utilstest

ceyonur · 2025-07-10T10:45:59Z

plugin/evm/vm_test.go

+func setupGenesis(
+	t *testing.T,
+	fork upgradetest.Fork,
+	fallbackGenesisJSON string,


I feel like we should not need that and just use genesisJson option in newVM

ceyonur · 2025-07-10T10:50:51Z

plugin/evm/vm_validators_test.go

@@ -99,7 +101,7 @@ func TestValidatorState(t *testing.T) {
 	vm = &VM{}
 	err = vm.Initialize(
 		context.Background(),
-		utils.TestSnowContext(), // this context does not have validators state, making VM to source it from the database
+		utilstest.NewTestSnowContext(t, snowtest.CChainID), // this context does not have validators state, making VM to source it from the database


We should not use CChainID here and generate a new ID. If we're only using a single chain ID (CChainID) then I think we can just skip taking a ChainID in NewTestSnowContext and just define a subnet-evm chain ID and use that.

JonathanOppenheimer added 2 commits July 9, 2025 10:01

signature verification and predicate tests

4aa2c44

verifier and signature request test

bdc58f8

JonathanOppenheimer requested a review from a team as a code owner July 9, 2025 14:19

JonathanOppenheimer added DO NOT MERGE This PR is not meant to be merged in its current state coreth sync labels Jul 9, 2025

JonathanOppenheimer mentioned this pull request Jul 9, 2025

Sync coreth test cleanup #1620

Closed

alarso16 reviewed Jul 9, 2025

View reviewed changes

plugin/evm/vm_test.go Show resolved Hide resolved

JonathanOppenheimer added 2 commits July 9, 2025 12:25

Add snow test context wrapper

3770121

Restore AvalancheContext

4ec36f8

JonathanOppenheimer commented Jul 9, 2025

View reviewed changes

JonathanOppenheimer added 5 commits July 9, 2025 13:20

Move to secp256 keys

600f045

Move to newVM function

f04f0bc

Add default network upgrades for fallbackGenesis

03c29ce

fix config string

555a139

fee regression restart fix?

6eb3075

JonathanOppenheimer commented Jul 9, 2025

View reviewed changes

JonathanOppenheimer added 3 commits July 9, 2025 16:45

final fixes?!

983bad1

need fxs

b1bc8df

unhastyify

8472bb7

JonathanOppenheimer commented Jul 9, 2025

View reviewed changes

JonathanOppenheimer removed the DO NOT MERGE This PR is not meant to be merged in its current state label Jul 9, 2025

JonathanOppenheimer requested a review from ceyonur July 9, 2025 20:57

update latest coreth commit

b57cdf9

ceyonur reviewed Jul 10, 2025

View reviewed changes

Sync coreth test cleanup v2 #1623

Are you sure you want to change the base?

Sync coreth test cleanup v2 #1623

Uh oh!

Conversation

JonathanOppenheimer commented Jul 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

JonathanOppenheimer Jul 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ceyonur left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

JonathanOppenheimer Jul 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

JonathanOppenheimer commented Jul 9, 2025 •

edited

Loading

JonathanOppenheimer Jul 9, 2025 •

edited

Loading

JonathanOppenheimer Jul 10, 2025 •

edited

Loading