Unverified Commit 921d3c62 authored by Alexander Theißen's avatar Alexander Theißen Committed by GitHub
Browse files

Fix compilation of multisig example doctest (#452)

* Fix multisig example doctest

* Fix formatting

* Remove Selector::from_str() usage
parent 5448e07c
Pipeline #96754 failed with stages
in 8 minutes and 3 seconds
...@@ -69,7 +69,11 @@ ...@@ -69,7 +69,11 @@
#![cfg_attr(not(feature = "std"), no_std)] #![cfg_attr(not(feature = "std"), no_std)]
pub use self::multisig_plain::MultisigPlain; pub use self::multisig_plain::{
ConfirmationStatus,
MultisigPlain,
Transaction,
};
use ink_lang as ink; use ink_lang as ink;
#[ink::contract(version = "0.1.0")] #[ink::contract(version = "0.1.0")]
...@@ -141,15 +145,15 @@ mod multisig_plain { ...@@ -141,15 +145,15 @@ mod multisig_plain {
)] )]
pub struct Transaction { pub struct Transaction {
/// The AccountId of the contract that is called in this transaction. /// The AccountId of the contract that is called in this transaction.
callee: AccountId, pub callee: AccountId,
/// The selector bytes that identifies the function of the callee that should be called. /// The selector bytes that identifies the function of the callee that should be called.
selector: [u8; 4], pub selector: [u8; 4],
/// The SCALE encoded parameters that are passed to the called function. /// The SCALE encoded parameters that are passed to the called function.
input: Vec<u8>, pub input: Vec<u8>,
/// The amount of chain balance that is transferred to the callee. /// The amount of chain balance that is transferred to the callee.
transferred_value: Balance, pub transferred_value: Balance,
/// Gas limit for the execution of the call. /// Gas limit for the execution of the call.
gas_limit: u64, pub gas_limit: u64,
} }
#[ink(storage)] #[ink(storage)]
...@@ -288,15 +292,16 @@ mod multisig_plain { ...@@ -288,15 +292,16 @@ mod multisig_plain {
/// ///
/// Since this message must be send by the wallet itself it has to be build as a /// Since this message must be send by the wallet itself it has to be build as a
/// `Transaction` and dispatched through `submit_transaction` + `invoke_transaction`: /// `Transaction` and dispatched through `submit_transaction` + `invoke_transaction`:
/// ```ignore /// ```no_run
/// use ink_core::env::call{CallData, CallParams, Selector}; /// use ink_core::env::{DefaultEnvTypes as Env, AccountId, call::{CallData, CallParams, Selector}};
/// use multisig_plain::{Transaction, ConfirmationStatus};
/// ///
/// // address of an existing MultiSigPlain contract /// // address of an existing MultiSigPlain contract
/// let wallet_id: AccountId = [7u8; 32].into(); /// let wallet_id: AccountId = [7u8; 32].into();
/// ///
/// // first create the transaction that adds `alice` through `add_owner` /// // first create the transaction that adds `alice` through `add_owner`
/// let alice: AccountId = [1u8; 32].into(); /// let alice: AccountId = [1u8; 32].into();
/// let mut call = CallData::new(Selector::from_str("add_owner")); /// let mut call = CallData::new(Selector::new([166, 229, 27, 154])); // add_owner
/// call.push_arg(&alice); /// call.push_arg(&alice);
/// let transaction = Transaction { /// let transaction = Transaction {
/// callee: wallet_id, /// callee: wallet_id,
...@@ -307,13 +312,19 @@ mod multisig_plain { ...@@ -307,13 +312,19 @@ mod multisig_plain {
/// }; /// };
/// ///
/// // submit the transaction for confirmation /// // submit the transaction for confirmation
/// let mut submit = CallParams::eval(wallet_id, Selector::from_str("submit_transaction")); /// let mut submit = CallParams::<Env, _, _>::eval(
/// let (id, _) = submit.push_arg(&transaction) /// wallet_id,
/// Selector::new([86, 244, 13, 223]) // submit_transaction
/// );
/// let (id, _): (u32, ConfirmationStatus) = submit.push_arg(&transaction)
/// .fire() /// .fire()
/// .expect("submit_transaction won't panic."); /// .expect("submit_transaction won't panic.");
/// ///
/// // wait until all required owners have confirmed and then execute the transaction /// // wait until all required owners have confirmed and then execute the transaction
/// let mut invoke = CallParams::eval(wallet_id, Selector::from_str("invoke_transaction")); /// let mut invoke = CallParams::<Env, _, ()>::invoke(
/// wallet_id,
/// Selector::new([185, 50, 225, 236]) // invoke_transaction
/// );
/// invoke.push_arg(&id).fire(); /// invoke.push_arg(&id).fire();
/// ``` /// ```
#[ink(message)] #[ink(message)]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment