Skip to content

MESH-2006 multisig improvements part 3 #1693

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
adamdossa merged 3 commits into from
Aug 13, 2024
Merged

MESH-2006 multisig improvements part 3 #1693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb5af8c
Remove multisig.create_or_approve_proposal extrinsic and multisig.Pro…
Neopallium Jul 23, 2024
17b6a6f
Prune multisig proposal when it is executed/rejected.
Neopallium Jul 23, 2024
eb68781
Rename MultiSigTxDone to NextProposalId.
Neopallium Jul 23, 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
1 change: 0 additions & 1 deletion pallets/common/src/traits/multisig.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ use frame_support::pallet_prelude::Weight;

pub trait WeightInfo {
fn create_multisig(signers: u32) -> Weight;
fn create_or_approve_proposal() -> Weight;
fn create_proposal() -> Weight;
fn approve() -> Weight;
fn execute_proposal() -> Weight;
Expand Down
11 changes: 2 additions & 9 deletions pallets/multisig/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ fn generate_multisig_and_proposal_for_alice<T: Config + TestUtilsFn<AccountIdOf<
) -> Result<ProposalSetupResult<T, T::AccountId, T::Proposal, T::MaxSigners>, DispatchError> {
let (alice, multisig, signers, users, _) =
generate_multisig_for_alice::<T>(total_signers, signers_required).unwrap();
let proposal_id = MultiSig::<T>::ms_tx_done(multisig.clone());
let proposal_id = MultiSig::<T>::next_proposal_id(multisig.clone());
let proposal = Box::new(frame_system::Call::<T>::remark { remark: vec![] }.into());
Ok((
alice,
Expand Down Expand Up @@ -169,7 +169,7 @@ fn generate_multisig_and_create_proposal<T: Config + TestUtilsFn<AccountIdOf<T>>

macro_rules! assert_proposal_created {
($proposal_id:ident, $multisig:ident) => {
assert!($proposal_id < MultiSig::<T>::ms_tx_done($multisig));
assert!($proposal_id < MultiSig::<T>::next_proposal_id($multisig));
};
}

Expand Down Expand Up @@ -197,13 +197,6 @@ benchmarks! {
assert!(CreatorDid::<T>::contains_key(multisig), "create_multisig");
}

create_or_approve_proposal {
let (alice, multisig, _, users, proposal_id, proposal, ephemeral_multisig) = generate_multisig_and_proposal_for_alice::<T>(3, 3).unwrap();
}: _(users[0].origin(), ephemeral_multisig, proposal, Some(1337u32.into()))
verify {
assert_proposal_created!(proposal_id, multisig);
}

create_proposal {
let (_, multisig, _, users, proposal_id, proposal, ephemeral_multisig) = generate_multisig_and_proposal_for_alice::<T>(3, 3).unwrap();
}: _(users[0].origin(), ephemeral_multisig, proposal, Some(1337u32.into()))
Expand Down
Loading