difftreelog
Merge pull request #976 from UniqueNetwork/fix/governance-setup-inconsistencies
in: master
16 files changed
runtime/common/config/governance/council.rsdiffbeforeafterbothno changes
runtime/common/config/governance/democracy.rsdiffbeforeafterbothno changes
runtime/common/config/governance/fellowship.rsdiffbeforeafterbothno changes
runtime/common/config/governance/mod.rsdiffbeforeafterbothno changes
runtime/common/config/governance/scheduler.rsdiffbeforeafterbothno changes
runtime/common/config/governance/technical_committee.rsdiffbeforeafterbothno changes
runtime/common/config/mod.rsdiffbeforeafterboth22pub mod substrate;22pub mod substrate;23pub mod xcm;23pub mod xcm;2425#[cfg(feature = "governance")]26pub mod governance;242725#[cfg(feature = "test-env")]28#[cfg(feature = "test-env")]26pub mod test_pallets;29pub mod test_pallets;runtime/common/config/pallets/collator_selection.rsdiffbeforeafterboth22};22};232324#[cfg(feature = "governance")]24#[cfg(feature = "governance")]25use crate::config::pallets::governance;25use crate::config::governance;262627#[cfg(not(feature = "governance"))]27#[cfg(not(feature = "governance"))]28use frame_system::EnsureRoot;28use frame_system::EnsureRoot;85 type SubAccountDeposit = SubAccountDeposit;85 type SubAccountDeposit = SubAccountDeposit;868687 #[cfg(feature = "governance")]87 #[cfg(feature = "governance")]88 type RegistrarOrigin = governance::RootOrAllTechnicalCommittee;88 type RegistrarOrigin = governance::RootOrTechnicalCommitteeMember;898990 #[cfg(feature = "governance")]90 #[cfg(feature = "governance")]91 type ForceOrigin = governance::RootOrAllTechnicalCommittee;91 type ForceOrigin = governance::RootOrTechnicalCommitteeMember;929293 #[cfg(not(feature = "governance"))]93 #[cfg(not(feature = "governance"))]94 type RegistrarOrigin = EnsureRoot<<Self as frame_system::Config>::AccountId>;94 type RegistrarOrigin = EnsureRoot<<Self as frame_system::Config>::AccountId>;runtime/common/config/pallets/governance/council.rsdiffbeforeafterbothno changes
runtime/common/config/pallets/governance/democracy.rsdiffbeforeafterbothno changes
runtime/common/config/pallets/governance/fellowship.rsdiffbeforeafterbothno changes
runtime/common/config/pallets/governance/mod.rsdiffbeforeafterbothno changes
runtime/common/config/pallets/governance/scheduler.rsdiffbeforeafterbothno changes
runtime/common/config/pallets/governance/technical_committee.rsdiffbeforeafterbothno changes
runtime/common/config/pallets/mod.rsdiffbeforeafterboth36};36};37use sp_arithmetic::Perbill;37use sp_arithmetic::Perbill;3839#[cfg(feature = "governance")]40use crate::runtime_common::config::governance;384139#[cfg(feature = "unique-scheduler")]42#[cfg(feature = "unique-scheduler")]40pub mod scheduler;43pub mod scheduler;51#[cfg(feature = "preimage")]54#[cfg(feature = "preimage")]52pub mod preimage;55pub mod preimage;5354#[cfg(feature = "governance")]55pub mod governance;565657parameter_types! {57parameter_types! {58 pub const CollectionCreationPrice: Balance = 2 * UNIQUE;58 pub const CollectionCreationPrice: Balance = 2 * UNIQUE;runtime/common/config/xcm/mod.rsdiffbeforeafterboth50pub use nativeassets as xcm_assets;50pub use nativeassets as xcm_assets;515152#[cfg(feature = "governance")]52#[cfg(feature = "governance")]53use crate::runtime_common::config::pallets::governance;53use crate::runtime_common::config::governance;545455use xcm_assets::{AssetTransactor, IsReserve, Trader};55use xcm_assets::{AssetTransactor, IsReserve, Trader};5656