Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

simulators/ethereum/engine: Fix naming, safe/finalized on reorg tests #907

Merged
merged 1 commit into from
Oct 13, 2023
Merged

simulators/ethereum/engine: Fix naming, safe/finalized on reorg tests #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 25 additions & 15 deletions simulators/ethereum/engine/suites/engine/invalid_ancestor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"encoding/json"
"fmt"
"math/big"
"strings"
"time"

api "github.com/ethereum/go-ethereum/beacon/engine"
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)

Expand Down
7 changes: 6 additions & 1 deletion simulators/ethereum/engine/suites/engine/tests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down