pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-12 19:21:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few migration issues with 2D weights (#1755)

Browse Source 
* Give a max proof size to DMP individual weight processing during migration

* Fix a few migration issues with 2D weights

* Update substrate

* Fixes

* cargo fmt

* Re-add v1 migration

* Set DEFAULT_POV_SIZE to 64 KB

* Use Weight::from_parts

* Update Polkadot

* Fixes
This commit is contained in:
Keith Yeung
2022-10-24 23:03:02 +08:00
committed by GitHub
parent 3d257b770d
commit b566f3b303
8 changed files with 421 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pallets/dmp-queue/src/lib.rs
+6 -1
View File
@@ -38,6 +38,8 @@ use xcm::{
VersionedXcm, MAX_XCM_DECODE_DEPTH,
};
const DEFAULT_POV_SIZE: u64 = 64 * 1024; // 64 KB
#[derive(Copy, Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug, TypeInfo)]
pub struct ConfigData {
/// The maximum amount of weight any individual message may consume. Messages above this weight
@@ -49,7 +51,10 @@ pub struct ConfigData {
impl Default for ConfigData {
fn default() -> Self {
Self {
max_individual: 10u64 * WEIGHT_PER_MILLIS, // 10 ms of execution time maximum by default
max_individual: Weight::from_parts(
10u64 * WEIGHT_PER_MILLIS.ref_time(), // 10 ms of execution time maximum by default
DEFAULT_POV_SIZE, // 64 KB of proof size by default
),
}
}
}
pallets/dmp-queue/src/migration.rs
+5 -2
View File
@@ -16,7 +16,7 @@
//! A module that is responsible for migration of storage.
use crate::{Config, Pallet, Store};
use crate::{Config, Pallet, Store, DEFAULT_POV_SIZE};
use frame_support::{
pallet_prelude::*,
traits::StorageVersion,
@@ -63,7 +63,9 @@ mod v0 {
/// `migrate_to_latest`.
pub fn migrate_to_v1<T: Config>() -> Weight {
let translate = |pre: v0::ConfigData| -> super::ConfigData {
super::ConfigData { max_individual: Weight::from_ref_time(pre.max_individual) }
super::ConfigData {
max_individual: Weight::from_parts(pre.max_individual, DEFAULT_POV_SIZE),
}
};
if let Err(_) = <Pallet<T> as Store>::Configuration::translate(|pre| pre.map(translate)) {
@@ -96,6 +98,7 @@ mod tests {
let v1 = crate::Configuration::<Test>::get();
assert_eq!(v0.max_individual, v1.max_individual.ref_time());
assert_eq!(v1.max_individual.proof_size(), DEFAULT_POV_SIZE);
});
}
}