Revert "tests: use 'sender' in state tests if present (ethereum#28023)"

This reverts commit bf49356.
HorizenOfficial · Nov 10, 2023 · d9b1eb1 · d9b1eb1
1 parent 0524514
commit d9b1eb1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/tests/gen_sttransaction.go b/tests/gen_sttransaction.go
diff --git a/tests/state_test_util.go b/tests/state_test_util.go
@@ -115,7 +115,6 @@ type stTransaction struct {
 	GasLimit             []uint64            `json:"gasLimit"`
 	Value                []string            `json:"value"`
 	PrivateKey           []byte              `json:"secretKey"`
-	Sender               *common.Address     `json:"sender"`
 	BlobVersionedHashes  []common.Hash       `json:"blobVersionedHashes,omitempty"`
 	BlobGasFeeCap        *big.Int            `json:"maxFeePerBlobGas,omitempty"`
 }
@@ -360,12 +359,9 @@ func (t *StateTest) genesis(config *params.ChainConfig) *core.Genesis {
 }
 
 func (tx *stTransaction) toMessage(ps stPostState, baseFee *big.Int) (*core.Message, error) {
+	// Derive sender from private key if present.
 	var from common.Address
-	// If 'sender' field is present, use that
-	if tx.Sender != nil {
-		from = *tx.Sender
-	} else if len(tx.PrivateKey) > 0 {
-		// Derive sender from private key if needed.
+	if len(tx.PrivateKey) > 0 {
 		key, err := crypto.ToECDSA(tx.PrivateKey)
 		if err != nil {
 			return nil, fmt.Errorf("invalid private key: %v", err)