Skip to content

Commit 70828a0

Browse files
committed
simulators/ethereum/engine: Modified tests for devnet 8
1 parent 2cdb42f commit 70828a0

File tree

2 files changed

+25
-53
lines changed

2 files changed

+25
-53
lines changed

simulators/ethereum/engine/suites/blobs/steps.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,8 @@ type SendModifiedLatestPayload struct {
582582
ClientID uint64
583583
// Versioned hashes modification
584584
VersionedHashes *VersionedHashes
585-
// Expected status of the new payload request
585+
// Expected responses on the NewPayload call
586+
ExpectedError *int
586587
ExpectedStatus test.PayloadStatus
587588
}
588589

@@ -603,7 +604,11 @@ func (step SendModifiedLatestPayload) Execute(t *BlobTestContext) error {
603604
}
604605
testEngine := t.TestEngines[step.ClientID]
605606
r := testEngine.TestEngineNewPayloadV3(payload, versionedHashes)
606-
r.ExpectStatus(step.ExpectedStatus)
607+
if step.ExpectedError != nil {
608+
r.ExpectErrorCode(*step.ExpectedError)
609+
} else {
610+
r.ExpectStatus(step.ExpectedStatus)
611+
}
607612
return nil
608613
}
609614

simulators/ethereum/engine/suites/blobs/tests.go

Lines changed: 18 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -537,8 +537,7 @@ var Tests = []test.SpecInterface{
537537
VersionedHashes: &VersionedHashes{
538538
Blobs: nil,
539539
},
540-
// On DEVNET 8:
541-
// ExpectedError: INVALID_PARAMS_ERROR,
540+
ExpectedError: INVALID_PARAMS_ERROR,
542541
},
543542
},
544543
},
@@ -590,33 +589,30 @@ var Tests = []test.SpecInterface{
590589
},
591590
},
592591
},
593-
/*
594-
// Unspecified Outcome For Devnet 7, uncomment for Devnet 8
595-
&BlobsBaseSpec{
596-
Spec: test.Spec{
597-
Name: "NewPayloadV3 Before Cancun, Nil Data Fields, Empty Array Versioned Hashes",
598-
About: `
592+
&BlobsBaseSpec{
593+
Spec: test.Spec{
594+
Name: "NewPayloadV3 Before Cancun, Nil Data Fields, Empty Array Versioned Hashes",
595+
About: `
599596
Test sending NewPayloadV3 Before Cancun with:
600597
- nil ExcessBlobGas
601598
- nil BlobGasUsed
602599
- Empty Versioned Hashes Array
603600
`,
604-
},
601+
},
605602

606-
CancunForkHeight: 2,
603+
CancunForkHeight: 2,
607604

608-
TestSequence: TestSequence{
609-
NewPayloads{
610-
ExpectedIncludedBlobCount: 0,
611-
Version: 3,
612-
VersionedHashes: &VersionedHashes{
613-
Blobs: []helper.BlobID{},
614-
},
615-
ExpectedError: INVALID_PARAMS_ERROR,
605+
TestSequence: TestSequence{
606+
NewPayloads{
607+
ExpectedIncludedBlobCount: 0,
608+
Version: 3,
609+
VersionedHashes: &VersionedHashes{
610+
Blobs: []helper.BlobID{},
616611
},
612+
ExpectedError: INVALID_PARAMS_ERROR,
617613
},
618614
},
619-
*/
615+
},
620616
&BlobsBaseSpec{
621617
Spec: test.Spec{
622618
Name: "NewPayloadV3 Before Cancun, 0x00 Data Fields, Empty Array Versioned Hashes",
@@ -641,41 +637,12 @@ var Tests = []test.SpecInterface{
641637
ExcessBlobGas: pUint64(0),
642638
BlobGasUsed: pUint64(0),
643639
},
644-
ExpectedError: INVALID_PARAMS_ERROR,
645-
// On DEVNET 8:
646-
// ExpectedError: UNSUPPORTED_FORK_ERROR,
640+
ExpectedError: UNSUPPORTED_FORK_ERROR,
647641
},
648642
},
649643
},
650644

651645
// NewPayloadV3 After Cancun, Negative Tests
652-
/*
653-
// Unspecified Outcome For Devnet 7, uncomment for Devnet 8
654-
&BlobsBaseSpec{
655-
Spec: test.Spec{
656-
Name: "NewPayloadV3 After Cancun, 0x00 Data Fields, Nil Versioned Hashes",
657-
About: `
658-
Test sending NewPayloadV3 After Cancun with:
659-
- 0x00 ExcessBlobGas
660-
- 0x00 BlobGasUsed
661-
- nil Versioned Hashes Array
662-
`,
663-
},
664-
665-
CancunForkHeight: 1,
666-
667-
TestSequence: TestSequence{
668-
NewPayloads{
669-
ExpectedIncludedBlobCount: 0,
670-
Version: 3,
671-
VersionedHashes: &VersionedHashes{
672-
Blobs: nil,
673-
},
674-
ExpectedError: INVALID_PARAMS_ERROR,
675-
},
676-
},
677-
},
678-
*/
679646
&BlobsBaseSpec{
680647
Spec: test.Spec{
681648
Name: "NewPayloadV3 After Cancun, Nil ExcessBlobGas, 0x00 BlobGasUsed, Empty Array Versioned Hashes",
@@ -892,7 +859,7 @@ var Tests = []test.SpecInterface{
892859
VersionedHashes: &VersionedHashes{
893860
Blobs: nil,
894861
},
895-
ExpectedStatus: test.Invalid,
862+
ExpectedError: INVALID_PARAMS_ERROR,
896863
},
897864
},
898865
},
@@ -1177,7 +1144,7 @@ var Tests = []test.SpecInterface{
11771144
VersionedHashes: &VersionedHashes{
11781145
Blobs: nil,
11791146
},
1180-
ExpectedStatus: test.Invalid,
1147+
ExpectedError: INVALID_PARAMS_ERROR,
11811148
},
11821149
},
11831150
},

0 commit comments

Comments
 (0)