Skip to content

[ink_e2e] update Determinism enum to match Substrate definition #1781

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 5 commits into from
May 18, 2023
Merged

[ink_e2e] update Determinism enum to match Substrate definition #1781

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a4b8c1
`[ink_e2e]` update `Determinism` enum to match Substrate definition
ascjones May 18, 2023
7f9b110
fmt
ascjones May 18, 2023
bed9ce7
Fix multi_contract_caller example for new deposit behaviour
ascjones May 18, 2023
002dd0b
Merge branch 'master' into aj/determinism
ascjones May 18, 2023
2b7096f
Reenable examples-test step
ascjones May 18, 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
Next Next commit
[ink_e2e] update Determinism enum to match Substrate definition
  • Loading branch information
@ascjones
ascjones committed May 18, 2023
commit 8a4b8c1ac69f4e02faa48200e1da331542af2432
15 changes: 7 additions & 8 deletions crates/e2e/src/xts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,11 @@ pub struct Transfer<E: Environment, C: subxt::Config> {
)]
#[encode_as_type(crate_path = "subxt::ext::scale_encode")]
pub enum Determinism {
/// The execution should be deterministic and hence no indeterministic instructions
/// are allowed.
/// The execution should be deterministic and hence no indeterministic instructions are
/// allowed.
///
/// Dispatchables always use this mode in order to make on-chain execution
/// deterministic.
Deterministic,
/// Dispatchables always use this mode in order to make on-chain execution deterministic.
Enforced,
/// Allow calling or uploading an indeterministic code.
///
/// This is only possible when calling into `pallet-contracts` directly via
Expand All @@ -138,7 +137,7 @@ pub enum Determinism {
/// # Note
///
/// **Never** use this mode for on-chain execution.
AllowIndeterminism,
Relaxed,
}

/// A raw call to `pallet-contracts`'s `upload`.
Expand Down Expand Up @@ -372,7 +371,7 @@ where
origin: subxt::tx::Signer::account_id(signer).clone(),
code,
storage_deposit_limit,
determinism: Determinism::Deterministic,
determinism: Determinism::Enforced,
};
let func = "ContractsApi_upload_code";
let params = rpc_params![func, Bytes(scale::Encode::encode(&call_request))];
Expand Down Expand Up @@ -404,7 +403,7 @@ where
UploadCode::<E> {
code,
storage_deposit_limit,
determinism: Determinism::Deterministic,
determinism: Determinism::Enforced,
},
)
.unvalidated();
Expand Down