Skip to content

Make CallBuilder and CreateBuilder error handling optional #1602

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
ascjones merged 11 commits into from
Jan 20, 2023
Merged

Make CallBuilder and CreateBuilder error handling optional #1602

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
947cf6c
Make default behaviour of `fire()` to return "raw" return value
HCastano Jan 19, 2023
5ff7fee
Update delegate call codepath to give option to handle `EnvError`
HCastano Jan 19, 2023
503fddb
Update `CreateBuilder::instantiate()`'s default cleaner as well
HCastano Jan 19, 2023
48023ca
Add a breaking change note in the changelog
HCastano Jan 20, 2023
dbf7ac4
Fix delegator example
HCastano Jan 20, 2023
72add05
Drive-by: rename `fire()` method to `invoke()`
HCastano Jan 20, 2023
9819e76
Fix ERC-1155 example
HCastano Jan 20, 2023
ff759b4
Update `Multisig` example
HCastano Jan 20, 2023
0d37811
Fix ContractRef tests
HCastano Jan 20, 2023
155d416
Revert "Drive-by: rename `fire()` method to `invoke()`"
HCastano Jan 20, 2023
22a924d
Use instantiate instead of `try_instantiate` in `delegator`
ascjones Jan 20, 2023
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
Prev Previous commit
Next Next commit
Update Multisig example
  • Loading branch information
@HCastano
HCastano committed Jan 20, 2023
commit ff759b43dcca9ff18c98724f7281f322932c4004
16 changes: 14 additions & 2 deletions examples/multisig/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,13 @@ mod multisig {
ExecutionInput::new(t.selector.into()).push_arg(CallInput(&t.input)),
)
.returns::<()>()
.invoke();
.try_invoke();

let result = match result {
Ok(Ok(_)) => Ok(()),
_ => Err(Error::TransactionFailed),
};

self.env().emit_event(Execution {
transaction: trans_id,
result: result.map(|_| None),
Expand Down Expand Up @@ -579,7 +585,13 @@ mod multisig {
ExecutionInput::new(t.selector.into()).push_arg(CallInput(&t.input)),
)
.returns::<Vec<u8>>()
.invoke();
.try_invoke();

let result = match result {
Ok(Ok(v)) => Ok(v),
_ => Err(Error::TransactionFailed),
};

self.env().emit_event(Execution {
transaction: trans_id,
result: result.clone().map(Some),
Expand Down