Skip to content

conformance: drop the solc resources stamp workaround #405

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
gnidan merged 1 commit into from
Nov 10, 2026
Merged

conformance: drop the solc resources stamp workaround #405

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
34 changes: 2 additions & 32 deletions packages/conformance/test/conformance.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,36 +139,6 @@ function resourcesWithVersion(version: string) {
};
}

// Expected failure (#311): solc does not emit the stamp on its resources
// object yet. Until it does, the solc tests add the stamp to a copy of the
// artifact before they validate it, so the rest of resources is still
// checked. The check below fails once solc emits the stamp; then remove
// this function and validate the artifact as it is.
function withSolcResourcesStamp(artifact: EthdebugArtifact): EthdebugArtifact {
expect(
artifact.resources?.ethdebug,
"solc now emits the stamp on its resources object; " +
"remove withSolcResourcesStamp",
).toBeUndefined();
if (!artifact.resources) {
return artifact;
}

const programVersion = artifact.programs.find(
({ program }) => program.ethdebug,
)?.program.ethdebug?.version;
return {
...artifact,
resources: {
...artifact.resources,
ethdebug: {
schema: "ethdebug/format/info/resources",
version: programVersion ?? version,
},
},
};
}

// Expected failure (#324): solc still writes the format's pointer
// vocabulary with the old `$` sigil (`$sum`, `$wordsize`, `$this`, ...),
// and the schemas now require `~`. Until solc emits `~`, the solc tests
Expand Down Expand Up @@ -274,7 +244,7 @@ describe("@ethdebug/conformance", () => {
});

const result = await validateStaticConformance(
withSolcTildeVocabulary(withSolcResourcesStamp(artifact)),
withSolcTildeVocabulary(artifact),
);
expect(result.issues).toEqual([]);
expect(result.ok).toBe(true);
Expand Down Expand Up @@ -327,7 +297,7 @@ describe("@ethdebug/conformance", () => {
],
});
const result = await validateStaticConformance(
withSolcTildeVocabulary(withSolcResourcesStamp(artifact)),
withSolcTildeVocabulary(artifact),
);
expect(result.issues).toEqual([]);
expect(result.ok).toBe(true);
Expand Down
Loading