这是indexloc提供的服务，不要输入任何密码
Skip to content

chore: remove eip7594 from skipped spec tests and rename mekle.test.ts -> merkleProof.test.ts #8452

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

Merged
merged 5 commits into from
Sep 23, 2025
Merged

chore: remove eip7594 from skipped spec tests and rename mekle.test.ts -> merkleProof.test.ts #8452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6911755
refactor: rename spec tests merkke->merkleProof
matthewkeil Sep 23, 2025
9440108
fix: turn on eip7594 spec tests
matthewkeil Sep 23, 2025
9148120
Merge branch 'unstable' into mkeil/turn-on-eip7594-spec-tests
nflaig Sep 23, 2025
e65d3a1
Use sszTypesFor to fix type issue
nflaig Sep 23, 2025
3395073
Fix filename
nflaig Sep 23, 2025
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
12 changes: 6 additions & 6 deletions ...con-node/test/spec/presets/merkle.test.ts → ...ode/test/spec/presets/merkleProof.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import path from "node:path";
import {expect} from "vitest";
import {Tree} from "@chainsafe/persistent-merkle-tree";
import {ACTIVE_PRESET, ForkAll} from "@lodestar/params";
import {ACTIVE_PRESET} from "@lodestar/params";
import {InputType} from "@lodestar/spec-test-util";
import {BeaconBlockBody, SSZTypesFor, ssz} from "@lodestar/types";
import {BeaconBlockBody, sszTypesFor} from "@lodestar/types";
import {toHex} from "@lodestar/utils";
import {ethereumConsensusSpecsTests} from "../specTestVersioning.js";
import {specTestIterator} from "../utils/specTestIterator.js";
import {RunnerType, TestRunnerFn} from "../utils/types.js";

const merkle: TestRunnerFn<MerkleTestCase, string[]> = (fork) => {
const merkleProof: TestRunnerFn<MerkleTestCase, string[]> = (fork) => {
return {
testFunction: (testcase) => {
const bodyView = (ssz[fork].BeaconBlockBody as SSZTypesFor<ForkAll, "BeaconBlockBody">).toView(testcase.object);
const bodyView = sszTypesFor(fork).BeaconBlockBody.toView(testcase.object);
const branch = new Tree(bodyView.node).getSingleProof(testcase.proof.leaf_index);
return branch.map(toHex);
},
Expand All @@ -22,7 +22,7 @@ const merkle: TestRunnerFn<MerkleTestCase, string[]> = (fork) => {
proof: InputType.YAML,
},
getSszTypes: () => ({
object: ssz[fork].BeaconBlockBody,
object: sszTypesFor(fork).BeaconBlockBody,
}),
timeout: 10000,
shouldSkip: (_testCase, name) => {
Expand Down Expand Up @@ -51,5 +51,5 @@ interface IProof {
}

specTestIterator(path.join(ethereumConsensusSpecsTests.outputDir, "tests", ACTIVE_PRESET), {
merkle_proof: {type: RunnerType.default, fn: merkle},
merkle_proof: {type: RunnerType.default, fn: merkleProof},
});
2 changes: 1 addition & 1 deletion packages/beacon-node/test/spec/utils/specTestIterator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const coveredTestRunners = [
// ],
// ```
export const defaultSkipOpts: SkipOpts = {
skippedForks: ["eip7594", "eip7732", "eip7805", "gloas"],
skippedForks: ["eip7732", "eip7805", "gloas"],
// TODO: capella
// BeaconBlockBody proof in lightclient is the new addition in v1.3.0-rc.2-hotfix
// Skip them for now to enable subsequently
Expand Down
Loading