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

Jump to bottom

lang: fix missing account name info when deser fails when using 'init' or 'zero' #1800

Merged
merged 4 commits into from
Apr 20, 2022
Merged

lang: fix missing account name info when deser fails when using 'init' or 'zero' #1800

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42096c5
lang: fix missing account name info when deser fails when using 'init…
paul-schaaf Apr 16, 2022
eb4f882
changelog
paul-schaaf Apr 16, 2022
17d8934
fix variable
paul-schaaf Apr 16, 2022
4a1921c
Merge branch 'master' into lang/fix-missing-accountname-in-error
paul-schaaf Apr 20, 2022
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ The minor version will be incremented upon a breaking change and the patch versi

## [Unreleased]

### Fixes

* lang: Fix missing account name information when deserialization fails when using `init` or `zero` ([#1800](https://github.com/project-serum/anchor/pull/1800)).

## [0.24.2] - 2022-04-13

### Fixes
Expand Down
17 changes: 9 additions & 8 deletions lang/syn/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ impl Field {
checked: bool,
) -> proc_macro2::TokenStream {
let field = &self.ident;
let field_str = field.to_string();
let container_ty = self.container_ty();
let owner_addr = match &kind {
None => quote! { program_id },
Expand All @@ -307,13 +308,13 @@ impl Field {
quote! {
#container_ty::try_from(
&#field,
)?
).map_err(|e| e.with_account_name(#field_str))?
}
} else {
quote! {
#container_ty::try_from_unchecked(
&#field,
)?
).map_err(|e| e.with_account_name(#field_str))?
}
};
if *boxed {
Expand All @@ -329,13 +330,13 @@ impl Field {
quote! {
#container_ty::try_from(
&#field,
)?
).map_err(|e| e.with_account_name(#field_str))?
}
} else {
quote! {
#container_ty::try_from_unchecked(
&#field,
)?
).map_err(|e| e.with_account_name(#field_str))?
}
}
}
Expand All @@ -344,14 +345,14 @@ impl Field {
quote! {
#container_ty::try_from(
&#field,
)?
).map_err(|e| e.with_account_name(#field_str))?
}
} else {
quote! {
#container_ty::try_from_unchecked(
#owner_addr,
&#field,
)?
).map_err(|e| e.with_account_name(#field_str))?
}
}
}
Expand All @@ -361,14 +362,14 @@ impl Field {
#container_ty::try_from(
#owner_addr,
&#field,
)?
).map_err(|e| e.with_account_name(#field_str))?
}
} else {
quote! {
#container_ty::try_from_unchecked(
#owner_addr,
&#field,
)?
).map_err(|e| e.with_account_name(#field_str))?
}
}
}
Expand Down