core/types: move state_account.go imports to imports.go

Author: qdm12

core/types/imports.go

@@ -23,6 +23,8 @@ type (
 	ReceiptForStorage = ethtypes.ReceiptForStorage
 	Receipts          = ethtypes.Receipts
 	Signer            = ethtypes.Signer
+	SlimAccount       = ethtypes.SlimAccount
+	StateAccount      = ethtypes.StateAccount
 	Transaction       = ethtypes.Transaction
 	Transactions      = ethtypes.Transactions
 	TxByNonce         = ethtypes.TxByNonce
@@ -45,12 +47,16 @@ const (
 
 // The following functions are used directly as their upstream definitions.
 var (
-	BloomLookup         = ethtypes.BloomLookup
-	BytesToBloom        = ethtypes.BytesToBloom
-	CreateBloom         = ethtypes.CreateBloom
-	NewContractCreation = ethtypes.NewContractCreation
-	NewReceipt          = ethtypes.NewReceipt
-	NewTransaction      = ethtypes.NewTransaction
+	BloomLookup          = ethtypes.BloomLookup
+	BytesToBloom         = ethtypes.BytesToBloom
+	CreateBloom          = ethtypes.CreateBloom
+	FullAccount          = ethtypes.FullAccount
+	FullAccountRLP       = ethtypes.FullAccountRLP
+	NewContractCreation  = ethtypes.NewContractCreation
+	NewEmptyStateAccount = ethtypes.NewEmptyStateAccount
+	NewReceipt           = ethtypes.NewReceipt
+	NewTransaction       = ethtypes.NewTransaction
+	SlimAccountRLP       = ethtypes.SlimAccountRLP
 
 	// Signers
 	LatestSigner           = ethtypes.LatestSigner

core/types/state_account.go

@@ -1,4 +1,4 @@
-// (c) 2019-2021, Ava Labs, Inc.
+// (c) 2019-2025, Ava Labs, Inc.
 //
 // This file is a derived work, based on the go-ethereum library whose original
 // notices appear below.
@@ -30,20 +30,6 @@ import (
 	ethtypes "github.com/ava-labs/libevm/core/types"
 )
 
-type (
-	// Import these types from the go-ethereum package
-	StateAccount = ethtypes.StateAccount
-	SlimAccount  = ethtypes.SlimAccount
-)
-
-var (
-	// Import these functions from the go-ethereum package
-	NewEmptyStateAccount = ethtypes.NewEmptyStateAccount
-	SlimAccountRLP       = ethtypes.SlimAccountRLP
-	FullAccount          = ethtypes.FullAccount
-	FullAccountRLP       = ethtypes.FullAccountRLP
-)
-
 type isMultiCoin bool
 
 var (