Co #14338: pallet-glutton: over-unity consumption (#2730)

* Fix types

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* fix import

* ".git/.scripts/commands/fmt/fmt.sh"

* Fix more

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Actually fix stuff

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* update glutton genesis script

* Update Substrate and Polkadot

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

---------

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: NachoPal <ignacio.palacios.santos@gmail.com>
Co-authored-by: command-bot <>
This commit is contained in:
Oliver Tale-Yazdi
2023-06-13 18:37:47 +02:00
committed by GitHub
parent 49815cee3c
commit 6a4063917d
6 changed files with 431 additions and 395 deletions
@@ -18,7 +18,10 @@
use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
use sc_client_api::UsageProvider;
use sp_arithmetic::Perbill;
use sp_arithmetic::{
traits::{One, Zero},
FixedPointNumber,
};
use core::time::Duration;
use cumulus_primitives_core::ParaId;
@@ -47,15 +50,12 @@ fn benchmark_block_production_compute(c: &mut Criterion) {
group.measurement_time(Duration::from_secs(120));
let mut initialize_glutton_pallet = true;
for (compute_level, storage_level) in &[
(Perbill::from_percent(100), Perbill::from_percent(0)),
(Perbill::from_percent(100), Perbill::from_percent(100)),
] {
for (compute_ratio, storage_ratio) in &[(One::one(), Zero::zero()), (One::one(), One::one())] {
let block = utils::set_glutton_parameters(
&client,
initialize_glutton_pallet,
compute_level,
storage_level,
compute_ratio,
storage_ratio,
);
runtime.block_on(utils::import_block(&client, &block, false));
initialize_glutton_pallet = false;
@@ -68,8 +68,9 @@ fn benchmark_block_production_compute(c: &mut Criterion) {
group.bench_function(
format!(
"(compute = {:?}, storage = {:?}, proof = true) block production",
compute_level, storage_level
"(compute = {:?} %, storage = {:?} %) block import",
compute_ratio.saturating_mul_int(100),
storage_ratio.saturating_mul_int(100)
),
|b| {
b.iter_batched(
@@ -89,8 +90,9 @@ fn benchmark_block_production_compute(c: &mut Criterion) {
group.bench_function(
format!(
"(compute = {:?}, storage = {:?}, proof = false) block production",
compute_level, storage_level
"(compute = {:?} %, storage = {:?} %) block import",
compute_ratio.saturating_mul_int(100),
storage_ratio.saturating_mul_int(100)
),
|b| {
b.iter_batched(