chore(types): move plugin/evm/types to plugin/evm/customtypes

qdm12 · qdm12 · commit d6e47087fed9 · 2025-04-01T10:15:17.000+02:00
See original PR ava-labs/coreth#890
diff --git a/consensus/dummy/consensus.go b/consensus/dummy/consensus.go
@@ -18,7 +18,7 @@ import (
 	"github.com/ava-labs/subnet-evm/core/state"
 	"github.com/ava-labs/subnet-evm/params"
 	"github.com/ava-labs/subnet-evm/params/extras"
-	customtypes "github.com/ava-labs/subnet-evm/plugin/evm/types"
+	"github.com/ava-labs/subnet-evm/plugin/evm/customtypes"
 	"github.com/ava-labs/subnet-evm/plugin/evm/vmerrors"
 	"github.com/ava-labs/subnet-evm/utils"
 
diff --git a/core/blockchain.go b/core/blockchain.go
@@ -58,7 +58,7 @@ import (
 	"github.com/ava-labs/subnet-evm/internal/version"
 	"github.com/ava-labs/subnet-evm/params"
 	"github.com/ava-labs/subnet-evm/plugin/evm/customrawdb"
-	customtypes "github.com/ava-labs/subnet-evm/plugin/evm/types"
+	"github.com/ava-labs/subnet-evm/plugin/evm/customtypes"
 	"github.com/ava-labs/subnet-evm/triedb/hashdb"
 	"github.com/ava-labs/subnet-evm/triedb/pathdb"
 
diff --git a/core/state_processor_test.go b/core/state_processor_test.go
@@ -43,8 +43,8 @@ import (
 	"github.com/ava-labs/subnet-evm/consensus/misc/eip4844"
 	"github.com/ava-labs/subnet-evm/params"
 	"github.com/ava-labs/subnet-evm/params/extras"
+	"github.com/ava-labs/subnet-evm/plugin/evm/customtypes"
 	customheader "github.com/ava-labs/subnet-evm/plugin/evm/header"
-	customtypes "github.com/ava-labs/subnet-evm/plugin/evm/types"
 	"github.com/ava-labs/subnet-evm/plugin/evm/upgrade/legacy"
 	"github.com/holiman/uint256"
 	"golang.org/x/crypto/sha3"
diff --git a/eth/filters/filter.go b/eth/filters/filter.go
@@ -35,7 +35,7 @@ import (
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/core/types"
 	"github.com/ava-labs/subnet-evm/core/bloombits"
-	customtypes "github.com/ava-labs/subnet-evm/plugin/evm/types"
+	"github.com/ava-labs/subnet-evm/plugin/evm/customtypes"
 	"github.com/ava-labs/subnet-evm/rpc"
 )
 
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -53,7 +53,7 @@ import (
 	"github.com/ava-labs/subnet-evm/core/state"
 	"github.com/ava-labs/subnet-evm/eth/gasestimator"
 	"github.com/ava-labs/subnet-evm/params"
-	customtypes "github.com/ava-labs/subnet-evm/plugin/evm/types"
+	"github.com/ava-labs/subnet-evm/plugin/evm/customtypes"
 	"github.com/ava-labs/subnet-evm/rpc"
 	"github.com/davecgh/go-spew/spew"
 	"github.com/holiman/uint256"
diff --git a/plugin/evm/block_verification.go b/plugin/evm/block_verification.go
@@ -13,8 +13,8 @@ import (
 	"github.com/ava-labs/libevm/core/types"
 	"github.com/ava-labs/libevm/trie"
 	"github.com/ava-labs/subnet-evm/params"
+	"github.com/ava-labs/subnet-evm/plugin/evm/customtypes"
 	"github.com/ava-labs/subnet-evm/plugin/evm/header"
-	customtypes "github.com/ava-labs/subnet-evm/plugin/evm/types"
 	"github.com/ava-labs/subnet-evm/plugin/evm/upgrade/legacy"
 )
 
diff --git a/plugin/evm/customtypes/block_ext.go b/plugin/evm/customtypes/block_ext.go
@@ -1,7 +1,7 @@
 // (c) 2024, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 
-package types
+package customtypes
 
 import (
 	"math/big"
diff --git a/plugin/evm/customtypes/block_ext_test.go b/plugin/evm/customtypes/block_ext_test.go
@@ -1,7 +1,7 @@
 // (c) 2025, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 
-package types
+package customtypes
 
 import (
 	"math/big"
diff --git a/plugin/evm/customtypes/block_test.go b/plugin/evm/customtypes/block_test.go
@@ -24,7 +24,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-package types_test
+package customtypes_test
 
 import (
 	"bytes"
@@ -43,7 +43,7 @@ import (
 	// This test file has to be in package types_test to avoid a circular
 	// dependency when importing `params`. We dot-import the package to mimic
 	// regular same-package behaviour.
-	. "github.com/ava-labs/subnet-evm/plugin/evm/types"
+	. "github.com/ava-labs/subnet-evm/plugin/evm/customtypes"
 )
 
 func TestBlockEncoding(t *testing.T) {
diff --git a/plugin/evm/customtypes/gen_header_serializable_json.go b/plugin/evm/customtypes/gen_header_serializable_json.go
diff --git a/plugin/evm/customtypes/gen_header_serializable_rlp.go b/plugin/evm/customtypes/gen_header_serializable_rlp.go
diff --git a/plugin/evm/customtypes/hashing.go b/plugin/evm/customtypes/hashing.go
@@ -24,7 +24,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-package types
+package customtypes
 
 import (
 	"sync"
diff --git a/plugin/evm/customtypes/hashing_test.go b/plugin/evm/customtypes/hashing_test.go
@@ -24,7 +24,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-package types_test
+package customtypes_test
 
 import (
 	"bytes"
diff --git a/plugin/evm/customtypes/header_ext.go b/plugin/evm/customtypes/header_ext.go
@@ -1,7 +1,7 @@
 // (c) 2025, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 
-package types
+package customtypes
 
 import (
 	"io"
diff --git a/plugin/evm/customtypes/header_ext_test.go b/plugin/evm/customtypes/header_ext_test.go
@@ -1,7 +1,7 @@
 // (c) 2025, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 
-package types
+package customtypes
 
 import (
 	"encoding/hex"
diff --git a/plugin/evm/customtypes/libevm.go b/plugin/evm/customtypes/libevm.go
@@ -1,7 +1,7 @@
 // (c) 2025, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 
-package types
+package customtypes
 
 import (
 	"io"
diff --git a/plugin/evm/customtypes/log_ext.go b/plugin/evm/customtypes/log_ext.go
@@ -1,7 +1,7 @@
 // (c) 2025, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 
-package types
+package customtypes
 
 import ethtypes "github.com/ava-labs/libevm/core/types"
 
diff --git a/plugin/evm/customtypes/rlp_fuzzer_test.go b/plugin/evm/customtypes/rlp_fuzzer_test.go
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-package types
+package customtypes
 
 import (
 	"bytes"
diff --git a/plugin/evm/customtypes/types_test.go b/plugin/evm/customtypes/types_test.go
@@ -24,7 +24,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-package types
+package customtypes
 
 import (
 	"math/big"
diff --git a/plugin/evm/header/block_gas_cost.go b/plugin/evm/header/block_gas_cost.go
@@ -12,7 +12,7 @@ import (
 	"github.com/ava-labs/subnet-evm/commontype"
 	"github.com/ava-labs/subnet-evm/params/extras"
 	"github.com/ava-labs/subnet-evm/plugin/evm/blockgascost"
-	customtypes "github.com/ava-labs/subnet-evm/plugin/evm/types"
+	"github.com/ava-labs/subnet-evm/plugin/evm/customtypes"
 )
 
 var (
diff --git a/plugin/evm/header/block_gas_cost_test.go b/plugin/evm/header/block_gas_cost_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/ava-labs/libevm/core/types"
 	"github.com/ava-labs/subnet-evm/commontype"
 	"github.com/ava-labs/subnet-evm/params/extras"
-	customtypes "github.com/ava-labs/subnet-evm/plugin/evm/types"
+	"github.com/ava-labs/subnet-evm/plugin/evm/customtypes"
 	"github.com/ava-labs/subnet-evm/utils"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/plugin/evm/header/extra_test.go b/plugin/evm/header/extra_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/ava-labs/libevm/core/types"
 	"github.com/ava-labs/subnet-evm/params/extras"
-	customtypes "github.com/ava-labs/subnet-evm/plugin/evm/types"
+	"github.com/ava-labs/subnet-evm/plugin/evm/customtypes"
 	"github.com/ava-labs/subnet-evm/plugin/evm/upgrade/subnetevm"
 	"github.com/ava-labs/subnet-evm/utils"
 	"github.com/stretchr/testify/require"
diff --git a/plugin/evm/vm_test.go b/plugin/evm/vm_test.go
@@ -48,8 +48,8 @@ import (
 	"github.com/ava-labs/subnet-evm/params"
 	"github.com/ava-labs/subnet-evm/params/extras"
 	"github.com/ava-labs/subnet-evm/plugin/evm/config"
+	"github.com/ava-labs/subnet-evm/plugin/evm/customtypes"
 	"github.com/ava-labs/subnet-evm/plugin/evm/header"
-	customtypes "github.com/ava-labs/subnet-evm/plugin/evm/types"
 	"github.com/ava-labs/subnet-evm/plugin/evm/vmerrors"
 	"github.com/ava-labs/subnet-evm/precompile/allowlist"
 	"github.com/ava-labs/subnet-evm/precompile/contracts/deployerallowlist"
diff --git a/rpc/subscription_test.go b/rpc/subscription_test.go
@@ -42,7 +42,7 @@ import (
 	"github.com/ava-labs/libevm/core/types"
 
 	// Side effect: registration of libevm extras.
-	_ "github.com/ava-labs/subnet-evm/plugin/evm/types"
+	_ "github.com/ava-labs/subnet-evm/plugin/evm/customtypes"
 )
 
 func TestNewID(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ import (`
`35`	`35`	`"github.com/ava-labs/libevm/common"`
`36`	`36`	`"github.com/ava-labs/libevm/core/types"`
`37`	`37`	`"github.com/ava-labs/subnet-evm/core/bloombits"`
`38`		`- customtypes "github.com/ava-labs/subnet-evm/plugin/evm/types"`
	`38`	`+ "github.com/ava-labs/subnet-evm/plugin/evm/customtypes"`
`39`	`39`	`"github.com/ava-labs/subnet-evm/rpc"`
`40`	`40`	`)`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ import (`
`13`	`13`	`"github.com/ava-labs/libevm/core/types"`
`14`	`14`	`"github.com/ava-labs/libevm/trie"`
`15`	`15`	`"github.com/ava-labs/subnet-evm/params"`
	`16`	`+ "github.com/ava-labs/subnet-evm/plugin/evm/customtypes"`
`16`	`17`	`"github.com/ava-labs/subnet-evm/plugin/evm/header"`
`17`		`- customtypes "github.com/ava-labs/subnet-evm/plugin/evm/types"`
`18`	`18`	`"github.com/ava-labs/subnet-evm/plugin/evm/upgrade/legacy"`
`19`	`19`	`)`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"github.com/ava-labs/subnet-evm/commontype"`
`13`	`13`	`"github.com/ava-labs/subnet-evm/params/extras"`
`14`	`14`	`"github.com/ava-labs/subnet-evm/plugin/evm/blockgascost"`
`15`		`- customtypes "github.com/ava-labs/subnet-evm/plugin/evm/types"`
	`15`	`+ "github.com/ava-labs/subnet-evm/plugin/evm/customtypes"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ import (`
`42`	`42`	`"github.com/ava-labs/libevm/core/types"`
`43`	`43`
`44`	`44`	`// Side effect: registration of libevm extras.`
`45`		`- _ "github.com/ava-labs/subnet-evm/plugin/evm/types"`
	`45`	`+ _ "github.com/ava-labs/subnet-evm/plugin/evm/customtypes"`
`46`	`46`	`)`
`47`	`47`
`48`	`48`	`func TestNewID(t *testing.T) {`