Skip to content

refactor: move core/types to plugin/evm/types #877

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 2 commits into from
Mar 14, 2025
Merged

refactor: move core/types to plugin/evm/types #877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b426196
refactor: move `core/types` to `plugin/evm/types`
ARR4N Mar 14, 2025
495de5b
chore: placate the linter
ARR4N Mar 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
2 changes: 1 addition & 1 deletion consensus/dummy/consensus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"github.com/ava-labs/coreth/consensus"
"github.com/ava-labs/coreth/consensus/misc/eip4844"
"github.com/ava-labs/coreth/core/state"
customtypes "github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/params"
"github.com/ava-labs/coreth/params/extras"
customtypes "github.com/ava-labs/coreth/plugin/evm/types"
"github.com/ava-labs/coreth/utils"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/libevm/core/types"
Expand Down
2 changes: 1 addition & 1 deletion core/blockchain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ import (
"github.com/ava-labs/coreth/consensus/misc/eip4844"
"github.com/ava-labs/coreth/core/state"
"github.com/ava-labs/coreth/core/state/snapshot"
customtypes "github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/internal/version"
"github.com/ava-labs/coreth/params"
customrawdb "github.com/ava-labs/coreth/plugin/evm/rawdb"
customtypes "github.com/ava-labs/coreth/plugin/evm/types"
"github.com/ava-labs/coreth/triedb/hashdb"
"github.com/ava-labs/coreth/triedb/pathdb"
"github.com/ava-labs/libevm/common"
Expand Down
2 changes: 1 addition & 1 deletion core/state/statedb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ package state
import (
"math/big"

"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/plugin/evm/types"
"github.com/ava-labs/coreth/utils"
"github.com/ava-labs/libevm/common"
ethstate "github.com/ava-labs/libevm/core/state"
Expand Down
2 changes: 1 addition & 1 deletion core/state/statedb_multicoin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"

"github.com/ava-labs/coreth/core/state/snapshot"
customtypes "github.com/ava-labs/coreth/core/types"
customtypes "github.com/ava-labs/coreth/plugin/evm/types"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/libevm/core/rawdb"
"github.com/ava-labs/libevm/crypto"
Expand Down
2 changes: 1 addition & 1 deletion core/state_processor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ import (
"github.com/ava-labs/coreth/consensus"
"github.com/ava-labs/coreth/consensus/dummy"
"github.com/ava-labs/coreth/consensus/misc/eip4844"
customtypes "github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/params"
"github.com/ava-labs/coreth/params/extras"
customheader "github.com/ava-labs/coreth/plugin/evm/header"
customtypes "github.com/ava-labs/coreth/plugin/evm/types"
"github.com/ava-labs/coreth/plugin/evm/upgrade/acp176"
"github.com/ava-labs/coreth/plugin/evm/upgrade/ap1"
"github.com/ava-labs/coreth/plugin/evm/upgrade/ap3"
Expand Down
2 changes: 1 addition & 1 deletion eth/filters/filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"math/big"

"github.com/ava-labs/coreth/core/bloombits"
customtypes "github.com/ava-labs/coreth/core/types"
customtypes "github.com/ava-labs/coreth/plugin/evm/types"
"github.com/ava-labs/coreth/rpc"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/libevm/core/types"
Expand Down
2 changes: 1 addition & 1 deletion eth/gasprice/fee_info_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"math/big"

"github.com/ava-labs/coreth/core"
customtypes "github.com/ava-labs/coreth/core/types"
customtypes "github.com/ava-labs/coreth/plugin/evm/types"
"github.com/ava-labs/coreth/rpc"
"github.com/ava-labs/libevm/core/types"
lru "github.com/hashicorp/golang-lru"
Expand Down
2 changes: 1 addition & 1 deletion ethclient/ethclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import (
"math/big"

"github.com/ava-labs/coreth/accounts/abi/bind"
customtypes "github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/interfaces"
customtypes "github.com/ava-labs/coreth/plugin/evm/types"
"github.com/ava-labs/coreth/rpc"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/libevm/common/hexutil"
Expand Down
2 changes: 1 addition & 1 deletion internal/ethapi/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ import (
"github.com/ava-labs/coreth/consensus"
"github.com/ava-labs/coreth/core"
"github.com/ava-labs/coreth/core/state"
customtypes "github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/eth/gasestimator"
"github.com/ava-labs/coreth/params"
customtypes "github.com/ava-labs/coreth/plugin/evm/types"
"github.com/ava-labs/coreth/rpc"
"github.com/ava-labs/libevm/accounts"
"github.com/ava-labs/libevm/accounts/keystore"
Expand Down
2 changes: 1 addition & 1 deletion plugin/evm/block.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ import (
"github.com/ava-labs/libevm/rlp"

"github.com/ava-labs/coreth/core"
customtypes "github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/params"
"github.com/ava-labs/coreth/params/extras"
"github.com/ava-labs/coreth/plugin/evm/atomic"
"github.com/ava-labs/coreth/plugin/evm/header"
customtypes "github.com/ava-labs/coreth/plugin/evm/types"
"github.com/ava-labs/coreth/precompile/precompileconfig"
"github.com/ava-labs/coreth/predicate"
"github.com/ava-labs/libevm/core/rawdb"
Expand Down
2 changes: 1 addition & 1 deletion plugin/evm/block_verification.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
safemath "github.com/ava-labs/avalanchego/utils/math"

"github.com/ava-labs/coreth/constants"
customtypes "github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/params"
"github.com/ava-labs/coreth/plugin/evm/header"
customtypes "github.com/ava-labs/coreth/plugin/evm/types"
"github.com/ava-labs/coreth/plugin/evm/upgrade/ap0"
"github.com/ava-labs/coreth/plugin/evm/upgrade/ap1"
"github.com/ava-labs/coreth/plugin/evm/upgrade/ap5"
Expand Down
2 changes: 1 addition & 1 deletion plugin/evm/header/base_fee_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"testing"

"github.com/ava-labs/avalanchego/vms/components/gas"
customtypes "github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/params/extras"
customtypes "github.com/ava-labs/coreth/plugin/evm/types"
"github.com/ava-labs/coreth/plugin/evm/upgrade/acp176"
"github.com/ava-labs/coreth/plugin/evm/upgrade/ap3"
"github.com/ava-labs/coreth/plugin/evm/upgrade/ap4"
Expand Down
2 changes: 1 addition & 1 deletion plugin/evm/header/block_gas_cost.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"errors"
"math/big"

customtypes "github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/params/extras"
customtypes "github.com/ava-labs/coreth/plugin/evm/types"
"github.com/ava-labs/coreth/plugin/evm/upgrade/ap4"
"github.com/ava-labs/coreth/plugin/evm/upgrade/ap5"
"github.com/ava-labs/libevm/common"
Expand Down
2 changes: 1 addition & 1 deletion plugin/evm/header/block_gas_cost_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"math/big"
"testing"

customtypes "github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/params/extras"
customtypes "github.com/ava-labs/coreth/plugin/evm/types"
"github.com/ava-labs/coreth/plugin/evm/upgrade/ap4"
"github.com/ava-labs/coreth/plugin/evm/upgrade/ap5"
"github.com/ava-labs/coreth/utils"
Expand Down
2 changes: 1 addition & 1 deletion plugin/evm/header/dynamic_fee_state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"fmt"

"github.com/ava-labs/avalanchego/vms/components/gas"
customtypes "github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/params/extras"
customtypes "github.com/ava-labs/coreth/plugin/evm/types"
"github.com/ava-labs/coreth/plugin/evm/upgrade/acp176"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/libevm/core/types"
Expand Down
2 changes: 1 addition & 1 deletion plugin/evm/header/dynamic_fee_windower.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"fmt"
"math/big"

customtypes "github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/params/extras"
customtypes "github.com/ava-labs/coreth/plugin/evm/types"
"github.com/ava-labs/coreth/plugin/evm/upgrade/ap3"
"github.com/ava-labs/coreth/plugin/evm/upgrade/ap4"
"github.com/ava-labs/coreth/plugin/evm/upgrade/ap5"
Expand Down
2 changes: 1 addition & 1 deletion plugin/evm/header/extra_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"testing"

"github.com/ava-labs/avalanchego/vms/components/gas"
customtypes "github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/params/extras"
customtypes "github.com/ava-labs/coreth/plugin/evm/types"
"github.com/ava-labs/coreth/plugin/evm/upgrade/acp176"
"github.com/ava-labs/coreth/plugin/evm/upgrade/ap0"
"github.com/ava-labs/coreth/plugin/evm/upgrade/ap3"
Expand Down
2 changes: 1 addition & 1 deletion plugin/evm/header/gas_limit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"fmt"

"github.com/ava-labs/avalanchego/utils/math"
customtypes "github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/params/extras"
customtypes "github.com/ava-labs/coreth/plugin/evm/types"
"github.com/ava-labs/coreth/plugin/evm/upgrade/ap0"
"github.com/ava-labs/coreth/plugin/evm/upgrade/ap1"
"github.com/ava-labs/coreth/plugin/evm/upgrade/ap5"
Expand Down
2 changes: 1 addition & 1 deletion plugin/evm/header/gas_limit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (

"github.com/ava-labs/avalanchego/utils/math"
"github.com/ava-labs/avalanchego/vms/components/gas"
customtypes "github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/params/extras"
customtypes "github.com/ava-labs/coreth/plugin/evm/types"
"github.com/ava-labs/coreth/plugin/evm/upgrade/acp176"
"github.com/ava-labs/coreth/plugin/evm/upgrade/ap0"
"github.com/ava-labs/coreth/plugin/evm/upgrade/ap1"
Expand Down
2 changes: 1 addition & 1 deletion plugin/evm/syncervm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ import (
"github.com/ava-labs/coreth/consensus/dummy"
"github.com/ava-labs/coreth/constants"
"github.com/ava-labs/coreth/core"
customtypes "github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/params"
"github.com/ava-labs/coreth/plugin/evm/atomic"
"github.com/ava-labs/coreth/plugin/evm/database"
customrawdb "github.com/ava-labs/coreth/plugin/evm/rawdb"
customtypes "github.com/ava-labs/coreth/plugin/evm/types"
"github.com/ava-labs/coreth/predicate"
statesyncclient "github.com/ava-labs/coreth/sync/client"
"github.com/ava-labs/coreth/sync/statesync"
Expand Down
0 core/types/block_ext.go → plugin/evm/types/block_ext.go
View file
Open in desktop
File renamed without changes.
0 core/types/block_ext_test.go → plugin/evm/types/block_ext_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion core/types/block_test.go → plugin/evm/types/block_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import (
"github.com/ava-labs/libevm/crypto"
"github.com/ava-labs/libevm/rlp"

. "github.com/ava-labs/coreth/core/types"
. "github.com/ava-labs/coreth/plugin/evm/types"

// TODO(arr4n) These tests were originally part of the `coreth/core/types`
// package so assume the presence of identifiers. A dot-import reduces PR
Expand Down
0 core/types/gen_header_serializable_json.go → ...evm/types/gen_header_serializable_json.go
View file
Open in desktop
File renamed without changes.
0 core/types/gen_header_serializable_rlp.go → .../evm/types/gen_header_serializable_rlp.go
View file
Open in desktop
File renamed without changes.
0 core/types/hashes_ext.go → plugin/evm/types/hashes_ext.go
View file
Open in desktop
File renamed without changes.
0 core/types/hashing.go → plugin/evm/types/hashing.go
View file
Open in desktop
File renamed without changes.
0 core/types/hashing_test.go → plugin/evm/types/hashing_test.go
View file
Open in desktop
File renamed without changes.
0 core/types/header_ext.go → plugin/evm/types/header_ext.go
View file
Open in desktop
File renamed without changes.
0 core/types/header_ext_test.go → plugin/evm/types/header_ext_test.go
View file
Open in desktop
File renamed without changes.
0 core/types/libevm.go → plugin/evm/types/libevm.go
View file
Open in desktop
File renamed without changes.
0 core/types/log_ext.go → plugin/evm/types/log_ext.go
View file
Open in desktop
File renamed without changes.
0 core/types/rlp_fuzzer_test.go → plugin/evm/types/rlp_fuzzer_test.go
View file
Open in desktop
File renamed without changes.
0 core/types/state_account_ext.go → plugin/evm/types/state_account_ext.go
View file
Open in desktop
File renamed without changes.
0 core/types/types_test.go → plugin/evm/types/types_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion plugin/evm/vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/ava-labs/avalanchego/network/p2p/gossip"
"github.com/ava-labs/avalanchego/upgrade"
avalanchegoConstants "github.com/ava-labs/avalanchego/utils/constants"
customtypes "github.com/ava-labs/coreth/core/types"
customtypes "github.com/ava-labs/coreth/plugin/evm/types"
"github.com/prometheus/client_golang/prometheus"

"github.com/ava-labs/coreth/consensus/dummy"
Expand Down
2 changes: 1 addition & 1 deletion plugin/evm/vm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ import (

"github.com/ava-labs/coreth/consensus/dummy"
"github.com/ava-labs/coreth/core"
customtypes "github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/eth"
"github.com/ava-labs/coreth/params"
customtypes "github.com/ava-labs/coreth/plugin/evm/types"
"github.com/ava-labs/coreth/rpc"
"github.com/ava-labs/libevm/core/types"

Expand Down
2 changes: 1 addition & 1 deletion rpc/subscription_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import (
"github.com/ava-labs/libevm/core/types"

// Side effect: registration of libevm extras.
_ "github.com/ava-labs/coreth/core/types"
_ "github.com/ava-labs/coreth/plugin/evm/types"
)

func TestNewID(t *testing.T) {
Expand Down
Loading