git.delta.rocks / unique-network / refs/commits / 3e9a8d1b2326

difftreelog

Merge pull request #976 from UniqueNetwork/fix/governance-setup-inconsistencies

Yaroslav Bolyukin2023-09-02parents: #a17eff7 #42448e1.patch.diff
in: master

16 files changed

addedruntime/common/config/governance/council.rsdiffbeforeafterboth

no changes

addedruntime/common/config/governance/democracy.rsdiffbeforeafterboth

no changes

addedruntime/common/config/governance/fellowship.rsdiffbeforeafterboth

no changes

addedruntime/common/config/governance/mod.rsdiffbeforeafterboth

no changes

addedruntime/common/config/governance/scheduler.rsdiffbeforeafterboth

no changes

addedruntime/common/config/governance/technical_committee.rsdiffbeforeafterboth

no changes

modifiedruntime/common/config/mod.rsdiffbeforeafterboth
22pub mod substrate;22pub mod substrate;
23pub mod xcm;23pub mod xcm;
24
25#[cfg(feature = "governance")]
26pub mod governance;
2427
25#[cfg(feature = "test-env")]28#[cfg(feature = "test-env")]
26pub mod test_pallets;29pub mod test_pallets;
modifiedruntime/common/config/pallets/collator_selection.rsdiffbeforeafterboth
22};22};
2323
24#[cfg(feature = "governance")]24#[cfg(feature = "governance")]
25use crate::config::pallets::governance;25use crate::config::governance;
2626
27#[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;
8686
87 #[cfg(feature = "governance")]87 #[cfg(feature = "governance")]
88 type RegistrarOrigin = governance::RootOrAllTechnicalCommittee;88 type RegistrarOrigin = governance::RootOrTechnicalCommitteeMember;
8989
90 #[cfg(feature = "governance")]90 #[cfg(feature = "governance")]
91 type ForceOrigin = governance::RootOrAllTechnicalCommittee;91 type ForceOrigin = governance::RootOrTechnicalCommitteeMember;
9292
93 #[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>;
deletedruntime/common/config/pallets/governance/council.rsdiffbeforeafterboth

no changes

deletedruntime/common/config/pallets/governance/democracy.rsdiffbeforeafterboth

no changes

deletedruntime/common/config/pallets/governance/fellowship.rsdiffbeforeafterboth

no changes

deletedruntime/common/config/pallets/governance/mod.rsdiffbeforeafterboth

no changes

deletedruntime/common/config/pallets/governance/scheduler.rsdiffbeforeafterboth

no changes

deletedruntime/common/config/pallets/governance/technical_committee.rsdiffbeforeafterboth

no changes

modifiedruntime/common/config/pallets/mod.rsdiffbeforeafterboth
36};36};
37use sp_arithmetic::Perbill;37use sp_arithmetic::Perbill;
38
39#[cfg(feature = "governance")]
40use crate::runtime_common::config::governance;
3841
39#[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;
53
54#[cfg(feature = "governance")]
55pub mod governance;
5656
57parameter_types! {57parameter_types! {
58 pub const CollectionCreationPrice: Balance = 2 * UNIQUE;58 pub const CollectionCreationPrice: Balance = 2 * UNIQUE;
modifiedruntime/common/config/xcm/mod.rsdiffbeforeafterboth
50pub use nativeassets as xcm_assets;50pub use nativeassets as xcm_assets;
5151
52#[cfg(feature = "governance")]52#[cfg(feature = "governance")]
53use crate::runtime_common::config::pallets::governance;53use crate::runtime_common::config::governance;
5454
55use xcm_assets::{AssetTransactor, IsReserve, Trader};55use xcm_assets::{AssetTransactor, IsReserve, Trader};
5656