Skip to content

Sync coreth test cleanup v2 #1623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 30 commits into from
Jul 14, 2025
Merged

Sync coreth test cleanup v2 #1623

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
4aa2c44
signature verification and predicate tests
JonathanOppenheimer Jul 9, 2025
bdc58f8
verifier and signature request test
JonathanOppenheimer Jul 9, 2025
3770121
Add snow test context wrapper
JonathanOppenheimer Jul 9, 2025
4ec36f8
Restore AvalancheContext
JonathanOppenheimer Jul 9, 2025
600f045
Move to secp256 keys
JonathanOppenheimer Jul 9, 2025
f04f0bc
Move to newVM function
JonathanOppenheimer Jul 9, 2025
03c29ce
Add default network upgrades for fallbackGenesis
JonathanOppenheimer Jul 9, 2025
555a139
fix config string
JonathanOppenheimer Jul 9, 2025
6eb3075
fee regression restart fix?
JonathanOppenheimer Jul 9, 2025
983bad1
final fixes?!
JonathanOppenheimer Jul 9, 2025
b1bc8df
need fxs
JonathanOppenheimer Jul 9, 2025
8472bb7
unhastyify
JonathanOppenheimer Jul 9, 2025
b57cdf9
update latest coreth commit
JonathanOppenheimer Jul 9, 2025
d470e5c
Cey suggestions
JonathanOppenheimer Jul 10, 2025
c1416bf
revert dif coreth version
JonathanOppenheimer Jul 10, 2025
158528c
merge commit
JonathanOppenheimer Jul 10, 2025
84e6fb0
fix nil from merge error
JonathanOppenheimer Jul 10, 2025
974ea11
add correct syncing tag
JonathanOppenheimer Jul 10, 2025
2115237
recapitalize error strings
JonathanOppenheimer Jul 11, 2025
a074e61
Add Cey fixes
JonathanOppenheimer Jul 14, 2025
6f196d3
Fix setupGenesis in-line with what Cey asked
JonathanOppenheimer Jul 14, 2025
ff1cb1e
remove snow ctx from TestChainConfig
ceyonur Jul 14, 2025
1a1a6bb
Set context correctly
JonathanOppenheimer Jul 14, 2025
1e00e2e
Merge branch 'master' into sync-coreth-test-cleanup-v2
JonathanOppenheimer Jul 14, 2025
320cd6c
cleanup setupGenesis
ceyonur Jul 14, 2025
f944790
Merge branch 'sync-coreth-test-cleanup-v2' into sync-coreth-test-clea…
ceyonur Jul 14, 2025
73337e7
change back to latest
JonathanOppenheimer Jul 14, 2025
d5f6765
Sync coreth test cleanup v2 rev (#1625)
JonathanOppenheimer Jul 14, 2025
0384b2c
move fork chain declarations:
JonathanOppenheimer Jul 14, 2025
b6d8e0d
remove extra comment
JonathanOppenheimer Jul 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions params/extras/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"math/big"

"github.com/ava-labs/avalanchego/snow"
"github.com/ava-labs/avalanchego/snow/snowtest"
"github.com/ava-labs/avalanchego/upgrade"
"github.com/ava-labs/avalanchego/utils/constants"
"github.com/ava-labs/libevm/common"
Expand Down Expand Up @@ -38,7 +39,13 @@ var (
}

TestChainConfig = &ChainConfig{
AvalancheContext: AvalancheContext{SnowCtx: utils.TestSnowContext()},
AvalancheContext: AvalancheContext{
SnowCtx: &snow.Context{
NetworkID: constants.UnitTestID,
ChainID: snowtest.CChainID,
NetworkUpgrades: upgrade.GetConfig(constants.UnitTestID),
},
},
FeeConfig: DefaultFeeConfig,
NetworkUpgrades: GetNetworkUpgrades(upgrade.GetConfig(constants.UnitTestID)), // This can be changed to correct network (local, test) via VM.
GenesisPrecompiles: Precompiles{},
Expand Down Expand Up @@ -351,7 +358,7 @@ func (c *ChainConfig) Verify() error {
}

// Verify the network upgrades are internally consistent given the existing chainConfig.
if err := c.verifyNetworkUpgrades(c.SnowCtx.NetworkUpgrades); err != nil {
if err := c.NetworkUpgrades.verifyNetworkUpgrades(c.SnowCtx.NetworkUpgrades); err != nil {
return fmt.Errorf("invalid network upgrades: %w", err)
}

Expand Down
10 changes: 5 additions & 5 deletions params/extras/network_upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
if err := verifyWithDefault(n.DurangoTimestamp, defaults.DurangoTimestamp); err != nil {
return fmt.Errorf("Durango fork block timestamp is invalid: %w", err)
return fmt.Errorf("durango fork block timestamp is invalid: %w", err)
}
if err := verifyWithDefault(n.EtnaTimestamp, defaults.EtnaTimestamp); err != nil {
return fmt.Errorf("Etna fork block timestamp is invalid: %w", err)
return fmt.Errorf("etna fork block timestamp is invalid: %w", err)
}
if err := verifyWithDefault(n.FortunaTimestamp, defaults.FortunaTimestamp); err != nil {
return fmt.Errorf("Fortuna fork block timestamp is invalid: %w", err)
return fmt.Errorf("fortuna fork block timestamp is invalid: %w", err)
}
if err := verifyWithDefault(n.GraniteTimestamp, defaults.GraniteTimestamp); err != nil {
return fmt.Errorf("Granite fork block timestamp is invalid: %w", err)
return fmt.Errorf("granite fork block timestamp is invalid: %w", err)
}
return nil
}
Expand Down
8 changes: 5 additions & 3 deletions plugin/evm/tx_gossip_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"github.com/ava-labs/avalanchego/snow"
"github.com/ava-labs/avalanchego/snow/engine/common"
"github.com/ava-labs/avalanchego/snow/engine/enginetest"
"github.com/ava-labs/avalanchego/snow/snowtest"
"github.com/ava-labs/avalanchego/snow/validators"
agoUtils "github.com/ava-labs/avalanchego/utils"
"github.com/ava-labs/avalanchego/utils/logging"
Expand All @@ -30,12 +31,13 @@ import (

"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/subnet-evm/utils"
"github.com/ava-labs/subnet-evm/utils/utilstest"
)

func TestEthTxGossip(t *testing.T) {
require := require.New(t)
ctx := context.Background()
snowCtx := utils.TestSnowContext()
snowCtx := utilstest.NewTestSnowContext(t, snowtest.CChainID)
validatorState := utils.NewTestValidatorState()
snowCtx.ValidatorState = validatorState

Expand Down Expand Up @@ -153,7 +155,7 @@ func TestEthTxGossip(t *testing.T) {
func TestEthTxPushGossipOutbound(t *testing.T) {
require := require.New(t)
ctx := context.Background()
snowCtx := utils.TestSnowContext()
snowCtx := utilstest.NewTestSnowContext(t, snowtest.CChainID)
sender := &enginetest.SenderStub{
SentAppGossip: make(chan []byte, 1),
}
Expand Down Expand Up @@ -208,7 +210,7 @@ func TestEthTxPushGossipOutbound(t *testing.T) {
func TestEthTxPushGossipInbound(t *testing.T) {
require := require.New(t)
ctx := context.Background()
snowCtx := utils.TestSnowContext()
snowCtx := utilstest.NewTestSnowContext(t, snowtest.CChainID)

sender := &enginetest.Sender{}
vm := &VM{
Expand Down
8 changes: 5 additions & 3 deletions plugin/evm/vm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
"github.com/ava-labs/avalanchego/snow/consensus/snowman"
commonEng "github.com/ava-labs/avalanchego/snow/engine/common"
"github.com/ava-labs/avalanchego/snow/engine/enginetest"
"github.com/ava-labs/avalanchego/snow/snowtest"
"github.com/ava-labs/avalanchego/upgrade"
"github.com/ava-labs/avalanchego/vms/components/chain"

Expand All @@ -57,6 +58,7 @@ import (
"github.com/ava-labs/subnet-evm/precompile/contracts/txallowlist"
"github.com/ava-labs/subnet-evm/rpc"
"github.com/ava-labs/subnet-evm/utils"
"github.com/ava-labs/subnet-evm/utils/utilstest"

avagoconstants "github.com/ava-labs/avalanchego/utils/constants"
)
Expand Down Expand Up @@ -124,7 +126,7 @@ func setupGenesis(
if len(genesisJSON) == 0 {
genesisJSON = genesisJSONLatest
}
ctx := utils.TestSnowContext()
ctx := utilstest.NewTestSnowContext(t, snowtest.CChainID)

baseDB := memdb.New()

Expand Down Expand Up @@ -388,7 +390,7 @@ func TestBuildEthTxBlock(t *testing.T) {

if err := restartedVM.Initialize(
context.Background(),
utils.TestSnowContext(),
utilstest.NewTestSnowContext(t, snowtest.CChainID),
dbManager,
[]byte(genesisJSONSubnetEVM),
[]byte(""),
Expand Down Expand Up @@ -2981,7 +2983,7 @@ func TestParentBeaconRootBlock(t *testing.T) {

func TestStandaloneDB(t *testing.T) {
vm := &VM{}
ctx := utils.TestSnowContext()
ctx := utilstest.NewTestSnowContext(t, snowtest.CChainID)
baseDB := memdb.New()
atomicMemory := atomic.NewMemory(prefixdb.New([]byte{0}, baseDB))
ctx.SharedMemory = atomicMemory.NewSharedMemory(ctx.ChainID)
Expand Down
5 changes: 3 additions & 2 deletions plugin/evm/vm_validators_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ import (
"github.com/ava-labs/avalanchego/snow"
commonEng "github.com/ava-labs/avalanchego/snow/engine/common"
"github.com/ava-labs/avalanchego/snow/engine/enginetest"
"github.com/ava-labs/avalanchego/snow/snowtest"
avagovalidators "github.com/ava-labs/avalanchego/snow/validators"
"github.com/ava-labs/avalanchego/snow/validators/validatorstest"
"github.com/ava-labs/subnet-evm/core"
"github.com/ava-labs/subnet-evm/plugin/evm/validators"
"github.com/ava-labs/subnet-evm/utils"
"github.com/ava-labs/subnet-evm/utils/utilstest"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down Expand Up @@ -99,7 +100,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
dbManager,
genesisBytes,
[]byte(""),
Expand Down
7 changes: 4 additions & 3 deletions precompile/contracts/warp/contract_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"testing"

"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/snow/snowtest"
agoUtils "github.com/ava-labs/avalanchego/utils"
"github.com/ava-labs/avalanchego/utils/set"
avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp"
Expand All @@ -19,14 +20,14 @@ import (
"github.com/ava-labs/subnet-evm/precompile/contract"
"github.com/ava-labs/subnet-evm/precompile/testutils"
"github.com/ava-labs/subnet-evm/predicate"
"github.com/ava-labs/subnet-evm/utils"
"github.com/ava-labs/subnet-evm/utils/utilstest"
"github.com/stretchr/testify/require"
)

func TestGetBlockchainID(t *testing.T) {
callerAddr := common.HexToAddress("0x0123")

defaultSnowCtx := utils.TestSnowContext()
defaultSnowCtx := utilstest.NewTestSnowContext(t, snowtest.CChainID)
blockchainID := defaultSnowCtx.ChainID

tests := map[string]testutils.PrecompileTest{
Expand Down Expand Up @@ -84,7 +85,7 @@ func TestGetBlockchainID(t *testing.T) {
func TestSendWarpMessage(t *testing.T) {
callerAddr := common.HexToAddress("0x0123")

defaultSnowCtx := utils.TestSnowContext()
defaultSnowCtx := utilstest.NewTestSnowContext(t, snowtest.CChainID)
blockchainID := defaultSnowCtx.ChainID
sendWarpMessagePayload := agoUtils.RandomBytes(100)

Expand Down
Loading