Fixes PoV over-estimation (paritytech#13766)

* Align log Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Use max instead of sum Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Make comment ordering deterministic Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Dont add Pov overhead when all is ignored Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Update test pallet weights Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Re-run weights on bm2 Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Fix test Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Actually use new weights Fucked up the merge for this file... Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Update contract weights Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> --------- Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
nathanwhit · Apr 13, 2023 · be58e48 · be58e48
1 parent a6cb6d0
commit be58e48
Show file tree

Hide file tree

Showing 54 changed files with 5,500 additions and 5,508 deletions.
diff --git a/frame/alliance/src/weights.rs b/frame/alliance/src/weights.rs
diff --git a/frame/assets/src/weights.rs b/frame/assets/src/weights.rs
diff --git a/frame/bags-list/src/weights.rs b/frame/bags-list/src/weights.rs
diff --git a/frame/balances/src/weights.rs b/frame/balances/src/weights.rs
diff --git a/frame/benchmarking/pov/src/benchmarking.rs b/frame/benchmarking/pov/src/benchmarking.rs
@@ -192,6 +192,7 @@ frame_benchmarking::benchmarks! {
 
 	// Same as above, but we still expect a mathematical worst case PoV size for the bounded one.
 	storage_value_bounded_and_unbounded_read {
+		(0..1024).for_each(|i| Map1M::<T>::insert(i, i));
 	}: {
 		assert!(UnboundedValue::<T>::get().is_none());
 		assert!(BoundedValue::<T>::get().is_none());

diff --git a/frame/benchmarking/pov/src/tests.rs b/frame/benchmarking/pov/src/tests.rs
@@ -144,9 +144,9 @@ fn unbounded_read_best_effort() {
 fn partial_unbounded_read_best_effort() {
 	let w_unbounded = W::storage_value_unbounded_read().proof_size();
 	let w_bounded = W::storage_value_bounded_read().proof_size();
-	let w_partial = W::storage_value_bounded_and_unbounded_read().proof_size();
+	let w_both = W::storage_value_bounded_and_unbounded_read().proof_size();
 
-	assert_eq!(w_bounded + w_unbounded, w_partial, "The bounded part increases the PoV");
+	assert!(w_both > w_bounded && w_both > w_unbounded, "The bounded part increases the PoV");
 }
 
 #[test]