From 112fdfed4af7c594d3511b5562c1590f335821bc Mon Sep 17 00:00:00 2001
From: Mario Vega <marioevz@gmail.com>
Date: Fri, 13 Oct 2023 10:25:11 -0600
Subject: [PATCH] simulators/ethereum/engine: Fix naming, safe/finalized on
 reorg tests (#907)

---
 .../engine/suites/engine/invalid_ancestor.go  | 40 ++++++++++++-------
 .../ethereum/engine/suites/engine/tests.go    |  7 +++-
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/simulators/ethereum/engine/suites/engine/invalid_ancestor.go b/simulators/ethereum/engine/suites/engine/invalid_ancestor.go
index 2f473904e7..fa8eb46cae 100644
--- a/simulators/ethereum/engine/suites/engine/invalid_ancestor.go
+++ b/simulators/ethereum/engine/suites/engine/invalid_ancestor.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"math/big"
+	"strings"
 	"time"
 
 	api "github.com/ethereum/go-ethereum/beacon/engine"
@@ -39,7 +40,16 @@ func (s InvalidMissingAncestorReOrgTest) WithMainFork(fork config.Fork) test.Spe
 }
 
 func (tc InvalidMissingAncestorReOrgTest) GetName() string {
-	return fmt.Sprintf("Invalid Missing Ancestor ReOrg, Invalid %s, Invalid P%d'", tc.InvalidField, tc.InvalidIndex)
+	name := []string{
+		"Invalid Missing Ancestor ReOrg",
+		fmt.Sprintf("Invalid %s", tc.InvalidField),
+	}
+	if tc.EmptyTransactions {
+		name = append(name, "Empty Txs")
+	}
+	name = append(name, fmt.Sprintf("Invalid P%d'", tc.InvalidIndex))
+
+	return strings.Join(name, ", ")
 }
 
 func (tc InvalidMissingAncestorReOrgTest) Execute(t *test.Env) {
@@ -128,9 +138,7 @@ func (tc InvalidMissingAncestorReOrgTest) Execute(t *test.Env) {
 
 				r := t.TestEngine.TestEngineNewPayload(altChainPayloads[i])
 				p := t.TestEngine.TestEngineForkchoiceUpdated(&api.ForkchoiceStateV1{
-					HeadBlockHash:      altChainPayloads[i].BlockHash,
-					SafeBlockHash:      altChainPayloads[i].BlockHash,
-					FinalizedBlockHash: common.Hash{},
+					HeadBlockHash: altChainPayloads[i].BlockHash,
 				}, nil, altChainPayloads[i].Timestamp)
 				if i == tc.InvalidIndex {
 					// If this is the first payload after the common ancestor, and this is the payload we invalidated,
@@ -199,15 +207,21 @@ func (s InvalidMissingAncestorReOrgSyncTest) WithMainFork(fork config.Fork) test
 }
 
 func (tc InvalidMissingAncestorReOrgSyncTest) GetName() string {
-	name := fmt.Sprintf("Invalid Missing Ancestor ReOrg, Invalid %s, ", tc.InvalidField)
+	name := []string{
+		"Invalid Missing Ancestor ReOrg",
+		fmt.Sprintf("Invalid %s", tc.InvalidField),
+	}
 	if tc.EmptyTransactions {
-		name += "Empty Txs, "
+		name = append(name, "Empty Txs")
 	}
-	name += fmt.Sprintf("Invalid P%d', Reveal using sync", tc.InvalidIndex)
+	name = append(name,
+		fmt.Sprintf("Invalid P%d'", tc.InvalidIndex),
+		"Reveal using sync",
+	)
 	if tc.ReOrgFromCanonical {
-		name += " (ReOrg from Canonical)"
+		name = append(name, "ReOrg from Canonical")
 	}
-	return name
+	return strings.Join(name, ", ")
 }
 
 func (tc InvalidMissingAncestorReOrgSyncTest) Execute(t *test.Env) {
@@ -371,9 +385,7 @@ func (tc InvalidMissingAncestorReOrgSyncTest) Execute(t *test.Env) {
 					r.ExpectStatusEither(test.Valid, test.Accepted)
 
 					s := secondaryTestClient.TestEngineForkchoiceUpdated(&api.ForkchoiceStateV1{
-						HeadBlockHash:      p.BlockHash,
-						SafeBlockHash:      cA.BlockHash,
-						FinalizedBlockHash: common.Hash{},
+						HeadBlockHash: p.BlockHash,
 					}, nil, p.Timestamp)
 					s.ExpectationDescription = "Sent modified payload forkchoice updated to secondary client, expected to be accepted"
 					s.ExpectAnyPayloadStatus(test.Valid, test.Syncing)
@@ -421,9 +433,7 @@ func (tc InvalidMissingAncestorReOrgSyncTest) Execute(t *test.Env) {
 				r := t.TestEngine.TestEngineNewPayload(altChainPayloads[n])
 				t.Logf("INFO (%s): Response from main client: %v", t.TestName, r.Status)
 				s := t.TestEngine.TestEngineForkchoiceUpdated(&api.ForkchoiceStateV1{
-					HeadBlockHash:      altChainPayloads[n].BlockHash,
-					SafeBlockHash:      altChainPayloads[n].BlockHash,
-					FinalizedBlockHash: common.Hash{},
+					HeadBlockHash: altChainPayloads[n].BlockHash,
 				}, nil, altChainPayloads[n].Timestamp)
 				t.Logf("INFO (%s): Response from main client fcu: %v", t.TestName, s.Response.PayloadStatus)
 
diff --git a/simulators/ethereum/engine/suites/engine/tests.go b/simulators/ethereum/engine/suites/engine/tests.go
index e6945a1678..cf35765ea1 100644
--- a/simulators/ethereum/engine/suites/engine/tests.go
+++ b/simulators/ethereum/engine/suites/engine/tests.go
@@ -240,6 +240,10 @@ func init() {
 	for _, invalidIndex := range []int{1, 9, 10} {
 		for _, emptyTxs := range []bool{false, true} {
 			Tests = append(Tests, InvalidMissingAncestorReOrgTest{
+				BaseSpec: test.BaseSpec{
+					SlotsToSafe:      big.NewInt(32),
+					SlotsToFinalized: big.NewInt(64),
+				},
 				SidechainLength:   10,
 				InvalidIndex:      invalidIndex,
 				InvalidField:      helper.InvalidStateRoot,
@@ -251,7 +255,8 @@ func init() {
 	// Invalid Ancestor Re-Org Tests (Reveal Via Sync)
 	spec := test.BaseSpec{
 		TimeoutSeconds:   60,
-		SlotsToFinalized: big.NewInt(20),
+		SlotsToSafe:      big.NewInt(32),
+		SlotsToFinalized: big.NewInt(64),
 	}
 	for _, invalidField := range []helper.InvalidPayloadBlockField{
 		helper.InvalidStateRoot,