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

Fix enum parsing bug #2763

Merged
merged 7 commits into from
Jan 9, 2024
Merged

Fix enum parsing bug #2763

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2fedba0
Fix enum parsing bug
0xabhinav Jan 4, 2024
7060dbf
Fix tests
0xabhinav Jan 6, 2024
ede4635
Remove unnecessary type assertion
0xabhinav Jan 6, 2024
5ac37b2
Fix formatting
acheroncrypto Jan 9, 2024
88ba826
Remove unnecessary case conversion
acheroncrypto Jan 9, 2024
6c34e4a
Merge branch 'master' into 0xabhinav:bug/nestedenumparsing
acheroncrypto Jan 9, 2024
a439eb7
Update CHANGELOG
acheroncrypto Jan 9, 2024
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
11 changes: 8 additions & 3 deletions ts/packages/anchor/src/coder/borsh/instruction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,8 @@ class InstructionFormatter {
.map((d: IdlField) =>
this.formatIdlData(
{ name: "", type: (<IdlTypeVec>idlField.type).vec },
d
d,
types
)
)
.join(", ") +
Expand Down Expand Up @@ -303,11 +304,15 @@ class InstructionFormatter {
const variants = typeDef.type.variants;
const variant = Object.keys(data)[0];
const enumType = data[variant];
const camelCaseVariant = camelCase(variant);
const enumVariant = variants.find((v) => camelCase(v.name) === camelCaseVariant);
const relevantFields = enumVariant?.fields as IdlField[] | undefined;
0xabhinav marked this conversation as resolved.
Show resolved Hide resolved
const namedFields = Object.keys(enumType)
.map((f) => {
const fieldData = enumType[f];
const idlField = variants[variant]?.find(
(v: IdlField) => v.name === f
const camelCaseField = camelCase(f);
const idlField = relevantFields?.find(
v => camelCase(v.name) === camelCaseField
);
if (!idlField) {
throw new Error("Unable to find variant");
Expand Down
Loading