mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-30 19:51:02 +00:00
move paras inherent filtering to runtime (#4028)
* move things around, add filter methods * validator keys, modify availability bitfields according to disputes * simplify, keep the filter -> sanitize generic for both usecases * minor * assure tests still work, reduce changeset * integration * start entropy passing * fixins * compile, 1 failing test * filter with coverage * fixins * Update runtime/parachains/src/paras_inherent.rs Co-authored-by: Robert Habermeier <rphmeier@gmail.com> * slip of the pen * improve test cases * misc * fix * fixins * test avoid extra into() calls in assert_noop! * chores * ff * test fixup superfluous into call * chore: pfmt * improve apply_block_weight_limit to try to maximize the number of sufficiently backed blocks and add extra bitfields in a round-robin fashion * new code treats the lack of backed candidates as ok * Use vrf based entropy * fixup vrf random * add warn * slip of the pen * fixup * assure ordering * rethink apply_weights * mock * use a closure as predicate check * extract and use DisputedBitfield * chore: simplify * remove stray dbg * chore: fmt * address feedback * fix test, halfway there * stage1 * dbg stuff * make group selection align * fix session index * fix wrongly returned candidates * cleanup * chore fmt * fix ensure check * make good case test work * more tests for bitfields * create sanitize_backed_candidates * fixup tests * update guide * add check referenced in the guide * improve weights code * fmt * fixins * Update roadmap/implementers-guide/src/runtime/inclusion.md Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com> * compiling + address review * add comments * fix weight calc * address review comments and test failure * fix * fix: condition * Fix random_sel function * Fix overlength block check * Zeke + Ladi commit for disputes filtering + integration test builder + runtime benchmarks + integration tests * Add benchmarks for code upgrades * Code upgrade bench; Feature gate TestWeightInfo * Try and make CI happier * Feature gate enter test to not(benchmarks) * Make sure no unused imports/fn * refactor, re-use, the beginning * Fix issue with frame benchmarking dep compilation * More precise feature gating for some derives * integrate piece-wise * foo * fixins * chore fmt * fixins * rename const generic * Update runtime/parachains/src/paras_inherent.rs Co-authored-by: Zeke Mostov <z.mostov@gmail.com> * Fix compilation * limit to test * remove unused spam slots * spellcheck * remove a tick, fix a typo * Add Code upgrade weights * comment improvements + >= Co-authored-by: Zeke Mostov <z.mostov@gmail.com> * remove another tick * Update runtime/parachains/src/paras_inherent/benchmarking.rs Co-authored-by: Zeke Mostov <z.mostov@gmail.com> * saturating fixins + some spaces * fix * benchmarking - preliminary results * Add training wheels * Refactor some early exit logic for enter * Gracefully handle filtering bitfields & candidates (#4280) This updates the logic for sanitize_bitfields and sanitize_backed_candidates to never error when there is an issue, but instead to simply skip the problematic items. * Refactor inherent data weight limiting logic (#4287) * Apply suggestions from code review * Update runtime/parachains/src/builder.rs Co-authored-by: Zeke Mostov <z.mostov@gmail.com> * Update runtime/parachains/src/builder.rs * Update runtime/parachains/src/paras_inherent.rs * final pass * Run cargo +nightly-2021-10-29 fmt * Update implementors guide with `sanitize_*` & `enter` (#4294) * Make spell check happier * Make wasm runtimes compile with benchmarks enabled (#4303) * comment stuff out, use old toml * Seems to be working? * Remove feature gating from builder * Remove commented out stuff * Remove generic from digest * Update weight files for runtime Co-authored-by: Robert Habermeier <rphmeier@gmail.com> Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com> Co-authored-by: Lldenaurois <Ljdenaurois@gmail.com> Co-authored-by: Zeke Mostov <z.mostov@gmail.com> Co-authored-by: Bastian Köcher <info@kchr.de>
This commit is contained in:
Bernhard Schuster
committed by
GitHub
GitHub
parent
4a2e412000
commit
1aa6a4aba4
@@ -0,0 +1,206 @@
|
||||
// Copyright 2021 Parity Technologies (UK) Ltd.
|
||||
// This file is part of Polkadot.
|
||||
|
||||
// Polkadot is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Polkadot is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
use super::*;
|
||||
use crate::{inclusion, ParaId};
|
||||
use frame_benchmarking::{benchmarks, impl_benchmark_test_suite};
|
||||
use frame_system::RawOrigin;
|
||||
use sp_std::collections::btree_map::BTreeMap;
|
||||
|
||||
use crate::builder::BenchBuilder;
|
||||
|
||||
benchmarks! {
|
||||
// Variant over `v`, the number of dispute statements in a dispute statement set. This gives the
|
||||
// weight of a single dispute statement set.
|
||||
enter_variable_disputes {
|
||||
let v in 10..BenchBuilder::<T>::fallback_max_validators();
|
||||
|
||||
let scenario = BenchBuilder::<T>::new()
|
||||
.build(Default::default(), &[2], None);
|
||||
|
||||
let mut benchmark = scenario.data.clone();
|
||||
let dispute = benchmark.disputes.pop().unwrap();
|
||||
|
||||
benchmark.bitfields.clear();
|
||||
benchmark.backed_candidates.clear();
|
||||
benchmark.disputes.clear();
|
||||
|
||||
benchmark.disputes.push(dispute);
|
||||
benchmark.disputes.get_mut(0).unwrap().statements.drain(v as usize..);
|
||||
}: enter(RawOrigin::None, benchmark)
|
||||
verify {
|
||||
// Assert that the block was not discarded
|
||||
assert!(Included::<T>::get().is_some());
|
||||
// Assert that there are on-chain votes that got scraped
|
||||
let onchain_votes = OnChainVotes::<T>::get();
|
||||
assert!(onchain_votes.is_some());
|
||||
let vote = onchain_votes.unwrap();
|
||||
// Ensure that the votes are for the correct session
|
||||
assert_eq!(vote.session, scenario._session);
|
||||
}
|
||||
|
||||
// The weight of one bitfield.
|
||||
enter_bitfields {
|
||||
let cores_with_backed: BTreeMap<_, _>
|
||||
= vec![(0, BenchBuilder::<T>::fallback_max_validators())]
|
||||
.into_iter()
|
||||
.collect();
|
||||
|
||||
let scenario = BenchBuilder::<T>::new()
|
||||
.build(cores_with_backed, &[1], None);
|
||||
|
||||
let mut benchmark = scenario.data.clone();
|
||||
let bitfield = benchmark.bitfields.pop().unwrap();
|
||||
|
||||
benchmark.bitfields.clear();
|
||||
benchmark.backed_candidates.clear();
|
||||
benchmark.disputes.clear();
|
||||
|
||||
benchmark.bitfields.push(bitfield);
|
||||
}: enter(RawOrigin::None, benchmark)
|
||||
verify {
|
||||
// Assert that the block was not discarded
|
||||
assert!(Included::<T>::get().is_some());
|
||||
// Assert that there are on-chain votes that got scraped
|
||||
let onchain_votes = OnChainVotes::<T>::get();
|
||||
assert!(onchain_votes.is_some());
|
||||
let vote = onchain_votes.unwrap();
|
||||
// Ensure that the votes are for the correct session
|
||||
assert_eq!(vote.session, scenario._session);
|
||||
}
|
||||
|
||||
// Variant over `v`, the amount of validity votes for a backed candidate. This gives the weight
|
||||
// of a single backed candidate.
|
||||
enter_backed_candidates_variable {
|
||||
// NOTE: the starting value must be over half of `max_validators` so the backed candidate is
|
||||
// not rejected.
|
||||
let v
|
||||
in (BenchBuilder::<T>::fallback_min_validity_votes())
|
||||
..BenchBuilder::<T>::fallback_max_validators();
|
||||
|
||||
let cores_with_backed: BTreeMap<_, _>
|
||||
= vec![(0, v)] // The backed candidate will have `v` validity votes.
|
||||
.into_iter()
|
||||
.collect();
|
||||
|
||||
let scenario = BenchBuilder::<T>::new()
|
||||
.build(cores_with_backed.clone(), &[1], None);
|
||||
|
||||
let mut benchmark = scenario.data.clone();
|
||||
|
||||
// There is 1 backed,
|
||||
assert_eq!(benchmark.backed_candidates.len(), 1);
|
||||
// with `v` validity votes.
|
||||
assert_eq!(benchmark.backed_candidates.get(0).unwrap().validity_votes.len(), v as usize);
|
||||
|
||||
benchmark.bitfields.clear();
|
||||
benchmark.disputes.clear();
|
||||
}: enter(RawOrigin::None, benchmark)
|
||||
verify {
|
||||
let max_validators_per_core = BenchBuilder::<T>::fallback_max_validators_per_core();
|
||||
// Assert that the block was not discarded
|
||||
assert!(Included::<T>::get().is_some());
|
||||
// Assert that there are on-chain votes that got scraped
|
||||
let onchain_votes = OnChainVotes::<T>::get();
|
||||
assert!(onchain_votes.is_some());
|
||||
let vote = onchain_votes.unwrap();
|
||||
// Ensure that the votes are for the correct session
|
||||
assert_eq!(vote.session, scenario._session);
|
||||
// Ensure that there are an expected number of candidates
|
||||
let header = BenchBuilder::<T>::header(scenario._block_number.clone());
|
||||
// Traverse candidates and assert descriptors are as expected
|
||||
for (para_id, backing_validators) in vote.backing_validators_per_candidate.iter().enumerate() {
|
||||
let descriptor = backing_validators.0.descriptor();
|
||||
assert_eq!(ParaId::from(para_id), descriptor.para_id);
|
||||
assert_eq!(header.hash(), descriptor.relay_parent);
|
||||
assert_eq!(backing_validators.1.len(), v as usize);
|
||||
}
|
||||
|
||||
assert_eq!(
|
||||
inclusion::PendingAvailabilityCommitments::<T>::iter().count(),
|
||||
cores_with_backed.len()
|
||||
);
|
||||
assert_eq!(
|
||||
inclusion::PendingAvailability::<T>::iter().count(),
|
||||
cores_with_backed.len()
|
||||
);
|
||||
}
|
||||
|
||||
enter_backed_candidate_code_upgrade {
|
||||
// For now we always assume worst case code size. In the future we could vary over this.
|
||||
let v = crate::configuration::Pallet::<T>::config().max_code_size;
|
||||
|
||||
let cores_with_backed: BTreeMap<_, _>
|
||||
= vec![(0, BenchBuilder::<T>::fallback_min_validity_votes())]
|
||||
.into_iter()
|
||||
.collect();
|
||||
|
||||
let scenario = BenchBuilder::<T>::new()
|
||||
.build(cores_with_backed.clone(), &[1], Some(v));
|
||||
|
||||
let mut benchmark = scenario.data.clone();
|
||||
|
||||
// There is 1 backed
|
||||
assert_eq!(benchmark.backed_candidates.len(), 1);
|
||||
assert_eq!(
|
||||
benchmark.backed_candidates.get(0).unwrap().validity_votes.len() as u32,
|
||||
BenchBuilder::<T>::fallback_min_validity_votes()
|
||||
);
|
||||
|
||||
benchmark.bitfields.clear();
|
||||
benchmark.disputes.clear();
|
||||
crate::paras::benchmarking::generate_disordered_upgrades::<T>();
|
||||
}: enter(RawOrigin::None, benchmark)
|
||||
verify {
|
||||
let max_validators_per_core = BenchBuilder::<T>::fallback_max_validators_per_core();
|
||||
// Assert that the block was not discarded
|
||||
assert!(Included::<T>::get().is_some());
|
||||
// Assert that there are on-chain votes that got scraped
|
||||
let onchain_votes = OnChainVotes::<T>::get();
|
||||
assert!(onchain_votes.is_some());
|
||||
let vote = onchain_votes.unwrap();
|
||||
// Ensure that the votes are for the correct session
|
||||
assert_eq!(vote.session, scenario._session);
|
||||
// Ensure that there are an expected number of candidates
|
||||
let header = BenchBuilder::<T>::header(scenario._block_number.clone());
|
||||
// Traverse candidates and assert descriptors are as expected
|
||||
for (para_id, backing_validators)
|
||||
in vote.backing_validators_per_candidate.iter().enumerate() {
|
||||
let descriptor = backing_validators.0.descriptor();
|
||||
assert_eq!(ParaId::from(para_id), descriptor.para_id);
|
||||
assert_eq!(header.hash(), descriptor.relay_parent);
|
||||
assert_eq!(
|
||||
backing_validators.1.len() as u32,
|
||||
BenchBuilder::<T>::fallback_min_validity_votes()
|
||||
);
|
||||
}
|
||||
|
||||
assert_eq!(
|
||||
inclusion::PendingAvailabilityCommitments::<T>::iter().count(),
|
||||
cores_with_backed.len()
|
||||
);
|
||||
assert_eq!(
|
||||
inclusion::PendingAvailability::<T>::iter().count(),
|
||||
cores_with_backed.len()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
impl_benchmark_test_suite!(
|
||||
Pallet,
|
||||
crate::mock::new_test_ext(Default::default()),
|
||||
crate::mock::Test
|
||||
);
|
||||
Reference in New Issue
Block a user