Skip to content

PubKey schema; mstruct field-level validity #138

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
christianschmitz merged 3 commits into from
May 15, 2025
Merged

PubKey schema; mstruct field-level validity #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec093f9
post-hoc version bump
rjharmon May 15, 2025
da3848a
include mStruct fieldName in invalid-data diagnostic
rjharmon Apr 30, 2025
3af20fc
support PubKey in type-schema
rjharmon Apr 30, 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
2 changes: 1 addition & 1 deletion src/program/version.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const VERSION = "0.17.20"
export const VERSION = "0.17.21"
2 changes: 1 addition & 1 deletion src/statements/DataDefinition.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ export class DataDefinition {
${ir}
},
() -> {
__core__trace("Warning: invalid ${mStructName} data",
__core__trace("Warning: invalid data in ${mStructName}.${f.encodedFieldName}",
() -> {
false
}
Expand Down
4 changes: 4 additions & 0 deletions src/typecheck/hashes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@ export const PubKeyType = new GenericType({
genTypeMembers: (self) => ({
...genCommonTypeMembers(self),
new: new FuncType([ByteArrayType], self)
}),
genTypeSchema: (self) => ({
kind: /** @type {const} */ ("internal"),
name: "PubKey"
})
})

Expand Down
4 changes: 2 additions & 2 deletions test/struct.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ describe("mStruct Pair[Int, Int]", () => {
runner([map([[$a, int(0)]])], False)
})

it("issues warnings from unoptimized version (missing field and invalid ‹struct-name›)", () => {
it("issues warnings from unoptimized version (missing field by-name, and invalid ‹struct-name›)", () => {
const [result] = runner([map([[$a, int(0)]])], False)
const logs = result.logs.map((l) => l.message)
if (!logs.some((x) => x.match(/field not found: b/))) {
Expand All @@ -181,7 +181,7 @@ describe("mStruct Pair[Int, Int]", () => {
logs.map((l) => `unoptimized> ${l}`).join("\n")
)
}
if (!logs.some((x) => x.match(/invalid Pair data/))) {
if (!logs.some((x) => x.match(/invalid data in Pair.b/))) {
throw new Error(
"Expected warning about invalid Pair, got logs:\n" +
logs.map((l) => `unoptimized> ${l}`).join("\n")
Expand Down