From a797a1d4ce638c8c4c7867cdc1f73a46aceaf445 Mon Sep 17 00:00:00 2001 From: Daniel Shiposha Date: Mon, 04 Sep 2023 10:38:58 +0000 Subject: [PATCH] feat: add opal gov timings --- --- 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 --- 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) --- 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::*; --- a/runtime/common/config/governance/democracy.rs +++ b/runtime/common/config/governance/democracy.rs @@ -7,10 +7,10 @@ pub MaxProposals: u32 = 100; } -#[cfg(not(feature = "test-env"))] +#[cfg(not(feature = "gov-test-timings"))] use crate::governance_timings::democracy as democracy_timings; -#[cfg(feature = "test-env")] +#[cfg(feature = "gov-test-timings")] pub mod democracy_timings { use super::*; --- 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::*; --- 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::*; --- 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; --- 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, } } --- 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()), --- 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 --- /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; + } +} --- 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::*; --- 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 --- 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 -- gitstuff