Skip to content

[E2E] Rename .call to .call_builder #2078

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
cmichi merged 9 commits into from
Jan 30, 2024
Merged

[E2E] Rename .call to .call_builder #2078

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ab9c3dd
Rename `.call` to `.call_builder`
cmichi Jan 29, 2024
ad68cf4
Fix PR number
cmichi Jan 29, 2024
648d8f7
Make `rustfmt` happy
cmichi Jan 29, 2024
4f2fa13
Fix `delegator`
cmichi Jan 29, 2024
99e4db3
Simplify naming
cmichi Jan 30, 2024
1c73216
Fix naming
cmichi Jan 30, 2024
696105b
Fix naming
cmichi Jan 30, 2024
466db6a
Fix naming
cmichi Jan 30, 2024
d2878b7
Merge branch 'master' into cmichi-rename-call-to-call_builder
Jan 30, 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
Prev Previous commit
Next Next commit
Simplify naming
  • Loading branch information
@cmichi
cmichi committed Jan 30, 2024
commit 99e4db39b083b9fa7324f186ce2082e0f36138de
27 changes: 11 additions & 16 deletions integration-tests/call-builder-return-value/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,7 @@ mod call_builder {
.submit()
.await
.expect("instantiate failed");
let mut call_builder_call =
call_builder.call_builder::<CallBuilderReturnValue>();
let mut contract = call_builder.call_builder::<CallBuilderReturnValue>();

let code_hash = client
.upload("incrementer", &origin)
Expand All @@ -148,7 +147,7 @@ mod call_builder {
.code_hash;

let selector = ink::selector_bytes!("get");
let call = call_builder_call.delegate_call(code_hash, selector);
let call = contract.delegate_call(code_hash, selector);
let call_result = client
.call(&origin, &call)
.submit()
Expand All @@ -175,13 +174,12 @@ mod call_builder {
.await;

let mut constructor = CallBuilderReturnValueRef::new(42);
let call_builder = client
let contract = client
.instantiate("call_builder_return_value", &origin, &mut constructor)
.submit()
.await
.expect("instantiate failed");
let mut call_builder_call =
call_builder.call_builder::<CallBuilderReturnValue>();
let mut call_builder = contract.call_builder::<CallBuilderReturnValue>();

let code_hash = client
.upload("incrementer", &origin)
Expand All @@ -191,8 +189,7 @@ mod call_builder {
.code_hash;

let selector = ink::selector_bytes!("get");
let call =
call_builder_call.delegate_call_short_return_type(code_hash, selector);
let call = call_builder.delegate_call_short_return_type(code_hash, selector);
let call_result: Result<i8, String> =
client.call(&origin, &call).dry_run().await?.return_value();

Expand Down Expand Up @@ -220,13 +217,12 @@ mod call_builder {
.await;

let mut constructor = CallBuilderReturnValueRef::new(0);
let call_builder = client
let contract = client
.instantiate("call_builder_return_value", &origin, &mut constructor)
.submit()
.await
.expect("instantiate failed");
let mut call_builder_call =
call_builder.call_builder::<CallBuilderReturnValue>();
let mut call_builder = contract.call_builder::<CallBuilderReturnValue>();

let expected_value = 42;
let mut incrementer_constructor = IncrementerRef::new(expected_value);
Expand All @@ -237,7 +233,7 @@ mod call_builder {
.expect("instantiate failed");

let selector = ink::selector_bytes!("get");
let call = call_builder_call.forward_call(incrementer.account_id, selector);
let call = call_builder.forward_call(incrementer.account_id, selector);
let call_result = client
.call(&origin, &call)
.submit()
Expand All @@ -264,13 +260,12 @@ mod call_builder {
.await;

let mut constructor = CallBuilderReturnValueRef::new(0);
let call_builder = client
let contract = client
.instantiate("call_builder_return_value", &origin, &mut constructor)
.submit()
.await
.expect("instantiate failed");
let mut call_builder_call =
call_builder.call_builder::<CallBuilderReturnValue>();
let mut call_builder = contract.call_builder::<CallBuilderReturnValue>();

let expected_value = 42;
let mut incrementer_constructor = IncrementerRef::new(expected_value);
Expand All @@ -281,7 +276,7 @@ mod call_builder {
.expect("instantiate failed");

let selector = ink::selector_bytes!("get");
let call = call_builder_call
let call = call_builder
.forward_call_short_return_type(incrementer.account_id, selector);
let call_result: Result<i8, String> =
client.call(&origin, &call).dry_run().await?.return_value();
Expand Down
14 changes: 6 additions & 8 deletions integration-tests/lang-err-integration-tests/call-builder-delegate/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,12 @@ mod call_builder {
.await;

let mut constructor = CallBuilderDelegateTestRef::new(Default::default());
let call_builder_contract = client
let contract = client
.instantiate("call_builder_delegate", &origin, &mut constructor)
.submit()
.await
.expect("instantiate failed");
let mut call_builder_call =
call_builder_contract.call_builder::<CallBuilderDelegateTest>();
let mut call_builder = contract.call_builder::<CallBuilderDelegateTest>();

let code_hash = client
.upload("incrementer", &origin)
Expand All @@ -126,7 +125,7 @@ mod call_builder {
.code_hash;

let selector = ink::selector_bytes!("invalid_selector");
let call = call_builder_call.delegate(code_hash, selector);
let call = call_builder.delegate(code_hash, selector);
let call_result = client
.call(&origin, &call)
.submit()
Expand All @@ -150,13 +149,12 @@ mod call_builder {
.await;

let mut constructor = CallBuilderDelegateTestRef::new(Default::default());
let call_builder_contract = client
let contract = client
.instantiate("call_builder_delegate", &origin, &mut constructor)
.submit()
.await
.expect("instantiate failed");
let mut call_builder_call =
call_builder_contract.call_builder::<CallBuilderDelegateTest>();
let mut call_builder = contract.call_builder::<CallBuilderDelegateTest>();

let code_hash = client
.upload("incrementer", &origin)
Expand All @@ -168,7 +166,7 @@ mod call_builder {
// Since `LangError`s can't be handled by the `CallBuilder::invoke()` method
// we expect this to panic.
let selector = ink::selector_bytes!("invalid_selector");
let call = call_builder_call.invoke(code_hash, selector);
let call = call_builder.invoke(code_hash, selector);
let call_result = client.call(&origin, &call).dry_run().await;

if let Err(ink_e2e::Error::CallDryRun(dry_run)) = call_result {
Expand Down
66 changes: 31 additions & 35 deletions integration-tests/lang-err-integration-tests/call-builder/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,12 @@ mod call_builder {
.await;

let mut constructor = CallBuilderTestRef::new();
let call_builder_contract = client
let contract = client
.instantiate("call_builder", &origin, &mut constructor)
.submit()
.await
.expect("instantiate failed");
let mut call_builder_call =
call_builder_contract.call_builder::<CallBuilderTest>();
let mut call_builder = contract.call_builder::<CallBuilderTest>();

let mut flipper_constructor = FlipperRef::new_default();
let flipper = client
Expand All @@ -207,7 +206,7 @@ mod call_builder {
let initial_value = get_call_result.return_value();

let selector = ink::selector_bytes!("invalid_selector");
let call = call_builder_call.call(flipper.account_id, selector);
let call = call_builder.call(flipper.account_id, selector);
let call_result = client
.call(&origin, &call)
.submit()
Expand Down Expand Up @@ -238,12 +237,12 @@ mod call_builder {
.await;

let mut constructor = CallBuilderTestRef::new();
let call_builder = client
let contract = client
.instantiate("call_builder", &origin, &mut constructor)
.submit()
.await
.expect("instantiate failed");
let mut call_builder_call = call_builder.call_builder::<CallBuilderTest>();
let mut call_builder = contract.call_builder::<CallBuilderTest>();

let mut flipper_constructor = FlipperRef::new_default();
let flipper = client
Expand All @@ -255,7 +254,7 @@ mod call_builder {
// Since `LangError`s can't be handled by the `CallBuilder::invoke()` method
// we expect this to panic.
let invalid_selector = [0x00, 0x00, 0x00, 0x00];
let call = call_builder_call.invoke(flipper.account_id, invalid_selector);
let call = call_builder.invoke(flipper.account_id, invalid_selector);
let call_result = client.call(&origin, &call).dry_run().await;

if let Err(ink_e2e::Error::CallDryRun(dry_run)) = call_result {
Expand All @@ -281,12 +280,12 @@ mod call_builder {
.await;

let mut constructor = CallBuilderTestRef::new();
let call_builder = client
let contract = client
.instantiate("call_builder", &origin, &mut constructor)
.submit()
.await
.expect("instantiate failed");
let mut call_builder_call = call_builder.call_builder::<CallBuilderTest>();
let mut call_builder = contract.call_builder::<CallBuilderTest>();

let code_hash = client
.upload("constructors_return_value", &origin)
Expand All @@ -297,8 +296,7 @@ mod call_builder {

let selector = ink::selector_bytes!("new");
let init_value = true;
let call =
call_builder_call.call_instantiate(code_hash, selector, init_value);
let call = call_builder.call_instantiate(code_hash, selector, init_value);
let call_result = client
.call(&origin, &call)
.submit()
Expand All @@ -323,12 +321,12 @@ mod call_builder {
.await;

let mut constructor = CallBuilderTestRef::new();
let call_builder = client
let contract = client
.instantiate("call_builder", &origin, &mut constructor)
.submit()
.await
.expect("instantiate failed");
let mut call_builder_call = call_builder.call_builder::<CallBuilderTest>();
let mut call_builder = contract.call_builder::<CallBuilderTest>();

let code_hash = client
.upload("constructors_return_value", &origin)
Expand All @@ -339,8 +337,7 @@ mod call_builder {

let selector = ink::selector_bytes!("invalid_selector");
let init_value = true;
let call =
call_builder_call.call_instantiate(code_hash, selector, init_value);
let call = call_builder.call_instantiate(code_hash, selector, init_value);
let call_result = client
.call(&origin, &call)
.submit()
Expand All @@ -367,12 +364,12 @@ mod call_builder {
.await;

let mut constructor = CallBuilderTestRef::new();
let call_builder = client
let contract = client
.instantiate("call_builder", &origin, &mut constructor)
.submit()
.await
.expect("instantiate failed");
let mut call_builder_call = call_builder.call_builder::<CallBuilderTest>();
let mut call_builder = contract.call_builder::<CallBuilderTest>();

let code_hash = client
.upload("constructors_return_value", &origin)
Expand All @@ -383,8 +380,7 @@ mod call_builder {

let selector = ink::selector_bytes!("revert_new");
let init_value = false;
let call =
call_builder_call.call_instantiate(code_hash, selector, init_value);
let call = call_builder.call_instantiate(code_hash, selector, init_value);

let call_result = client.call(&origin, &call).dry_run().await;

Expand All @@ -411,12 +407,12 @@ mod call_builder {
.await;

let mut constructor = CallBuilderTestRef::new();
let call_builder = client
let contract = client
.instantiate("call_builder", &origin, &mut constructor)
.submit()
.await
.expect("instantiate failed");
let mut call_builder_call = call_builder.call_builder::<CallBuilderTest>();
let mut call_builder = contract.call_builder::<CallBuilderTest>();

let code_hash = client
.upload("constructors_return_value", &origin)
Expand All @@ -427,8 +423,8 @@ mod call_builder {

let selector = ink::selector_bytes!("try_new");
let init_value = true;
let call = call_builder_call
.call_instantiate_fallible(code_hash, selector, init_value);
let call =
call_builder.call_instantiate_fallible(code_hash, selector, init_value);
let call_result = client
.call(&origin, &call)
.submit()
Expand All @@ -455,12 +451,12 @@ mod call_builder {
.await;

let mut constructor = CallBuilderTestRef::new();
let call_builder = client
let contract = client
.instantiate("call_builder", &origin, &mut constructor)
.submit()
.await
.expect("instantiate failed");
let mut call_builder_call = call_builder.call_builder::<CallBuilderTest>();
let mut call_builder = contract.call_builder::<CallBuilderTest>();

let code_hash = client
.upload("constructors_return_value", &origin)
Expand All @@ -471,8 +467,8 @@ mod call_builder {

let selector = ink::selector_bytes!("try_new");
let init_value = false;
let call = call_builder_call
.call_instantiate_fallible(code_hash, selector, init_value);
let call =
call_builder.call_instantiate_fallible(code_hash, selector, init_value);
let call_result = client
.call(&origin, &call)
.submit()
Expand Down Expand Up @@ -506,12 +502,12 @@ mod call_builder {
.await;

let mut constructor = CallBuilderTestRef::new();
let call_builder = client
let contract = client
.instantiate("call_builder", &origin, &mut constructor)
.submit()
.await
.expect("instantiate failed");
let mut call_builder_call = call_builder.call_builder::<CallBuilderTest>();
let mut call_builder = contract.call_builder::<CallBuilderTest>();

let code_hash = client
.upload("constructors_return_value", &origin)
Expand All @@ -522,8 +518,8 @@ mod call_builder {

let selector = ink::selector_bytes!("try_revert_new");
let init_value = true;
let call = call_builder_call
.call_instantiate_fallible(code_hash, selector, init_value);
let call =
call_builder.call_instantiate_fallible(code_hash, selector, init_value);
let call_result = client.call(&origin, &call).dry_run().await;

if let Err(ink_e2e::Error::CallDryRun(dry_run)) = call_result {
Expand All @@ -549,12 +545,12 @@ mod call_builder {
.await;

let mut constructor = CallBuilderTestRef::new();
let call_builder = client
let contract = client
.instantiate("call_builder", &origin, &mut constructor)
.submit()
.await
.expect("instantiate failed");
let mut call_builder_call = call_builder.call_builder::<CallBuilderTest>();
let mut call_builder = contract.call_builder::<CallBuilderTest>();

let code_hash = client
.upload("constructors_return_value", &origin)
Expand All @@ -565,8 +561,8 @@ mod call_builder {

let selector = ink::selector_bytes!("try_revert_new");
let init_value = false;
let call = call_builder_call
.call_instantiate_fallible(code_hash, selector, init_value);
let call =
call_builder.call_instantiate_fallible(code_hash, selector, init_value);
let call_result = client
.call(&origin, &call)
.submit()
Expand Down
Loading