Skip to content

Make use of StoredTransactionError when converting between TransactionError and generated::TransactionError #6704

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

Open
steveluscher wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make use of StoredTransactionError when converting between TransactionError and generated::TransactionError #6704

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
11 changes: 3 additions & 8 deletions storage-proto/src/convert.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,12 +465,7 @@ impl From<TransactionStatusMeta> for generated::TransactionStatusMeta {
compute_units_consumed,
cost_units,
} = value;
let err = match status {
Ok(()) => None,
Err(err) => Some(generated::TransactionError {
err: bincode::serialize(&err).expect("transaction error to serialize to bytes"),
}),
};
let err = status.err().map(Into::into);
let inner_instructions_none = inner_instructions.is_none();
let inner_instructions = inner_instructions
.unwrap_or_default()
Expand Down Expand Up @@ -559,9 +554,9 @@ impl TryFrom<generated::TransactionStatusMeta> for TransactionStatusMeta {
compute_units_consumed,
cost_units,
} = value;
let status = match &err {
let status = match err {
None => Ok(()),
Some(tx_error) => Err(bincode::deserialize(&tx_error.err)?),
Some(e) => Err(e.into()),
};
let inner_instructions = if inner_instructions_none {
None
Expand Down
Loading