project-serum
/
anchor
mirror of https://github.com/project-serum/anchor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Paul 2022-04-20 16:59:00 -04:00 committed by GitHub
parent 765fee0c6e
commit d0a13e6535
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -17,6 +17,7 @@ The minor version will be incremented upon a breaking change and the patch versi
### Fixes
* cli: Move `overflow-checks` into workspace `Cargo.toml` so that it will not be ignored by compiler ([#1806](https://github.com/project-serum/anchor/pull/1806)).
* 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

17
lang/syn/src/lib.rs
View File

@ -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 },
@ -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 {
@ -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))?
}
}
}
@ -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))?
}
}
}
@ -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))?
}
}
}