pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-31 00:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove Default from CandidateDescriptor (#4484)

Browse Source 
* remove Default from CandidateHash

* Apply suggestions from code review

Co-authored-by: Andronik Ordian <write@reusable.software>

* chore: fmt

* remove backed candidate default

* Partial migration away from CandidateReceipt::default

* Remove more CandidateReceipt defaults

* fmt

* Mostly remove CommittedCandidateReceipt default usage

* Remove CommittedCandidateReceipt

* Remove more Defaults from polakdot primitives v1 + fmt

* Remove more Default from polkadot primites v1

* WIP trying to get overseer example + tests to compile

* feat: add primitives test helpers

* reduce deps of helper

* update primitive helpers

* make candidate validation compile

* fixup cargo lock

* make av-store compile

* fixup disputes coordinator tests

* test: fixup backing

* test: fixup approval voting

* fixup bitfield signing

* test: fixup runtime-api

* test: fixup availability dist

* foxi[ pverseer test]

* remove some Defaults, remove bounds from `dummy`

All `fn dummy` in primitives need to be removed anyways.
This aids in the transition.

* it's a test helper, so always use std

* test: fixup parachains runtime tests

Excluding benches.

* fix keyring

* fix paras runtime properly, no more default

* Remove fn dummy() usage from approval voting

* Move TestCandidateBuilder out of av store to test helpers

* Make candidate validation tests pass

* Make most dispute coirdinator tests pass

* Make provisioner tests work

* Make availability recovery tests work with test helpers

* Update polkadot-collator-protocol tests

* Update statement distribution tests

* Update polkadot overseer examples and tests

* Derive default for validation code so we don't break unrelated things

* Make para runtime test pass (no bench)

* Some more work

* chore: cargo fmt

* cargo fix

* avoid some Default::default

* fixup dispute coordinator test

* remove unused crate deps

* remove Default::default wherever possible, replace by dummy_* for the most part

* chore: cargo fmt

* Remove some warnings

* Remove CommittedCandidateReceipt dummy

* Remove CandidateReceipt dummy

* Remove CandidateDescriptor dummy

* Remove commented out code

* Fix para runtime tests

* chore: nightly

* Some updates to the builder

* Dynamically adjust mock head data size

* Make dispute cooridinator tests work

* Fix test candidate_backing_reorders_votes work

* +nightly-2021-10-29 fmt

* Spelling and remove a default use in builder

* Various clean up

* More small updates

* fmt

* More small updates

* Doc comments for test helpers

* cargo run --quiet --release --features=runtime-benchmarks -- benchmark --chain=kusama-dev --steps=50 --repeat=20 --pallet=runtime_parachains::paras_inherent --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --header=./file_header.txt --output=./runtime/kusama/src/weights/runtime_parachains_paras_inherent.rs

* cargo run --quiet --release --features=runtime-benchmarks -- benchmark --chain=polkadot-dev --steps=50 --repeat=20 --pallet=runtime_parachains::paras_inherent --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --header=./file_header.txt --output=./runtime/polkadot/src/weights/runtime_parachains_paras_inherent.rs

* Update lib.rs

* review comments

* fix warnings

* fix test by using correct candidate receipt relay parent

Co-authored-by: Andronik Ordian <write@reusable.software>
Co-authored-by: emostov <32168567+emostov@users.noreply.github.com>
Co-authored-by: Parity Bot <admin@parity.io>
Co-authored-by: Gavin Wood <gavin@parity.io>
This commit is contained in:
Bernhard Schuster
2021-12-10 13:12:07 +01:00
committed by GitHub
parent 916497e5db
commit 0f1a9fb1eb
68 changed files with 993 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/runtime/parachains/src/paras.rs
+42 -24
View File
@@ -456,13 +456,20 @@ pub mod pallet {
new_code: ValidationCode,
) -> DispatchResult {
ensure_root(origin)?;
let prior_code_hash = <Self as Store>::CurrentCodeHash::get(&para).unwrap_or_default();
let maybe_prior_code_hash = <Self as Store>::CurrentCodeHash::get(&para);
let new_code_hash = new_code.hash();
Self::increase_code_ref(&new_code_hash, &new_code);
<Self as Store>::CurrentCodeHash::insert(&para, new_code_hash);
let now = frame_system::Pallet::<T>::block_number();
Self::note_past_code(para, now, now, prior_code_hash);
if let Some(prior_code_hash) = maybe_prior_code_hash {
Self::note_past_code(para, now, now, prior_code_hash);
} else {
log::error!(
"Pallet paras storage is inconsistent, prior code not found {:?}",
&para
);
}
Self::deposit_event(Event::CurrentCodeUpdated(para));
Ok(())
}
@@ -959,8 +966,13 @@ impl<T: Config> Pallet<T> {
<Self as Store>::UpgradeGoAheadSignal::remove(&id);
// Both should always be `Some` in this case, since a code upgrade is scheduled.
let new_code_hash = FutureCodeHash::<T>::take(&id).unwrap_or_default();
let prior_code_hash = CurrentCodeHash::<T>::get(&id).unwrap_or_default();
let new_code_hash = if let Some(new_code_hash) = FutureCodeHash::<T>::take(&id) {
new_code_hash
} else {
log::error!("Missing future code hash for {:?}", &id);
return T::DbWeight::get().reads_writes(3, 1 + 3)
};
let prior_code_hash = CurrentCodeHash::<T>::get(&id);
CurrentCodeHash::<T>::insert(&id, &new_code_hash);
let log = ConsensusLog::ParaUpgradeCode(id, new_code_hash);
@@ -969,7 +981,12 @@ impl<T: Config> Pallet<T> {
// `now` is only used for registering pruning as part of `fn note_past_code`
let now = <frame_system::Pallet<T>>::block_number();
let weight = Self::note_past_code(id, expected_at, now, prior_code_hash);
let weight = if let Some(prior_code_hash) = prior_code_hash {
Self::note_past_code(id, expected_at, now, prior_code_hash)
} else {
log::error!("Missing prior code hash for {:?}", &id);
0 as Weight
};
// add 1 to writes due to heads update.
weight + T::DbWeight::get().reads_writes(3, 1 + 3)
@@ -1078,6 +1095,7 @@ mod tests {
use super::*;
use frame_support::{assert_err, assert_ok};
use primitives::v1::BlockNumber;
use test_helpers::{dummy_head_data, dummy_validation_code};
use crate::{
configuration::HostConfiguration,
@@ -1195,7 +1213,7 @@ mod tests {
1000.into(),
ParaGenesisArgs {
parachain: false,
genesis_head: Default::default(),
genesis_head: dummy_head_data(),
validation_code: ValidationCode(vec![]),
}
),
@@ -1206,7 +1224,7 @@ mod tests {
1000.into(),
ParaGenesisArgs {
parachain: false,
genesis_head: Default::default(),
genesis_head: dummy_head_data(),
validation_code: ValidationCode(vec![1]),
}
));
@@ -1221,16 +1239,16 @@ mod tests {
0u32.into(),
ParaGenesisArgs {
parachain: true,
genesis_head: Default::default(),
validation_code: Default::default(),
genesis_head: dummy_head_data(),
validation_code: dummy_validation_code(),
},
),
(
1u32.into(),
ParaGenesisArgs {
parachain: false,
genesis_head: Default::default(),
validation_code: Default::default(),
genesis_head: dummy_head_data(),
validation_code: dummy_validation_code(),
},
),
];
@@ -1248,7 +1266,7 @@ mod tests {
let id = ParaId::from(0u32);
let at_block: BlockNumber = 10;
let included_block: BlockNumber = 12;
let validation_code = ValidationCode(vec![1, 2, 3]);
let validation_code = ValidationCode(vec![4, 5, 6]);
Paras::increase_code_ref(&validation_code.hash(), &validation_code);
<Paras as Store>::PastCodeHash::insert(&(id, at_block), &validation_code.hash());
@@ -1289,8 +1307,8 @@ mod tests {
0u32.into(),
ParaGenesisArgs {
parachain: true,
genesis_head: Default::default(),
validation_code: Default::default(),
genesis_head: dummy_head_data(),
validation_code: dummy_validation_code(),
},
)];
@@ -1306,7 +1324,7 @@ mod tests {
new_test_ext(genesis_config).execute_with(|| {
let id_a = ParaId::from(0u32);
assert_eq!(Paras::para_head(&id_a), Some(Default::default()));
assert_eq!(Paras::para_head(&id_a), Some(dummy_head_data()));
Paras::note_new_head(id_a, vec![1, 2, 3].into(), 0);
@@ -1322,16 +1340,16 @@ mod tests {
0u32.into(),
ParaGenesisArgs {
parachain: true,
genesis_head: Default::default(),
validation_code: Default::default(),
genesis_head: dummy_head_data(),
validation_code: dummy_validation_code(),
},
),
(
1u32.into(),
ParaGenesisArgs {
parachain: false,
genesis_head: Default::default(),
validation_code: Default::default(),
genesis_head: dummy_head_data(),
validation_code: dummy_validation_code(),
},
),
];
@@ -1375,7 +1393,7 @@ mod tests {
0u32.into(),
ParaGenesisArgs {
parachain: true,
genesis_head: Default::default(),
genesis_head: dummy_head_data(),
validation_code: original_code.clone(),
},
)];
@@ -1482,7 +1500,7 @@ mod tests {
0u32.into(),
ParaGenesisArgs {
parachain: true,
genesis_head: Default::default(),
genesis_head: dummy_head_data(),
validation_code: original_code.clone(),
},
)];
@@ -1570,7 +1588,7 @@ mod tests {
0u32.into(),
ParaGenesisArgs {
parachain: true,
genesis_head: Default::default(),
genesis_head: dummy_head_data(),
validation_code: vec![1, 2, 3].into(),
},
)];
@@ -1625,7 +1643,7 @@ mod tests {
0u32.into(),
ParaGenesisArgs {
parachain: true,
genesis_head: Default::default(),
genesis_head: dummy_head_data(),
validation_code: original_code.clone(),
},
)];
@@ -1808,7 +1826,7 @@ mod tests {
0u32.into(),
ParaGenesisArgs {
parachain: true,
genesis_head: Default::default(),
genesis_head: dummy_head_data(),
validation_code: vec![1, 2, 3].into(),
},
)];