From 53d92365d654f8e850748dfe4b9451474a4b3bbf Mon Sep 17 00:00:00 2001 From: Jonathan Oppenheimer Date: Thu, 2 Oct 2025 14:49:29 -0400 Subject: [PATCH 1/2] remove deprecated types --- core/blockchain_test.go | 2 +- core/genesis.go | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/core/blockchain_test.go b/core/blockchain_test.go index d19c02b884..4424eabc3c 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -1043,7 +1043,7 @@ func TestEIP3651(t *testing.T) { gspec = &Genesis{ Config: params.TestChainConfig, Timestamp: uint64(upgrade.InitiallyActiveTime.Unix()), - Alloc: GenesisAlloc{ + Alloc: types.GenesisAlloc{ addr1: {Balance: funds}, addr2: {Balance: funds}, // The address 0xAAAA sloads 0x00 and 0x01 diff --git a/core/genesis.go b/core/genesis.go index 0e335e52e5..ef47e4aaf8 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -59,12 +59,6 @@ import ( var errGenesisNoConfig = errors.New("genesis has no chain configuration") -// Deprecated: use types.Account instead. -type GenesisAccount = types.Account - -// Deprecated: use types.GenesisAlloc instead. -type GenesisAlloc = types.GenesisAlloc - // Genesis specifies the header fields, state of a genesis block. It also defines hard // fork switch-over blocks through the chain configuration. type Genesis struct { From 4d045d670c0c6e256c6f71aea49429a49e1e3a6e Mon Sep 17 00:00:00 2001 From: Jonathan Oppenheimer Date: Tue, 14 Oct 2025 18:02:49 -0400 Subject: [PATCH 2/2] minimize diff --- core/genesis.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/genesis.go b/core/genesis.go index ef47e4aaf8..0e335e52e5 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -59,6 +59,12 @@ import ( var errGenesisNoConfig = errors.New("genesis has no chain configuration") +// Deprecated: use types.Account instead. +type GenesisAccount = types.Account + +// Deprecated: use types.GenesisAlloc instead. +type GenesisAlloc = types.GenesisAlloc + // Genesis specifies the header fields, state of a genesis block. It also defines hard // fork switch-over blocks through the chain configuration. type Genesis struct {