Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Update Cumulus to Latest Substrate and Polkadot Master #1551

Merged
merged 11 commits into from
Sep 1, 2022
Merged

Update Cumulus to Latest Substrate and Polkadot Master #1551

Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
eabe8e9
proposal provider impl for proposals func
muharem Aug 16, 2022
bfd682e
rustfmt
muharem Aug 16, 2022
85ac1f5
impl proposals_count fn
muharem Aug 26, 2022
04aa106
Merge remote-tracking branch 'origin/master' into muharem-collectives…
muharem Sep 1, 2022
15191ec
update lockfile for {"substrate", "polkadot"}
Sep 1, 2022
e4eb288
cargo update pallet-alliance
muharem Sep 1, 2022
88aec65
cargo update deps
shawntabrizi Sep 1, 2022
4ad681b
fix for https://github.com/paritytech/substrate/commit/324a18e3c5cbf3…
shawntabrizi Sep 1, 2022
1047836
update lockfile for {"substrate", "polkadot"}
Sep 1, 2022
480b977
fix try runtime feature flags
shawntabrizi Sep 1, 2022
86405f5
update log target
muharem Sep 1, 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
10 changes: 9 additions & 1 deletion parachains/runtimes/collectives/collectives-polkadot/src/impls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use frame_support::{
weights::Weight,
};
use pallet_alliance::{ProposalIndex, ProposalProvider};
use sp_std::{boxed::Box, marker::PhantomData};
use sp_std::{marker::PhantomData, prelude::*};
use xcm::latest::{Fungibility, Junction, NetworkId, Parent};

type AccountIdOf<T> = <T as frame_system::Config>::AccountId;
Expand Down Expand Up @@ -134,4 +134,12 @@ where
fn proposal_of(proposal_hash: HashOf<T>) -> Option<ProposalOf<T, I>> {
pallet_collective::Pallet::<T, I>::proposal_of(proposal_hash)
}

fn proposals() -> Vec<HashOf<T>> {
pallet_collective::Pallet::<T, I>::proposals().into_inner()
}

fn proposals_count() -> u32 {
pallet_collective::Proposals::<T, I>::decode_len().unwrap_or(0) as u32
}
}