Companion for paritytech/substrate#11649, paritytech/polkadot#5729 de…

…mocracy
darwinia-network · Jan 10, 2023 · 89a4aac · 89a4aac
1 parent 24eb417
commit 89a4aac
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/runtime/crab/src/pallets/assets.rs b/runtime/crab/src/pallets/assets.rs
@@ -30,9 +30,9 @@ impl pallet_assets::Config for Runtime {
 	type AssetDeposit = ConstU128<0>;
 	type AssetId = AssetId;
 	type Balance = Balance;
+	type CreateOrigin = EnsureRoot<AccountId>;
 	type Currency = Balances;
 	type Extra = ();
-	type CreateOrigin = EnsureRoot<AccountId>;
 	type ForceOrigin = EnsureRoot<AccountId>;
 	type Freezer = ();
 	type MetadataDepositBase = ConstU128<0>;

diff --git a/runtime/crab/src/pallets/democracy.rs b/runtime/crab/src/pallets/democracy.rs
@@ -45,13 +45,13 @@ impl pallet_democracy::Config for Runtime {
 	type InstantAllowed = ConstBool<true>;
 	type InstantOrigin = RootOrAll<TechnicalCollective>;
 	type LaunchPeriod = ConstU32<{ 28 * DAYS }>;
+	type MaxBlacklisted = ConstU32<100>;
+	type MaxDeposits = ConstU32<100>;
 	type MaxProposals = ConstU32<100>;
 	type MaxVotes = ConstU32<100>;
 	type MinimumDeposit = ConstU128<DARWINIA_PROPOSAL_REQUIREMENT>;
-	type OperationalPreimageOrigin = pallet_collective::EnsureMember<AccountId, CouncilCollective>;
 	type PalletsOrigin = OriginCaller;
-	type PreimageByteDeposit = ConstU128<{ darwinia_deposit(0, 1) }>;
-	type Proposal = RuntimeCall;
+	type Preimages = Preimage;
 	type RuntimeEvent = RuntimeEvent;
 	type Scheduler = Scheduler;
 	type Slash = Treasury;

diff --git a/runtime/darwinia/src/pallets/assets.rs b/runtime/darwinia/src/pallets/assets.rs
@@ -30,9 +30,9 @@ impl pallet_assets::Config for Runtime {
 	type AssetDeposit = ConstU128<0>;
 	type AssetId = AssetId;
 	type Balance = Balance;
+	type CreateOrigin = EnsureRoot<AccountId>;
 	type Currency = Balances;
 	type Extra = ();
-	type CreateOrigin = EnsureRoot<AccountId>;
 	type ForceOrigin = EnsureRoot<AccountId>;
 	type Freezer = ();
 	type MetadataDepositBase = ConstU128<0>;

diff --git a/runtime/darwinia/src/pallets/democracy.rs b/runtime/darwinia/src/pallets/democracy.rs
@@ -45,13 +45,13 @@ impl pallet_democracy::Config for Runtime {
 	type InstantAllowed = ConstBool<true>;
 	type InstantOrigin = RootOrAll<TechnicalCollective>;
 	type LaunchPeriod = ConstU32<{ 28 * DAYS }>;
+	type MaxBlacklisted = ConstU32<100>;
+	type MaxDeposits = ConstU32<100>;
 	type MaxProposals = ConstU32<100>;
 	type MaxVotes = ConstU32<100>;
 	type MinimumDeposit = ConstU128<DARWINIA_PROPOSAL_REQUIREMENT>;
-	type OperationalPreimageOrigin = pallet_collective::EnsureMember<AccountId, CouncilCollective>;
 	type PalletsOrigin = OriginCaller;
-	type PreimageByteDeposit = ConstU128<{ darwinia_deposit(0, 1) }>;
-	type Proposal = RuntimeCall;
+	type Preimages = Preimage;
 	type RuntimeEvent = RuntimeEvent;
 	type Scheduler = Scheduler;
 	type Slash = Treasury;

diff --git a/runtime/pangolin/src/pallets/assets.rs b/runtime/pangolin/src/pallets/assets.rs
@@ -30,9 +30,9 @@ impl pallet_assets::Config for Runtime {
 	type AssetDeposit = ConstU128<0>;
 	type AssetId = AssetId;
 	type Balance = Balance;
+	type CreateOrigin = EnsureRoot<AccountId>;
 	type Currency = Balances;
 	type Extra = ();
-	type CreateOrigin = EnsureRoot<AccountId>;
 	type ForceOrigin = EnsureRoot<AccountId>;
 	type Freezer = ();
 	type MetadataDepositBase = ConstU128<0>;

diff --git a/runtime/pangolin/src/pallets/democracy.rs b/runtime/pangolin/src/pallets/democracy.rs
@@ -45,13 +45,13 @@ impl pallet_democracy::Config for Runtime {
 	type InstantAllowed = ConstBool<true>;
 	type InstantOrigin = RootOrAll<TechnicalCollective>;
 	type LaunchPeriod = ConstU32<{ 28 * DAYS }>;
+	type MaxBlacklisted = ConstU32<100>;
+	type MaxDeposits = ConstU32<100>;
 	type MaxProposals = ConstU32<100>;
 	type MaxVotes = ConstU32<100>;
 	type MinimumDeposit = ConstU128<DARWINIA_PROPOSAL_REQUIREMENT>;
-	type OperationalPreimageOrigin = pallet_collective::EnsureMember<AccountId, CouncilCollective>;
 	type PalletsOrigin = OriginCaller;
-	type PreimageByteDeposit = ConstU128<{ darwinia_deposit(0, 1) }>;
-	type Proposal = RuntimeCall;
+	type Preimages = Preimage;
 	type RuntimeEvent = RuntimeEvent;
 	type Scheduler = Scheduler;
 	type Slash = Treasury;