git.delta.rocks / unique-network / refs/commits / 0e75cd977fe9

difftreelog

Merge pull request #978 from UniqueNetwork/fix/opal-governance-timings

Yaroslav Bolyukin2023-09-04parents: #c6d53cc #a797a1d.patch.diff
in: master

14 files changed

modified.docker/docker-compose.gov.j2diffbeforeafterboth
--- a/.docker/docker-compose.gov.j2
+++ b/.docker/docker-compose.gov.j2
@@ -21,4 +21,4 @@
       options:
         max-size: "1m"
         max-file: "3"
-    command: cargo run --release --features={{ NETWORK }}-runtime,{{ WASM_NAME }}-runtime/test-env -- --dev -linfo --rpc-cors=all --unsafe-rpc-external
+    command: cargo run --release --features={{ NETWORK }}-runtime,{{ WASM_NAME }}-runtime/gov-test-timings -- --dev -linfo --rpc-cors=all --unsafe-rpc-external
modified.github/workflows/gov.ymldiffbeforeafterboth
--- a/.github/workflows/gov.yml
+++ b/.github/workflows/gov.yml
@@ -1,4 +1,4 @@
-# Governance tests in --dev mode with test-env feature enabled to reduce gov timings
+# Governance tests in --dev mode with gov-test-timings feature enabled to reduce gov timings
 name: governance tests
 
 # Triger: only call from main workflow(re-usable workflows)
modifiedruntime/common/config/governance/council.rsdiffbeforeafterboth
--- a/runtime/common/config/governance/council.rs
+++ b/runtime/common/config/governance/council.rs
@@ -5,10 +5,10 @@
 	pub CouncilMaxMembers: u32 = 100;
 }
 
-#[cfg(not(feature = "test-env"))]
+#[cfg(not(feature = "gov-test-timings"))]
 use crate::governance_timings::council as council_timings;
 
-#[cfg(feature = "test-env")]
+#[cfg(feature = "gov-test-timings")]
 pub mod council_timings {
 	use super::*;
modifiedruntime/common/config/governance/democracy.rsdiffbeforeafterboth
before · runtime/common/config/governance/democracy.rs
1use super::*;23parameter_types! {4	pub MinimumDeposit: Balance = 0;5	pub InstantAllowed: bool = false;6	pub MaxVotes: u32 = 100;7	pub MaxProposals: u32 = 100;8}910#[cfg(not(feature = "test-env"))]11use crate::governance_timings::democracy as democracy_timings;1213#[cfg(feature = "test-env")]14pub mod democracy_timings {15	use super::*;1617	parameter_types! {18		pub LaunchPeriod: BlockNumber = 35;19		pub VotingPeriod: BlockNumber = 35;20		pub FastTrackVotingPeriod: BlockNumber = 5;21		pub EnactmentPeriod: BlockNumber = 40;22		pub CooloffPeriod: BlockNumber = 35;23	}24}2526impl pallet_democracy::Config for Runtime {27	type RuntimeEvent = RuntimeEvent;28	type Currency = Balances;29	type Slash = Treasury;30	type Scheduler = Scheduler;31	type PalletsOrigin = OriginCaller;32	type Preimages = Preimage;33	type WeightInfo = pallet_democracy::weights::SubstrateWeight<Runtime>;3435	/// The period between a proposal being approved and enacted.36	type EnactmentPeriod = democracy_timings::EnactmentPeriod;3738	/// The minimum period of vote locking.39	type VoteLockingPeriod = democracy_timings::EnactmentPeriod;4041	/// How often new public referenda are launched.42	type LaunchPeriod = democracy_timings::LaunchPeriod;4344	/// How long the referendum will last.45	type VotingPeriod = democracy_timings::VotingPeriod;4647	/// The minimum amount to be used as a deposit for the Fellowship referendum proposal.48	type MinimumDeposit = MinimumDeposit;4950	type SubmitOrigin = EitherOf<51		MapSuccess<EnsureRoot<Self::AccountId>, Replace<fellowship::FellowshipAccountId>>,52		EnsureFellowshipProposition,53	>;5455	type ExternalOrigin = EnsureNever<Self::AccountId>;56	type ExternalMajorityOrigin = EnsureNever<Self::AccountId>;5758	/// Root (for the initial referendums)59	/// or >50% of council can have the next scheduled referendum be a straight default-carries60	/// (NTB) vote (SuperMajorityAgainst).61	type ExternalDefaultOrigin = RootOrMoreThanHalfCouncil;6263	/// A unanimous technical committee can have an ExternalMajority/ExternalDefault vote64	/// be tabled immediately and with a shorter voting/enactment period.65	type FastTrackOrigin = RootOrAllTechnicalCommittee;6667	/// Origin from which the next referendum may be tabled to vote immediately and asynchronously.68	/// Can set a faster voting period.69	type InstantOrigin = EnsureNever<Self::AccountId>;70	type InstantAllowed = InstantAllowed;7172	/// Minimum voting period allowed for a fast-track referendum.73	type FastTrackVotingPeriod = democracy_timings::FastTrackVotingPeriod;7475	/// To cancel a proposal which has been passed, the technical committee must be unanimous or76	/// Root must agree.77	type CancellationOrigin = RootOrAllTechnicalCommittee;7879	/// To cancel a proposal before it has been passed, the technical committee must be unanimous or80	/// Root must agree.81	type CancelProposalOrigin = RootOrAllTechnicalCommittee;8283	/// A unanimous council or Root can blacklist a proposal permanently.84	type BlacklistOrigin = RootOrAllCouncil;8586	// Any single technical committee member may veto a coming council proposal, however they can87	// only do it once and it lasts only for the cooloff period.88	type VetoOrigin = TechnicalCommitteeMember;89	type CooloffPeriod = democracy_timings::CooloffPeriod;9091	/// The maximum number of votes for an account92	type MaxVotes = MaxVotes;9394	/// The maximum number of public proposals that can exist at any time.95	type MaxProposals = MaxProposals;9697	/// The maximum number of deposits a public proposal may have at any time.98	type MaxDeposits = ConstU32<100>;99100	/// The maximum number of items that can be blacklisted.101	type MaxBlacklisted = ConstU32<100>;102}
after · runtime/common/config/governance/democracy.rs
1use super::*;23parameter_types! {4	pub MinimumDeposit: Balance = 0;5	pub InstantAllowed: bool = false;6	pub MaxVotes: u32 = 100;7	pub MaxProposals: u32 = 100;8}910#[cfg(not(feature = "gov-test-timings"))]11use crate::governance_timings::democracy as democracy_timings;1213#[cfg(feature = "gov-test-timings")]14pub mod democracy_timings {15	use super::*;1617	parameter_types! {18		pub LaunchPeriod: BlockNumber = 35;19		pub VotingPeriod: BlockNumber = 35;20		pub FastTrackVotingPeriod: BlockNumber = 5;21		pub EnactmentPeriod: BlockNumber = 40;22		pub CooloffPeriod: BlockNumber = 35;23	}24}2526impl pallet_democracy::Config for Runtime {27	type RuntimeEvent = RuntimeEvent;28	type Currency = Balances;29	type Slash = Treasury;30	type Scheduler = Scheduler;31	type PalletsOrigin = OriginCaller;32	type Preimages = Preimage;33	type WeightInfo = pallet_democracy::weights::SubstrateWeight<Runtime>;3435	/// The period between a proposal being approved and enacted.36	type EnactmentPeriod = democracy_timings::EnactmentPeriod;3738	/// The minimum period of vote locking.39	type VoteLockingPeriod = democracy_timings::EnactmentPeriod;4041	/// How often new public referenda are launched.42	type LaunchPeriod = democracy_timings::LaunchPeriod;4344	/// How long the referendum will last.45	type VotingPeriod = democracy_timings::VotingPeriod;4647	/// The minimum amount to be used as a deposit for the Fellowship referendum proposal.48	type MinimumDeposit = MinimumDeposit;4950	type SubmitOrigin = EitherOf<51		MapSuccess<EnsureRoot<Self::AccountId>, Replace<fellowship::FellowshipAccountId>>,52		EnsureFellowshipProposition,53	>;5455	type ExternalOrigin = EnsureNever<Self::AccountId>;56	type ExternalMajorityOrigin = EnsureNever<Self::AccountId>;5758	/// Root (for the initial referendums)59	/// or >50% of council can have the next scheduled referendum be a straight default-carries60	/// (NTB) vote (SuperMajorityAgainst).61	type ExternalDefaultOrigin = RootOrMoreThanHalfCouncil;6263	/// A unanimous technical committee can have an ExternalMajority/ExternalDefault vote64	/// be tabled immediately and with a shorter voting/enactment period.65	type FastTrackOrigin = RootOrAllTechnicalCommittee;6667	/// Origin from which the next referendum may be tabled to vote immediately and asynchronously.68	/// Can set a faster voting period.69	type InstantOrigin = EnsureNever<Self::AccountId>;70	type InstantAllowed = InstantAllowed;7172	/// Minimum voting period allowed for a fast-track referendum.73	type FastTrackVotingPeriod = democracy_timings::FastTrackVotingPeriod;7475	/// To cancel a proposal which has been passed, the technical committee must be unanimous or76	/// Root must agree.77	type CancellationOrigin = RootOrAllTechnicalCommittee;7879	/// To cancel a proposal before it has been passed, the technical committee must be unanimous or80	/// Root must agree.81	type CancelProposalOrigin = RootOrAllTechnicalCommittee;8283	/// A unanimous council or Root can blacklist a proposal permanently.84	type BlacklistOrigin = RootOrAllCouncil;8586	// Any single technical committee member may veto a coming council proposal, however they can87	// only do it once and it lasts only for the cooloff period.88	type VetoOrigin = TechnicalCommitteeMember;89	type CooloffPeriod = democracy_timings::CooloffPeriod;9091	/// The maximum number of votes for an account92	type MaxVotes = MaxVotes;9394	/// The maximum number of public proposals that can exist at any time.95	type MaxProposals = MaxProposals;9697	/// The maximum number of deposits a public proposal may have at any time.98	type MaxDeposits = ConstU32<100>;99100	/// The maximum number of items that can be blacklisted.101	type MaxBlacklisted = ConstU32<100>;102}
modifiedruntime/common/config/governance/fellowship.rsdiffbeforeafterboth
--- a/runtime/common/config/governance/fellowship.rs
+++ b/runtime/common/config/governance/fellowship.rs
@@ -12,10 +12,10 @@
 	pub SubmissionDeposit: Balance = 1000;
 }
 
-#[cfg(not(feature = "test-env"))]
+#[cfg(not(feature = "gov-test-timings"))]
 use crate::governance_timings::fellowship as fellowship_timings;
 
-#[cfg(feature = "test-env")]
+#[cfg(feature = "gov-test-timings")]
 pub mod fellowship_timings {
 	use super::*;
modifiedruntime/common/config/governance/technical_committee.rsdiffbeforeafterboth
--- a/runtime/common/config/governance/technical_committee.rs
+++ b/runtime/common/config/governance/technical_committee.rs
@@ -5,10 +5,10 @@
 	pub TechnicalMaxMembers: u32 = 100;
 }
 
-#[cfg(not(feature = "test-env"))]
+#[cfg(not(feature = "gov-test-timings"))]
 use crate::governance_timings::technical_committee as technical_committee_timings;
 
-#[cfg(feature = "test-env")]
+#[cfg(feature = "gov-test-timings")]
 pub mod technical_committee_timings {
 	use super::*;
modifiedruntime/common/config/mod.rsdiffbeforeafterboth
--- a/runtime/common/config/mod.rs
+++ b/runtime/common/config/mod.rs
@@ -25,5 +25,5 @@
 #[cfg(feature = "governance")]
 pub mod governance;
 
-#[cfg(feature = "test-env")]
+#[cfg(feature = "pallet-test-utils")]
 pub mod test_pallets;
modifiedruntime/common/construct_runtime.rsdiffbeforeafterboth
--- a/runtime/common/construct_runtime.rs
+++ b/runtime/common/construct_runtime.rs
@@ -136,7 +136,7 @@
 
 				BalancesAdapter: pallet_balances_adapter = 155,
 
-				#[cfg(feature = "test-env")]
+				#[cfg(feature = "pallet-test-utils")]
 				TestUtils: pallet_test_utils = 255,
 			}
 		}
modifiedruntime/common/maintenance.rsdiffbeforeafterboth
--- a/runtime/common/maintenance.rs
+++ b/runtime/common/maintenance.rs
@@ -85,7 +85,7 @@
 				| RuntimeCall::Session(_)
 				| RuntimeCall::Identity(_) => Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
 
-				#[cfg(feature = "test-env")]
+				#[cfg(feature = "pallet-test-utils")]
 				RuntimeCall::TestUtils(_) => Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
 
 				_ => Ok(ValidTransaction::default()),
modifiedruntime/opal/Cargo.tomldiffbeforeafterboth
--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -23,7 +23,7 @@
 	'collator-selection',
 	'foreign-assets',
 	'governance',
-	'test-env',
+	'pallet-test-utils',
 	'preimage',
 	'refungible',
 ]
@@ -156,7 +156,7 @@
 	"pallet-foreign-assets/std",
 
 	'pallet-maintenance/std',
-	'pallet-test-utils/std',
+	'pallet-test-utils?/std',
 ]
 try-runtime = [
 	"pallet-authorship/try-runtime",
@@ -212,7 +212,7 @@
 	'pallet-scheduler/try-runtime',
 	'pallet-structure/try-runtime',
 	'pallet-sudo/try-runtime',
-	'pallet-test-utils/try-runtime',
+	'pallet-test-utils?/try-runtime',
 	'pallet-timestamp/try-runtime',
 	'pallet-transaction-payment/try-runtime',
 	'pallet-treasury/try-runtime',
@@ -226,7 +226,7 @@
 collator-selection = []
 foreign-assets = []
 governance = []
-test-env = []
+gov-test-timings = []
 preimage = []
 refungible = []
 unique-scheduler = []
@@ -345,7 +345,7 @@
 ################################################################################
 # Test dependencies
 
-pallet-test-utils = { workspace = true }
+pallet-test-utils = { workspace = true, optional = true }
 
 ################################################################################
 # Other Dependencies
addedruntime/opal/src/governance_timings.rsdiffbeforeafterboth
--- /dev/null
+++ b/runtime/opal/src/governance_timings.rs
@@ -0,0 +1,54 @@
+use frame_support::parameter_types;
+pub use up_common::{
+	constants::{DAYS, HOURS, MINUTES},
+	types::BlockNumber,
+};
+
+pub mod council {
+	use super::*;
+
+	parameter_types! {
+		pub CouncilMotionDuration: BlockNumber = 1 * HOURS;
+	}
+}
+
+pub mod democracy {
+	use super::*;
+
+	parameter_types! {
+		pub LaunchPeriod: BlockNumber = 1 * HOURS;
+		pub VotingPeriod: BlockNumber = 1 * HOURS;
+		pub FastTrackVotingPeriod: BlockNumber = 10 * MINUTES;
+		pub EnactmentPeriod: BlockNumber = 5 * MINUTES;
+		pub CooloffPeriod: BlockNumber = 1 * HOURS;
+	}
+}
+
+pub mod fellowship {
+	use super::*;
+
+	parameter_types! {
+		pub UndecidingTimeout: BlockNumber = 1 * HOURS;
+	}
+
+	pub mod track {
+		use super::*;
+
+		pub mod democracy_proposals {
+			use super::*;
+
+			pub const PREPARE_PERIOD: BlockNumber = 5 * MINUTES;
+			pub const DECISION_PERIOD: BlockNumber = 1 * HOURS;
+			pub const CONFIRM_PERIOD: BlockNumber = 10 * MINUTES;
+			pub const MIN_ENACTMENT_PERIOD: BlockNumber = 1 * MINUTES;
+		}
+	}
+}
+
+pub mod technical_committee {
+	use super::*;
+
+	parameter_types! {
+		pub TechnicalMotionDuration: BlockNumber = 15 * MINUTES;
+	}
+}
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -38,6 +38,7 @@
 
 mod runtime_common;
 
+pub mod governance_timings;
 pub mod xcm_barrier;
 
 pub use runtime_common::*;
modifiedruntime/quartz/Cargo.tomldiffbeforeafterboth
--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -218,7 +218,7 @@
 preimage = []
 refungible = []
 unique-scheduler = []
-test-env = []
+gov-test-timings = []
 
 ################################################################################
 # local dependencies
modifiedruntime/unique/Cargo.tomldiffbeforeafterboth
--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -221,7 +221,7 @@
 preimage = []
 refungible = []
 unique-scheduler = []
-test-env = []
+gov-test-timings = []
 
 ################################################################################
 # local dependencies