From 6bc57579d14063c0f2a9c7da5022d25b3a850cf3 Mon Sep 17 00:00:00 2001
From: maskpp <maskpp266@gmail.com>
Date: Thu, 8 May 2025 21:21:48 +0800
Subject: [PATCH] core/types: delete unused test variable (#31776)

Delete the unused `Account.PrivateKey` variable.
---
 core/types/account.go     | 12 ++++--------
 core/types/gen_account.go | 22 ++++++++--------------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/core/types/account.go b/core/types/account.go
index 52ce184cda..bcfb83418c 100644
--- a/core/types/account.go
+++ b/core/types/account.go
@@ -38,17 +38,13 @@ type Account struct {
 	Storage map[common.Hash]common.Hash `json:"storage,omitempty"`
 	Balance *big.Int                    `json:"balance" gencodec:"required"`
 	Nonce   uint64                      `json:"nonce,omitempty"`
-
-	// used in tests
-	PrivateKey []byte `json:"secretKey,omitempty"`
 }
 
 type accountMarshaling struct {
-	Code       hexutil.Bytes
-	Balance    *math.HexOrDecimal256
-	Nonce      math.HexOrDecimal64
-	Storage    map[storageJSON]storageJSON
-	PrivateKey hexutil.Bytes
+	Code    hexutil.Bytes
+	Balance *math.HexOrDecimal256
+	Nonce   math.HexOrDecimal64
+	Storage map[storageJSON]storageJSON
 }
 
 // storageJSON represents a 256 bit byte array, but allows less than 256 bits when
diff --git a/core/types/gen_account.go b/core/types/gen_account.go
index 4e475896a7..89165ee3ad 100644
--- a/core/types/gen_account.go
+++ b/core/types/gen_account.go
@@ -17,11 +17,10 @@ var _ = (*accountMarshaling)(nil)
 // MarshalJSON marshals as JSON.
 func (a Account) MarshalJSON() ([]byte, error) {
 	type Account struct {
-		Code       hexutil.Bytes               `json:"code,omitempty"`
-		Storage    map[storageJSON]storageJSON `json:"storage,omitempty"`
-		Balance    *math.HexOrDecimal256       `json:"balance" gencodec:"required"`
-		Nonce      math.HexOrDecimal64         `json:"nonce,omitempty"`
-		PrivateKey hexutil.Bytes               `json:"secretKey,omitempty"`
+		Code    hexutil.Bytes               `json:"code,omitempty"`
+		Storage map[storageJSON]storageJSON `json:"storage,omitempty"`
+		Balance *math.HexOrDecimal256       `json:"balance" gencodec:"required"`
+		Nonce   math.HexOrDecimal64         `json:"nonce,omitempty"`
 	}
 	var enc Account
 	enc.Code = a.Code
@@ -33,18 +32,16 @@ func (a Account) MarshalJSON() ([]byte, error) {
 	}
 	enc.Balance = (*math.HexOrDecimal256)(a.Balance)
 	enc.Nonce = math.HexOrDecimal64(a.Nonce)
-	enc.PrivateKey = a.PrivateKey
 	return json.Marshal(&enc)
 }
 
 // UnmarshalJSON unmarshals from JSON.
 func (a *Account) UnmarshalJSON(input []byte) error {
 	type Account struct {
-		Code       *hexutil.Bytes              `json:"code,omitempty"`
-		Storage    map[storageJSON]storageJSON `json:"storage,omitempty"`
-		Balance    *math.HexOrDecimal256       `json:"balance" gencodec:"required"`
-		Nonce      *math.HexOrDecimal64        `json:"nonce,omitempty"`
-		PrivateKey *hexutil.Bytes              `json:"secretKey,omitempty"`
+		Code    *hexutil.Bytes              `json:"code,omitempty"`
+		Storage map[storageJSON]storageJSON `json:"storage,omitempty"`
+		Balance *math.HexOrDecimal256       `json:"balance" gencodec:"required"`
+		Nonce   *math.HexOrDecimal64        `json:"nonce,omitempty"`
 	}
 	var dec Account
 	if err := json.Unmarshal(input, &dec); err != nil {
@@ -66,8 +63,5 @@ func (a *Account) UnmarshalJSON(input []byte) error {
 	if dec.Nonce != nil {
 		a.Nonce = uint64(*dec.Nonce)
 	}
-	if dec.PrivateKey != nil {
-		a.PrivateKey = *dec.PrivateKey
-	}
 	return nil
 }