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
21 options:21 options:
22 max-size: "1m"22 max-size: "1m"
23 max-file: "3"23 max-file: "3"
24 command: cargo run --release --features={{ NETWORK }}-runtime,{{ WASM_NAME }}-runtime/test-env -- --dev -linfo --rpc-cors=all --unsafe-rpc-external24 command: cargo run --release --features={{ NETWORK }}-runtime,{{ WASM_NAME }}-runtime/gov-test-timings -- --dev -linfo --rpc-cors=all --unsafe-rpc-external
2525
modified.github/workflows/gov.ymldiffbeforeafterboth
1# Governance tests in --dev mode with test-env feature enabled to reduce gov timings1# Governance tests in --dev mode with gov-test-timings feature enabled to reduce gov timings
2name: governance tests2name: governance tests
33
4# Triger: only call from main workflow(re-usable workflows)4# Triger: only call from main workflow(re-usable workflows)
modifiedruntime/common/config/governance/council.rsdiffbeforeafterboth
5 pub CouncilMaxMembers: u32 = 100;5 pub CouncilMaxMembers: u32 = 100;
6}6}
77
8#[cfg(not(feature = "test-env"))]8#[cfg(not(feature = "gov-test-timings"))]
9use crate::governance_timings::council as council_timings;9use crate::governance_timings::council as council_timings;
1010
11#[cfg(feature = "test-env")]11#[cfg(feature = "gov-test-timings")]
12pub mod council_timings {12pub mod council_timings {
13 use super::*;13 use super::*;
1414
modifiedruntime/common/config/governance/democracy.rsdiffbeforeafterboth
7 pub MaxProposals: u32 = 100;7 pub MaxProposals: u32 = 100;
8}8}
99
10#[cfg(not(feature = "test-env"))]10#[cfg(not(feature = "gov-test-timings"))]
11use crate::governance_timings::democracy as democracy_timings;11use crate::governance_timings::democracy as democracy_timings;
1212
13#[cfg(feature = "test-env")]13#[cfg(feature = "gov-test-timings")]
14pub mod democracy_timings {14pub mod democracy_timings {
15 use super::*;15 use super::*;
1616
modifiedruntime/common/config/governance/fellowship.rsdiffbeforeafterboth
12 pub SubmissionDeposit: Balance = 1000;12 pub SubmissionDeposit: Balance = 1000;
13}13}
1414
15#[cfg(not(feature = "test-env"))]15#[cfg(not(feature = "gov-test-timings"))]
16use crate::governance_timings::fellowship as fellowship_timings;16use crate::governance_timings::fellowship as fellowship_timings;
1717
18#[cfg(feature = "test-env")]18#[cfg(feature = "gov-test-timings")]
19pub mod fellowship_timings {19pub mod fellowship_timings {
20 use super::*;20 use super::*;
2121
modifiedruntime/common/config/governance/technical_committee.rsdiffbeforeafterboth
5 pub TechnicalMaxMembers: u32 = 100;5 pub TechnicalMaxMembers: u32 = 100;
6}6}
77
8#[cfg(not(feature = "test-env"))]8#[cfg(not(feature = "gov-test-timings"))]
9use crate::governance_timings::technical_committee as technical_committee_timings;9use crate::governance_timings::technical_committee as technical_committee_timings;
1010
11#[cfg(feature = "test-env")]11#[cfg(feature = "gov-test-timings")]
12pub mod technical_committee_timings {12pub mod technical_committee_timings {
13 use super::*;13 use super::*;
1414
modifiedruntime/common/config/mod.rsdiffbeforeafterboth
25#[cfg(feature = "governance")]25#[cfg(feature = "governance")]
26pub mod governance;26pub mod governance;
2727
28#[cfg(feature = "test-env")]28#[cfg(feature = "pallet-test-utils")]
29pub mod test_pallets;29pub mod test_pallets;
3030
modifiedruntime/common/construct_runtime.rsdiffbeforeafterboth
136136
137 BalancesAdapter: pallet_balances_adapter = 155,137 BalancesAdapter: pallet_balances_adapter = 155,
138138
139 #[cfg(feature = "test-env")]139 #[cfg(feature = "pallet-test-utils")]
140 TestUtils: pallet_test_utils = 255,140 TestUtils: pallet_test_utils = 255,
141 }141 }
142 }142 }
modifiedruntime/common/maintenance.rsdiffbeforeafterboth
85 | RuntimeCall::Session(_)85 | RuntimeCall::Session(_)
86 | RuntimeCall::Identity(_) => Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),86 | RuntimeCall::Identity(_) => Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
8787
88 #[cfg(feature = "test-env")]88 #[cfg(feature = "pallet-test-utils")]
89 RuntimeCall::TestUtils(_) => Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),89 RuntimeCall::TestUtils(_) => Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
9090
91 _ => Ok(ValidTransaction::default()),91 _ => Ok(ValidTransaction::default()),
modifiedruntime/opal/Cargo.tomldiffbeforeafterboth
23 'collator-selection',23 'collator-selection',
24 'foreign-assets',24 'foreign-assets',
25 'governance',25 'governance',
26 'test-env',26 'pallet-test-utils',
27 'preimage',27 'preimage',
28 'refungible',28 'refungible',
29]29]
156 "pallet-foreign-assets/std",156 "pallet-foreign-assets/std",
157157
158 'pallet-maintenance/std',158 'pallet-maintenance/std',
159 'pallet-test-utils/std',159 'pallet-test-utils?/std',
160]160]
161try-runtime = [161try-runtime = [
162 "pallet-authorship/try-runtime",162 "pallet-authorship/try-runtime",
212 'pallet-scheduler/try-runtime',212 'pallet-scheduler/try-runtime',
213 'pallet-structure/try-runtime',213 'pallet-structure/try-runtime',
214 'pallet-sudo/try-runtime',214 'pallet-sudo/try-runtime',
215 'pallet-test-utils/try-runtime',215 'pallet-test-utils?/try-runtime',
216 'pallet-timestamp/try-runtime',216 'pallet-timestamp/try-runtime',
217 'pallet-transaction-payment/try-runtime',217 'pallet-transaction-payment/try-runtime',
218 'pallet-treasury/try-runtime',218 'pallet-treasury/try-runtime',
226collator-selection = []226collator-selection = []
227foreign-assets = []227foreign-assets = []
228governance = []228governance = []
229test-env = []229gov-test-timings = []
230preimage = []230preimage = []
231refungible = []231refungible = []
232unique-scheduler = []232unique-scheduler = []
345################################################################################345################################################################################
346# Test dependencies346# Test dependencies
347347
348pallet-test-utils = { workspace = true }348pallet-test-utils = { workspace = true, optional = true }
349349
350################################################################################350################################################################################
351# Other Dependencies351# Other Dependencies
addedruntime/opal/src/governance_timings.rsdiffbeforeafterboth

no changes

modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
3838
39mod runtime_common;39mod runtime_common;
4040
41pub mod governance_timings;
41pub mod xcm_barrier;42pub mod xcm_barrier;
4243
43pub use runtime_common::*;44pub use runtime_common::*;
modifiedruntime/quartz/Cargo.tomldiffbeforeafterboth
218preimage = []218preimage = []
219refungible = []219refungible = []
220unique-scheduler = []220unique-scheduler = []
221test-env = []221gov-test-timings = []
222222
223################################################################################223################################################################################
224# local dependencies224# local dependencies
modifiedruntime/unique/Cargo.tomldiffbeforeafterboth
221preimage = []221preimage = []
222refungible = []222refungible = []
223unique-scheduler = []223unique-scheduler = []
224test-env = []224gov-test-timings = []
225225
226################################################################################226################################################################################
227# local dependencies227# local dependencies