Skip to content

Commit

Permalink
ci fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
darioush committed Sep 26, 2024
1 parent 5117243 commit ab93225
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 41 deletions.
4 changes: 4 additions & 0 deletions params/precompile_upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@ func (c *ChainConfigExtra) GetActivatingPrecompileConfigs(address common.Address
// Assumes given timestamp is the last accepted block timestamp.
// This ensures that as long as the node has not accepted a block with a different rule set it will allow a
// new upgrade to be applied as long as it activates after the last accepted block.
//
//nolint:unused
func (c *ChainConfigExtra) checkPrecompilesCompatible(precompileUpgrades []PrecompileUpgrade, time uint64) *ConfigCompatError {
for _, module := range modules.RegisteredModules() {
if err := c.checkPrecompileCompatible(module.Address, precompileUpgrades, time); err != nil {
Expand All @@ -184,6 +186,8 @@ func (c *ChainConfigExtra) checkPrecompilesCompatible(precompileUpgrades []Preco
// and [precompileUpgrades] at [headTimestamp].
// Returns an error if upgrades already activated at [headTimestamp] are missing from [precompileUpgrades].
// Upgrades that have already gone into effect cannot be modified or absent from [precompileUpgrades].
//
//nolint:unused
func (c *ChainConfigExtra) checkPrecompileCompatible(address common.Address, precompileUpgrades []PrecompileUpgrade, time uint64) *ConfigCompatError {
// All active upgrades (from nil to [lastTimestamp]) must match.
activeUpgrades := c.GetActivatingPrecompileConfigs(address, nil, time, c.PrecompileUpgrades)
Expand Down
1 change: 1 addition & 0 deletions scripts/tests.e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ git checkout -B "test-${AVALANCHE_VERSION}" "${AVALANCHE_VERSION}"

echo "updating coreth dependency to point to ${CORETH_PATH}"
go mod edit -replace "github.com/ava-labs/coreth=${CORETH_PATH}"
go mod edit -replace "github.com/ethereum/go-ethereum=github.com/ava-labs/[email protected]"
go mod tidy

echo "building avalanchego"
Expand Down
41 changes: 0 additions & 41 deletions tests/state_test_util_ext.go

This file was deleted.

0 comments on commit ab93225

Please sign in to comment.