Skip to content

Implement cross-contract testing in E2E framework #1432

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 13 commits into from
Oct 19, 2022
Merged

Implement cross-contract testing in E2E framework #1432

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6e1c9a8
Update `contracts-node.scale`
cmichi Oct 11, 2022
267eab5
Update dependency paths
cmichi Oct 11, 2022
b6e90a4
Fix wrong label
cmichi Oct 11, 2022
3d45e4f
Add helper function `extract_wasm`
cmichi Oct 11, 2022
572830d
Add helper function `set_current_nonce`
cmichi Oct 11, 2022
8035c36
Fix issue with wrong contract id
cmichi Oct 11, 2022
4bf0e9c
Implement cross-contract testing
cmichi Oct 11, 2022
ca0036a
Adjust TODO comments
cmichi Oct 11, 2022
c6775d2
Add E2E tests for `delegator`
cmichi Oct 11, 2022
66f5d2d
Adapt `contract-transfer` E2E tests for new API
cmichi Oct 11, 2022
52c1ace
Rename `RETURN` to `ReturnType`
cmichi Oct 12, 2022
65d8b26
Build additional contracts only once for all E2E tests
cmichi Oct 12, 2022
ca5a062
Fix field name in error message
cmichi Oct 18, 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
Prev Previous commit
Next Next commit
Rename RETURN to ReturnType
  • Loading branch information
@cmichi
cmichi committed Oct 12, 2022
commit 52c1aceb699e57c9463f3ca47c7b1e1a896f5fe0
9 changes: 5 additions & 4 deletions crates/e2e/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,10 +537,10 @@ where
contract_call: M,
value: E::Balance,
storage_deposit_limit: Option<E::Balance>,
) -> Result<CallResult<C, E, <M as InkMessage>::RETURN>, Error<C, E>>
) -> Result<CallResult<C, E, <M as InkMessage>::ReturnType>, Error<C, E>>
where
M: InkMessage,
<M as InkMessage>::RETURN: scale::Decode,
<M as InkMessage>::ReturnType: scale::Decode,
{
let contract_call: EncodedMessage = contract_call.into();
log_info(&format!("call: {:02X?}", contract_call.0));
Expand Down Expand Up @@ -595,8 +595,9 @@ where
}

let bytes = &dry_run.result.as_ref().unwrap().data;
let value: <M as InkMessage>::RETURN = scale::Decode::decode(&mut bytes.as_ref())
.expect("decoding dry run result to ink! message return type failed");
let value: <M as InkMessage>::ReturnType =
scale::Decode::decode(&mut bytes.as_ref())
.expect("decoding dry run result to ink! message return type failed");

Ok(CallResult {
value,
Expand Down
4 changes: 2 additions & 2 deletions crates/e2e/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ pub type Signer<C> = PairSigner<C, sr25519::Pair>;
// TODO(#1421) Merge this with `InkMessage` to be just `InkSelector`. Requires forking `smart-bench-macro`.
pub trait InkConstructor: scale::Encode {
/// Return type of the constructor.
type RETURN;
type ReturnType;
/// An ink! selector consists of four bytes.
const SELECTOR: [u8; 4];
/// Path to the contract bundle.
Expand All @@ -98,7 +98,7 @@ pub trait InkConstructor: scale::Encode {
/// Trait for contract messages.
pub trait InkMessage: scale::Encode {
/// Return type of the message.
type RETURN;
type ReturnType;
/// An ink! selector consists of four bytes.
const SELECTOR: [u8; 4];
/// Path to the contract bundle.
Expand Down