From 91b1a4a8118f24ceb76ad0ee9557e30f221bf6b3 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Thu, 2 Mar 2023 22:28:17 +0100 Subject: [PATCH] Deprecate `Weight::from_{ref_time, proof_size}` (#13475) * Deprecate Weight::from_{ref_time, proof_size} Signed-off-by: Oliver Tale-Yazdi * Update templates Signed-off-by: Oliver Tale-Yazdi * Use from_parts Signed-off-by: Oliver Tale-Yazdi * Use from_parts Signed-off-by: Oliver Tale-Yazdi * Dont revert comment :facepalm: Signed-off-by: Oliver Tale-Yazdi * ".git/.scripts/commands/bench/bench.sh" pallet dev pallet_balances * Update weight files Signed-off-by: Oliver Tale-Yazdi * More fixes Signed-off-by: Oliver Tale-Yazdi * Adapt to Master changes Signed-off-by: Oliver Tale-Yazdi --------- Signed-off-by: Oliver Tale-Yazdi Co-authored-by: command-bot <> --- .maintain/frame-weight-template.hbs | 18 +- bin/node/executor/tests/basic.rs | 4 +- bin/node/runtime/src/impls.rs | 20 +- frame/alliance/src/weights.rs | 152 +- frame/assets/src/weights.rs | 236 +-- frame/babe/src/default_weights.rs | 11 +- frame/balances/src/tests.rs | 8 +- frame/balances/src/tests_composite.rs | 2 +- frame/balances/src/tests_local.rs | 2 +- frame/balances/src/tests_reentrancy.rs | 2 +- frame/balances/src/weights.rs | 56 +- frame/beefy/src/default_weights.rs | 11 +- frame/benchmarking/pov/src/weights.rs | 348 ++-- frame/benchmarking/src/weights.rs | 28 +- frame/bounties/src/weights.rs | 12 +- frame/child-bounties/src/tests.rs | 2 +- frame/child-bounties/src/weights.rs | 4 +- frame/collective/src/tests.rs | 6 +- frame/collective/src/weights.rs | 156 +- frame/contracts/src/gas.rs | 12 +- frame/contracts/src/tests.rs | 6 +- frame/contracts/src/wasm/runtime.rs | 8 +- frame/contracts/src/weights.rs | 1640 ++++++++--------- frame/conviction-voting/src/weights.rs | 16 +- frame/democracy/src/weights.rs | 60 +- .../election-provider-multi-phase/src/mock.rs | 5 +- .../src/signed.rs | 8 +- .../src/unsigned.rs | 260 +-- .../src/weights.rs | 56 +- .../election-provider-support/src/weights.rs | 32 +- frame/elections-phragmen/src/weights.rs | 72 +- frame/examples/basic/src/lib.rs | 2 +- frame/examples/basic/src/weights.rs | 16 +- frame/executive/src/lib.rs | 24 +- frame/fast-unstake/src/lib.rs | 4 +- frame/fast-unstake/src/tests.rs | 8 +- frame/fast-unstake/src/weights.rs | 32 +- frame/glutton/src/tests.rs | 2 +- frame/glutton/src/weights.rs | 92 +- frame/grandpa/src/default_weights.rs | 13 +- frame/identity/src/weights.rs | 100 +- frame/im-online/src/weights.rs | 16 +- frame/lottery/src/weights.rs | 8 +- frame/membership/src/weights.rs | 56 +- .../src/default_weights.rs | 2 +- frame/message-queue/src/weights.rs | 80 +- frame/multisig/src/weights.rs | 44 +- frame/nfts/src/weights.rs | 364 ++-- frame/nis/src/mock.rs | 2 +- frame/nis/src/weights.rs | 12 +- frame/node-authorization/src/weights.rs | 18 +- frame/nomination-pools/src/weights.rs | 148 +- frame/preimage/src/weights.rs | 12 +- frame/proxy/src/weights.rs | 56 +- frame/ranked-collective/src/weights.rs | 20 +- frame/recovery/src/weights.rs | 24 +- frame/remark/src/weights.rs | 8 +- frame/scheduler/src/mock.rs | 26 +- frame/scheduler/src/tests.rs | 134 +- frame/scheduler/src/weights.rs | 48 +- frame/staking/src/pallet/impls.rs | 2 +- frame/staking/src/weights.rs | 144 +- frame/state-trie-migration/src/lib.rs | 14 +- frame/state-trie-migration/src/weights.rs | 16 +- frame/sudo/src/tests.rs | 32 +- frame/support/src/dispatch.rs | 80 +- frame/support/src/traits/hooks.rs | 8 +- frame/support/src/weights/block_weights.rs | 2 +- .../support/src/weights/extrinsic_weights.rs | 2 +- frame/support/test/tests/construct_runtime.rs | 4 +- frame/support/test/tests/pallet.rs | 18 +- .../test/tests/pallet_compatibility.rs | 4 +- .../tests/pallet_compatibility_instance.rs | 4 +- frame/support/test/tests/pallet_instance.rs | 18 +- .../system/src/extensions/check_mortality.rs | 2 +- frame/system/src/extensions/check_weight.rs | 76 +- frame/system/src/mock.rs | 8 +- frame/system/src/tests.rs | 34 +- frame/system/src/weights.rs | 40 +- frame/timestamp/src/weights.rs | 4 +- frame/tips/src/weights.rs | 36 +- .../asset-tx-payment/src/mock.rs | 2 +- .../asset-tx-payment/src/tests.rs | 60 +- frame/transaction-payment/src/lib.rs | 2 +- frame/transaction-payment/src/mock.rs | 2 +- frame/transaction-payment/src/tests.rs | 98 +- frame/transaction-payment/src/types.rs | 4 +- frame/transaction-storage/src/weights.rs | 4 +- frame/treasury/src/weights.rs | 12 +- frame/uniques/src/weights.rs | 24 +- frame/utility/src/tests.rs | 14 +- frame/utility/src/weights.rs | 32 +- frame/vesting/src/weights.rs | 64 +- frame/whitelist/src/tests.rs | 2 +- frame/whitelist/src/weights.rs | 12 +- primitives/weights/src/lib.rs | 24 +- primitives/weights/src/weight_v2.rs | 6 +- test-utils/runtime/src/lib.rs | 2 +- .../benchmarking-cli/src/overhead/README.md | 4 +- .../benchmarking-cli/src/overhead/weights.hbs | 2 +- .../benchmarking-cli/src/pallet/template.hbs | 10 +- 101 files changed, 2695 insertions(+), 2857 deletions(-) diff --git a/.maintain/frame-weight-template.hbs b/.maintain/frame-weight-template.hbs index 186e3cb23b333..ba9ac0798844d 100644 --- a/.maintain/frame-weight-template.hbs +++ b/.maintain/frame-weight-template.hbs @@ -52,12 +52,11 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `{{benchmark.base_recorded_proof_size}}{{#each benchmark.component_recorded_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}` // Estimated: `{{benchmark.base_calculated_proof_size}}{{#each benchmark.component_calculated_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}` - // Minimum execution time: {{underscore benchmark.min_execution_time}} nanoseconds. - Weight::from_ref_time({{underscore benchmark.base_weight}}) - .saturating_add(Weight::from_proof_size({{benchmark.base_calculated_proof_size}})) + // Minimum execution time: {{underscore benchmark.min_execution_time}}_000 picoseconds. + Weight::from_parts({{underscore benchmark.base_weight}}, {{benchmark.base_calculated_proof_size}}) {{#each benchmark.component_weight as |cw|}} // Standard Error: {{underscore cw.error}} - .saturating_add(Weight::from_ref_time({{underscore cw.slope}}).saturating_mul({{cw.name}}.into())) + .saturating_add(Weight::from_parts({{underscore cw.slope}}, 0).saturating_mul({{cw.name}}.into())) {{/each}} {{#if (ne benchmark.base_reads "0")}} .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}_u64)) @@ -72,7 +71,7 @@ impl WeightInfo for SubstrateWeight { .saturating_add(T::DbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into()))) {{/each}} {{#each benchmark.component_calculated_proof_size as |cp|}} - .saturating_add(Weight::from_proof_size({{cp.slope}}).saturating_mul({{cp.name}}.into())) + .saturating_add(Weight::from_parts(0, {{cp.slope}}).saturating_mul({{cp.name}}.into())) {{/each}} } {{/each}} @@ -95,12 +94,11 @@ impl WeightInfo for () { // Proof Size summary in bytes: // Measured: `{{benchmark.base_recorded_proof_size}}{{#each benchmark.component_recorded_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}` // Estimated: `{{benchmark.base_calculated_proof_size}}{{#each benchmark.component_calculated_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}` - // Minimum execution time: {{underscore benchmark.min_execution_time}} nanoseconds. - Weight::from_ref_time({{underscore benchmark.base_weight}}) - .saturating_add(Weight::from_proof_size({{benchmark.base_calculated_proof_size}})) + // Minimum execution time: {{underscore benchmark.min_execution_time}}_000 picoseconds. + Weight::from_parts({{underscore benchmark.base_weight}}, {{benchmark.base_calculated_proof_size}}) {{#each benchmark.component_weight as |cw|}} // Standard Error: {{underscore cw.error}} - .saturating_add(Weight::from_ref_time({{underscore cw.slope}}).saturating_mul({{cw.name}}.into())) + .saturating_add(Weight::from_parts({{underscore cw.slope}}, 0).saturating_mul({{cw.name}}.into())) {{/each}} {{#if (ne benchmark.base_reads "0")}} .saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}}_u64)) @@ -115,7 +113,7 @@ impl WeightInfo for () { .saturating_add(RocksDbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into()))) {{/each}} {{#each benchmark.component_calculated_proof_size as |cp|}} - .saturating_add(Weight::from_proof_size({{cp.slope}}).saturating_mul({{cp.name}}.into())) + .saturating_add(Weight::from_parts(0, {{cp.slope}}).saturating_mul({{cp.name}}.into())) {{/each}} } {{/each}} diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs index c19db5af50ee4..ecfe02aa41596 100644 --- a/bin/node/executor/tests/basic.rs +++ b/bin/node/executor/tests/basic.rs @@ -682,7 +682,7 @@ fn deploying_wasm_contract_should_work() { Runtime, > { value: 0, - gas_limit: Weight::from_ref_time(500_000_000), + gas_limit: Weight::from_parts(500_000_000, 0), storage_deposit_limit: None, code: transfer_code, data: Vec::new(), @@ -694,7 +694,7 @@ fn deploying_wasm_contract_should_work() { function: RuntimeCall::Contracts(pallet_contracts::Call::call:: { dest: sp_runtime::MultiAddress::Id(addr.clone()), value: 10, - gas_limit: Weight::from_ref_time(500_000_000), + gas_limit: Weight::from_parts(500_000_000, 0), storage_deposit_limit: None, data: vec![0x00, 0x01, 0x02, 0x03], }), diff --git a/bin/node/runtime/src/impls.rs b/bin/node/runtime/src/impls.rs index 9c606ff075f39..09f7b6a29e0b6 100644 --- a/bin/node/runtime/src/impls.rs +++ b/bin/node/runtime/src/impls.rs @@ -199,8 +199,8 @@ mod multiplier_tests { let fm = Multiplier::saturating_from_rational(1, 2); let test_set = vec![ (Weight::zero(), fm), - (Weight::from_ref_time(100), fm), - (Weight::from_ref_time(1000), fm), + (Weight::from_parts(100, 0), fm), + (Weight::from_parts(1000, 0), fm), (target(), fm), (max_normal() / 2, fm), (max_normal(), fm), @@ -285,7 +285,7 @@ mod multiplier_tests { // almost full. The entire quota of normal transactions is taken. let block_weight = BlockWeights::get().get(DispatchClass::Normal).max_total.unwrap() - - Weight::from_ref_time(100); + Weight::from_parts(100, 0); // Default substrate weight. let tx_weight = frame_support::weights::constants::ExtrinsicBaseWeight::get(); @@ -409,23 +409,23 @@ mod multiplier_tests { #[test] fn weight_to_fee_should_not_overflow_on_large_weights() { - let kb = Weight::from_ref_time(1024); + let kb = Weight::from_parts(1024, 0); let mb = 1024u64 * kb; let max_fm = Multiplier::saturating_from_integer(i128::MAX); // check that for all values it can compute, correctly. vec![ Weight::zero(), - Weight::from_ref_time(1), - Weight::from_ref_time(10), - Weight::from_ref_time(1000), + Weight::from_parts(1, 0), + Weight::from_parts(10, 0), + Weight::from_parts(1000, 0), kb, 10u64 * kb, 100u64 * kb, mb, 10u64 * mb, - Weight::from_ref_time(2147483647), - Weight::from_ref_time(4294967295), + Weight::from_parts(2147483647, 0), + Weight::from_parts(4294967295, 0), BlockWeights::get().max_block / 2, BlockWeights::get().max_block, Weight::MAX / 2, @@ -442,7 +442,7 @@ mod multiplier_tests { // Some values that are all above the target and will cause an increase. let t = target(); - vec![t + Weight::from_ref_time(100), t * 2, t * 4].into_iter().for_each(|i| { + vec![t + Weight::from_parts(100, 0), t * 2, t * 4].into_iter().for_each(|i| { run_with_system_weight(i, || { let fm = runtime_multiplier_update(max_fm); // won't grow. The convert saturates everything. diff --git a/frame/alliance/src/weights.rs b/frame/alliance/src/weights.rs index 6ccf6bed3a5d2..8ff4bad31313c 100644 --- a/frame/alliance/src/weights.rs +++ b/frame/alliance/src/weights.rs @@ -93,15 +93,15 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 28_849 nanoseconds. Weight::from_parts(29_823_933, 11659) // Standard Error: 74 - .saturating_add(Weight::from_ref_time(830).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(830, 0).saturating_mul(b.into())) // Standard Error: 775 - .saturating_add(Weight::from_ref_time(22_980).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(22_980, 0).saturating_mul(m.into())) // Standard Error: 765 - .saturating_add(Weight::from_ref_time(90_520).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(90_520, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) - .saturating_add(Weight::from_proof_size(132).saturating_mul(m.into())) - .saturating_add(Weight::from_proof_size(144).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 132).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 144).saturating_mul(p.into())) } /// Storage: Alliance Members (r:1 w:0) /// Proof: Alliance Members (max_values: None, max_size: Some(3211), added: 5686, mode: MaxEncodedLen) @@ -115,10 +115,10 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 23_570 nanoseconds. Weight::from_parts(25_473_196, 9337) // Standard Error: 824 - .saturating_add(Weight::from_ref_time(54_603).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(54_603, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(64).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) } /// Storage: Alliance Members (r:1 w:0) /// Proof: Alliance Members (max_values: None, max_size: Some(3211), added: 5686, mode: MaxEncodedLen) @@ -139,13 +139,13 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 35_373 nanoseconds. Weight::from_parts(32_763_656, 11979) // Standard Error: 2_041 - .saturating_add(Weight::from_ref_time(52_915).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(52_915, 0).saturating_mul(m.into())) // Standard Error: 1_991 - .saturating_add(Weight::from_ref_time(78_594).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(78_594, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(388).saturating_mul(m.into())) - .saturating_add(Weight::from_proof_size(148).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 388).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 148).saturating_mul(p.into())) } /// Storage: Alliance Members (r:1 w:0) /// Proof: Alliance Members (max_values: None, max_size: Some(3211), added: 5686, mode: MaxEncodedLen) @@ -167,15 +167,15 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 44_590 nanoseconds. Weight::from_parts(43_367_913, 15730) // Standard Error: 71 - .saturating_add(Weight::from_ref_time(819).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(819, 0).saturating_mul(b.into())) // Standard Error: 751 - .saturating_add(Weight::from_ref_time(39_124).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(39_124, 0).saturating_mul(m.into())) // Standard Error: 732 - .saturating_add(Weight::from_ref_time(90_469).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(90_469, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(388).saturating_mul(m.into())) - .saturating_add(Weight::from_proof_size(164).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 388).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 164).saturating_mul(p.into())) } /// Storage: Alliance Members (r:1 w:0) /// Proof: Alliance Members (max_values: None, max_size: Some(3211), added: 5686, mode: MaxEncodedLen) @@ -198,13 +198,13 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 36_796 nanoseconds. Weight::from_parts(34_578_765, 13201) // Standard Error: 1_037 - .saturating_add(Weight::from_ref_time(43_508).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(43_508, 0).saturating_mul(m.into())) // Standard Error: 1_024 - .saturating_add(Weight::from_ref_time(77_084).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(77_084, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(485).saturating_mul(m.into())) - .saturating_add(Weight::from_proof_size(185).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 485).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 185).saturating_mul(p.into())) } /// Storage: Alliance Members (r:1 w:0) /// Proof: Alliance Members (max_values: None, max_size: Some(3211), added: 5686, mode: MaxEncodedLen) @@ -228,15 +228,15 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 36_897 nanoseconds. Weight::from_parts(34_169_666, 13146) // Standard Error: 47 - .saturating_add(Weight::from_ref_time(972).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(972, 0).saturating_mul(b.into())) // Standard Error: 510 - .saturating_add(Weight::from_ref_time(38_084).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(38_084, 0).saturating_mul(m.into())) // Standard Error: 492 - .saturating_add(Weight::from_ref_time(78_576).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(78_576, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(480).saturating_mul(m.into())) - .saturating_add(Weight::from_proof_size(185).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 480).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 185).saturating_mul(p.into())) } /// Storage: Alliance Members (r:2 w:2) /// Proof: Alliance Members (max_values: None, max_size: Some(3211), added: 5686, mode: MaxEncodedLen) @@ -251,9 +251,9 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 29_313 nanoseconds. Weight::from_parts(20_502_244, 12084) // Standard Error: 304 - .saturating_add(Weight::from_ref_time(107_994).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(107_994, 0).saturating_mul(m.into())) // Standard Error: 300 - .saturating_add(Weight::from_ref_time(92_645).saturating_mul(z.into())) + .saturating_add(Weight::from_parts(92_645, 0).saturating_mul(z.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -279,20 +279,20 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 232_895 nanoseconds. Weight::from_parts(233_860_000, 32201) // Standard Error: 19_092 - .saturating_add(Weight::from_ref_time(445_664).saturating_mul(x.into())) + .saturating_add(Weight::from_parts(445_664, 0).saturating_mul(x.into())) // Standard Error: 19_000 - .saturating_add(Weight::from_ref_time(432_571).saturating_mul(y.into())) + .saturating_add(Weight::from_parts(432_571, 0).saturating_mul(y.into())) // Standard Error: 37_965 - .saturating_add(Weight::from_ref_time(9_386_151).saturating_mul(z.into())) + .saturating_add(Weight::from_parts(9_386_151, 0).saturating_mul(z.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(x.into()))) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(y.into()))) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(z.into()))) .saturating_add(T::DbWeight::get().writes(4_u64)) .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(z.into()))) - .saturating_add(Weight::from_proof_size(2587).saturating_mul(x.into())) - .saturating_add(Weight::from_proof_size(2590).saturating_mul(y.into())) - .saturating_add(Weight::from_proof_size(3209).saturating_mul(z.into())) + .saturating_add(Weight::from_parts(0, 2587).saturating_mul(x.into())) + .saturating_add(Weight::from_parts(0, 2590).saturating_mul(y.into())) + .saturating_add(Weight::from_parts(0, 3209).saturating_mul(z.into())) } /// Storage: Alliance Rule (r:0 w:1) /// Proof: Alliance Rule (max_values: Some(1), max_size: Some(87), added: 582, mode: MaxEncodedLen) @@ -301,7 +301,7 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 9_156 nanoseconds. - Weight::from_ref_time(9_376_000) + Weight::from_parts(9_376_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Alliance Announcements (r:1 w:1) @@ -443,9 +443,9 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 7_709 nanoseconds. Weight::from_parts(7_773_000, 29894) // Standard Error: 2_645 - .saturating_add(Weight::from_ref_time(1_266_755).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(1_266_755, 0).saturating_mul(n.into())) // Standard Error: 1_036 - .saturating_add(Weight::from_ref_time(67_359).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(67_359, 0).saturating_mul(l.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -462,9 +462,9 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 7_438 nanoseconds. Weight::from_parts(7_570_000, 29894) // Standard Error: 165_072 - .saturating_add(Weight::from_ref_time(13_026_975).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(13_026_975, 0).saturating_mul(n.into())) // Standard Error: 64_649 - .saturating_add(Weight::from_ref_time(485_565).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(485_565, 0).saturating_mul(l.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -509,15 +509,15 @@ impl WeightInfo for () { // Minimum execution time: 28_849 nanoseconds. Weight::from_parts(29_823_933, 11659) // Standard Error: 74 - .saturating_add(Weight::from_ref_time(830).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(830, 0).saturating_mul(b.into())) // Standard Error: 775 - .saturating_add(Weight::from_ref_time(22_980).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(22_980, 0).saturating_mul(m.into())) // Standard Error: 765 - .saturating_add(Weight::from_ref_time(90_520).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(90_520, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().reads(4_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) - .saturating_add(Weight::from_proof_size(132).saturating_mul(m.into())) - .saturating_add(Weight::from_proof_size(144).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 132).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 144).saturating_mul(p.into())) } /// Storage: Alliance Members (r:1 w:0) /// Proof: Alliance Members (max_values: None, max_size: Some(3211), added: 5686, mode: MaxEncodedLen) @@ -531,10 +531,10 @@ impl WeightInfo for () { // Minimum execution time: 23_570 nanoseconds. Weight::from_parts(25_473_196, 9337) // Standard Error: 824 - .saturating_add(Weight::from_ref_time(54_603).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(54_603, 0).saturating_mul(m.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(64).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) } /// Storage: Alliance Members (r:1 w:0) /// Proof: Alliance Members (max_values: None, max_size: Some(3211), added: 5686, mode: MaxEncodedLen) @@ -555,13 +555,13 @@ impl WeightInfo for () { // Minimum execution time: 35_373 nanoseconds. Weight::from_parts(32_763_656, 11979) // Standard Error: 2_041 - .saturating_add(Weight::from_ref_time(52_915).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(52_915, 0).saturating_mul(m.into())) // Standard Error: 1_991 - .saturating_add(Weight::from_ref_time(78_594).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(78_594, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().reads(4_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(388).saturating_mul(m.into())) - .saturating_add(Weight::from_proof_size(148).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 388).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 148).saturating_mul(p.into())) } /// Storage: Alliance Members (r:1 w:0) /// Proof: Alliance Members (max_values: None, max_size: Some(3211), added: 5686, mode: MaxEncodedLen) @@ -583,15 +583,15 @@ impl WeightInfo for () { // Minimum execution time: 44_590 nanoseconds. Weight::from_parts(43_367_913, 15730) // Standard Error: 71 - .saturating_add(Weight::from_ref_time(819).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(819, 0).saturating_mul(b.into())) // Standard Error: 751 - .saturating_add(Weight::from_ref_time(39_124).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(39_124, 0).saturating_mul(m.into())) // Standard Error: 732 - .saturating_add(Weight::from_ref_time(90_469).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(90_469, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().reads(5_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(388).saturating_mul(m.into())) - .saturating_add(Weight::from_proof_size(164).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 388).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 164).saturating_mul(p.into())) } /// Storage: Alliance Members (r:1 w:0) /// Proof: Alliance Members (max_values: None, max_size: Some(3211), added: 5686, mode: MaxEncodedLen) @@ -614,13 +614,13 @@ impl WeightInfo for () { // Minimum execution time: 36_796 nanoseconds. Weight::from_parts(34_578_765, 13201) // Standard Error: 1_037 - .saturating_add(Weight::from_ref_time(43_508).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(43_508, 0).saturating_mul(m.into())) // Standard Error: 1_024 - .saturating_add(Weight::from_ref_time(77_084).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(77_084, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().reads(5_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(485).saturating_mul(m.into())) - .saturating_add(Weight::from_proof_size(185).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 485).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 185).saturating_mul(p.into())) } /// Storage: Alliance Members (r:1 w:0) /// Proof: Alliance Members (max_values: None, max_size: Some(3211), added: 5686, mode: MaxEncodedLen) @@ -644,15 +644,15 @@ impl WeightInfo for () { // Minimum execution time: 36_897 nanoseconds. Weight::from_parts(34_169_666, 13146) // Standard Error: 47 - .saturating_add(Weight::from_ref_time(972).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(972, 0).saturating_mul(b.into())) // Standard Error: 510 - .saturating_add(Weight::from_ref_time(38_084).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(38_084, 0).saturating_mul(m.into())) // Standard Error: 492 - .saturating_add(Weight::from_ref_time(78_576).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(78_576, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().reads(5_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(480).saturating_mul(m.into())) - .saturating_add(Weight::from_proof_size(185).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 480).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 185).saturating_mul(p.into())) } /// Storage: Alliance Members (r:2 w:2) /// Proof: Alliance Members (max_values: None, max_size: Some(3211), added: 5686, mode: MaxEncodedLen) @@ -667,9 +667,9 @@ impl WeightInfo for () { // Minimum execution time: 29_313 nanoseconds. Weight::from_parts(20_502_244, 12084) // Standard Error: 304 - .saturating_add(Weight::from_ref_time(107_994).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(107_994, 0).saturating_mul(m.into())) // Standard Error: 300 - .saturating_add(Weight::from_ref_time(92_645).saturating_mul(z.into())) + .saturating_add(Weight::from_parts(92_645, 0).saturating_mul(z.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) } @@ -695,20 +695,20 @@ impl WeightInfo for () { // Minimum execution time: 232_895 nanoseconds. Weight::from_parts(233_860_000, 32201) // Standard Error: 19_092 - .saturating_add(Weight::from_ref_time(445_664).saturating_mul(x.into())) + .saturating_add(Weight::from_parts(445_664, 0).saturating_mul(x.into())) // Standard Error: 19_000 - .saturating_add(Weight::from_ref_time(432_571).saturating_mul(y.into())) + .saturating_add(Weight::from_parts(432_571, 0).saturating_mul(y.into())) // Standard Error: 37_965 - .saturating_add(Weight::from_ref_time(9_386_151).saturating_mul(z.into())) + .saturating_add(Weight::from_parts(9_386_151, 0).saturating_mul(z.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(x.into()))) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(y.into()))) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(z.into()))) .saturating_add(RocksDbWeight::get().writes(4_u64)) .saturating_add(RocksDbWeight::get().writes((2_u64).saturating_mul(z.into()))) - .saturating_add(Weight::from_proof_size(2587).saturating_mul(x.into())) - .saturating_add(Weight::from_proof_size(2590).saturating_mul(y.into())) - .saturating_add(Weight::from_proof_size(3209).saturating_mul(z.into())) + .saturating_add(Weight::from_parts(0, 2587).saturating_mul(x.into())) + .saturating_add(Weight::from_parts(0, 2590).saturating_mul(y.into())) + .saturating_add(Weight::from_parts(0, 3209).saturating_mul(z.into())) } /// Storage: Alliance Rule (r:0 w:1) /// Proof: Alliance Rule (max_values: Some(1), max_size: Some(87), added: 582, mode: MaxEncodedLen) @@ -717,7 +717,7 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 9_156 nanoseconds. - Weight::from_ref_time(9_376_000) + Weight::from_parts(9_376_000, 0) .saturating_add(RocksDbWeight::get().writes(1_u64)) } /// Storage: Alliance Announcements (r:1 w:1) @@ -859,9 +859,9 @@ impl WeightInfo for () { // Minimum execution time: 7_709 nanoseconds. Weight::from_parts(7_773_000, 29894) // Standard Error: 2_645 - .saturating_add(Weight::from_ref_time(1_266_755).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(1_266_755, 0).saturating_mul(n.into())) // Standard Error: 1_036 - .saturating_add(Weight::from_ref_time(67_359).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(67_359, 0).saturating_mul(l.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -878,9 +878,9 @@ impl WeightInfo for () { // Minimum execution time: 7_438 nanoseconds. Weight::from_parts(7_570_000, 29894) // Standard Error: 165_072 - .saturating_add(Weight::from_ref_time(13_026_975).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(13_026_975, 0).saturating_mul(n.into())) // Standard Error: 64_649 - .saturating_add(Weight::from_ref_time(485_565).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(485_565, 0).saturating_mul(l.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } diff --git a/frame/assets/src/weights.rs b/frame/assets/src/weights.rs index 27de4fa333687..080800daa6c6b 100644 --- a/frame/assets/src/weights.rs +++ b/frame/assets/src/weights.rs @@ -90,8 +90,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `325` // Estimated: `7268` // Minimum execution time: 27_887 nanoseconds. - Weight::from_ref_time(28_190_000) - .saturating_add(Weight::from_proof_size(7268)) + Weight::from_parts(28_190_000, 0) + .saturating_add(Weight::from_parts(0, 7268)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -102,8 +102,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `153` // Estimated: `3675` // Minimum execution time: 15_059 nanoseconds. - Weight::from_ref_time(15_600_000) - .saturating_add(Weight::from_proof_size(3675)) + Weight::from_parts(15_600_000, 0) + .saturating_add(Weight::from_parts(0, 3675)) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -114,8 +114,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `417` // Estimated: `3675` // Minimum execution time: 15_581 nanoseconds. - Weight::from_ref_time(15_868_000) - .saturating_add(Weight::from_proof_size(3675)) + Weight::from_parts(15_868_000, 0) + .saturating_add(Weight::from_parts(0, 3675)) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -131,15 +131,15 @@ impl WeightInfo for SubstrateWeight { // Measured: `25 + c * (240 ±0)` // Estimated: `8232 + c * (5180 ±0)` // Minimum execution time: 20_167 nanoseconds. - Weight::from_ref_time(20_436_000) - .saturating_add(Weight::from_proof_size(8232)) + Weight::from_parts(20_436_000, 0) + .saturating_add(Weight::from_parts(0, 8232)) // Standard Error: 12_761 - .saturating_add(Weight::from_ref_time(15_535_268).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(15_535_268, 0).saturating_mul(c.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(c.into()))) .saturating_add(T::DbWeight::get().writes(1_u64)) .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(c.into()))) - .saturating_add(Weight::from_proof_size(5180).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(0, 5180).saturating_mul(c.into())) } /// Storage: Assets Asset (r:1 w:1) /// Proof: Assets Asset (max_values: None, max_size: Some(210), added: 2685, mode: MaxEncodedLen) @@ -151,15 +151,15 @@ impl WeightInfo for SubstrateWeight { // Measured: `554 + a * (86 ±0)` // Estimated: `7288 + a * (2623 ±0)` // Minimum execution time: 20_349 nanoseconds. - Weight::from_ref_time(20_482_000) - .saturating_add(Weight::from_proof_size(7288)) + Weight::from_parts(20_482_000, 0) + .saturating_add(Weight::from_parts(0, 7288)) // Standard Error: 9_831 - .saturating_add(Weight::from_ref_time(15_771_918).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(15_771_918, 0).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().writes(1_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(a.into()))) - .saturating_add(Weight::from_proof_size(2623).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(0, 2623).saturating_mul(a.into())) } /// Storage: Assets Asset (r:1 w:1) /// Proof: Assets Asset (max_values: None, max_size: Some(210), added: 2685, mode: MaxEncodedLen) @@ -170,8 +170,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `383` // Estimated: `7280` // Minimum execution time: 15_647 nanoseconds. - Weight::from_ref_time(15_975_000) - .saturating_add(Weight::from_proof_size(7280)) + Weight::from_parts(15_975_000, 0) + .saturating_add(Weight::from_parts(0, 7280)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -184,8 +184,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `383` // Estimated: `7242` // Minimum execution time: 28_383 nanoseconds. - Weight::from_ref_time(29_055_000) - .saturating_add(Weight::from_proof_size(7242)) + Weight::from_parts(29_055_000, 0) + .saturating_add(Weight::from_parts(0, 7242)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -198,8 +198,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `491` // Estimated: `7242` // Minimum execution time: 34_950 nanoseconds. - Weight::from_ref_time(35_296_000) - .saturating_add(Weight::from_proof_size(7242)) + Weight::from_parts(35_296_000, 0) + .saturating_add(Weight::from_parts(0, 7242)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -214,8 +214,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `530` // Estimated: `13412` // Minimum execution time: 50_129 nanoseconds. - Weight::from_ref_time(50_820_000) - .saturating_add(Weight::from_proof_size(13412)) + Weight::from_parts(50_820_000, 0) + .saturating_add(Weight::from_parts(0, 13412)) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -230,8 +230,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `530` // Estimated: `13412` // Minimum execution time: 43_424 nanoseconds. - Weight::from_ref_time(44_080_000) - .saturating_add(Weight::from_proof_size(13412)) + Weight::from_parts(44_080_000, 0) + .saturating_add(Weight::from_parts(0, 13412)) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -246,8 +246,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `530` // Estimated: `13412` // Minimum execution time: 48_919 nanoseconds. - Weight::from_ref_time(50_720_000) - .saturating_add(Weight::from_proof_size(13412)) + Weight::from_parts(50_720_000, 0) + .saturating_add(Weight::from_parts(0, 13412)) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -260,8 +260,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `491` // Estimated: `7242` // Minimum execution time: 19_750 nanoseconds. - Weight::from_ref_time(20_053_000) - .saturating_add(Weight::from_proof_size(7242)) + Weight::from_parts(20_053_000, 0) + .saturating_add(Weight::from_parts(0, 7242)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -274,8 +274,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `491` // Estimated: `7242` // Minimum execution time: 19_672 nanoseconds. - Weight::from_ref_time(19_928_000) - .saturating_add(Weight::from_proof_size(7242)) + Weight::from_parts(19_928_000, 0) + .saturating_add(Weight::from_parts(0, 7242)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -286,8 +286,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `417` // Estimated: `3675` // Minimum execution time: 15_367 nanoseconds. - Weight::from_ref_time(15_726_000) - .saturating_add(Weight::from_proof_size(3675)) + Weight::from_parts(15_726_000, 0) + .saturating_add(Weight::from_parts(0, 3675)) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -298,8 +298,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `417` // Estimated: `3675` // Minimum execution time: 14_814 nanoseconds. - Weight::from_ref_time(15_301_000) - .saturating_add(Weight::from_proof_size(3675)) + Weight::from_parts(15_301_000, 0) + .saturating_add(Weight::from_parts(0, 3675)) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -312,8 +312,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `383` // Estimated: `7280` // Minimum execution time: 17_426 nanoseconds. - Weight::from_ref_time(17_804_000) - .saturating_add(Weight::from_proof_size(7280)) + Weight::from_parts(17_804_000, 0) + .saturating_add(Weight::from_parts(0, 7280)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -324,8 +324,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `383` // Estimated: `3675` // Minimum execution time: 15_935 nanoseconds. - Weight::from_ref_time(16_165_000) - .saturating_add(Weight::from_proof_size(3675)) + Weight::from_parts(16_165_000, 0) + .saturating_add(Weight::from_parts(0, 3675)) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -340,10 +340,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `383` // Estimated: `7280` // Minimum execution time: 26_890 nanoseconds. - Weight::from_ref_time(28_766_510) - .saturating_add(Weight::from_proof_size(7280)) + Weight::from_parts(28_766_510, 0) + .saturating_add(Weight::from_parts(0, 7280)) // Standard Error: 7_444 - .saturating_add(Weight::from_ref_time(3_619).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(3_619, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -356,8 +356,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `579` // Estimated: `7280` // Minimum execution time: 27_146 nanoseconds. - Weight::from_ref_time(27_692_000) - .saturating_add(Weight::from_proof_size(7280)) + Weight::from_parts(27_692_000, 0) + .saturating_add(Weight::from_parts(0, 7280)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -372,8 +372,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `190` // Estimated: `7280` // Minimum execution time: 16_181 nanoseconds. - Weight::from_ref_time(18_317_178) - .saturating_add(Weight::from_proof_size(7280)) + Weight::from_parts(18_317_178, 0) + .saturating_add(Weight::from_parts(0, 7280)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -386,8 +386,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `579` // Estimated: `7280` // Minimum execution time: 26_962 nanoseconds. - Weight::from_ref_time(27_896_000) - .saturating_add(Weight::from_proof_size(7280)) + Weight::from_parts(27_896_000, 0) + .saturating_add(Weight::from_parts(0, 7280)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -398,8 +398,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `383` // Estimated: `3675` // Minimum execution time: 14_394 nanoseconds. - Weight::from_ref_time(14_917_000) - .saturating_add(Weight::from_proof_size(3675)) + Weight::from_parts(14_917_000, 0) + .saturating_add(Weight::from_parts(0, 3675)) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -412,8 +412,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `417` // Estimated: `7288` // Minimum execution time: 30_861 nanoseconds. - Weight::from_ref_time(31_356_000) - .saturating_add(Weight::from_proof_size(7288)) + Weight::from_parts(31_356_000, 0) + .saturating_add(Weight::from_parts(0, 7288)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -430,8 +430,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `700` // Estimated: `17025` // Minimum execution time: 64_510 nanoseconds. - Weight::from_ref_time(65_676_000) - .saturating_add(Weight::from_proof_size(17025)) + Weight::from_parts(65_676_000, 0) + .saturating_add(Weight::from_parts(0, 17025)) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -444,8 +444,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `587` // Estimated: `7288` // Minimum execution time: 32_620 nanoseconds. - Weight::from_ref_time(33_183_000) - .saturating_add(Weight::from_proof_size(7288)) + Weight::from_parts(33_183_000, 0) + .saturating_add(Weight::from_parts(0, 7288)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -458,8 +458,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `587` // Estimated: `7288` // Minimum execution time: 33_277 nanoseconds. - Weight::from_ref_time(34_438_000) - .saturating_add(Weight::from_proof_size(7288)) + Weight::from_parts(34_438_000, 0) + .saturating_add(Weight::from_parts(0, 7288)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -470,8 +470,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `383` // Estimated: `3675` // Minimum execution time: 16_213 nanoseconds. - Weight::from_ref_time(16_575_000) - .saturating_add(Weight::from_proof_size(3675)) + Weight::from_parts(16_575_000, 0) + .saturating_add(Weight::from_parts(0, 3675)) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -488,8 +488,8 @@ impl WeightInfo for () { // Measured: `325` // Estimated: `7268` // Minimum execution time: 27_887 nanoseconds. - Weight::from_ref_time(28_190_000) - .saturating_add(Weight::from_proof_size(7268)) + Weight::from_parts(28_190_000, 0) + .saturating_add(Weight::from_parts(0, 7268)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -500,8 +500,8 @@ impl WeightInfo for () { // Measured: `153` // Estimated: `3675` // Minimum execution time: 15_059 nanoseconds. - Weight::from_ref_time(15_600_000) - .saturating_add(Weight::from_proof_size(3675)) + Weight::from_parts(15_600_000, 0) + .saturating_add(Weight::from_parts(0, 3675)) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -512,8 +512,8 @@ impl WeightInfo for () { // Measured: `417` // Estimated: `3675` // Minimum execution time: 15_581 nanoseconds. - Weight::from_ref_time(15_868_000) - .saturating_add(Weight::from_proof_size(3675)) + Weight::from_parts(15_868_000, 0) + .saturating_add(Weight::from_parts(0, 3675)) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -529,15 +529,15 @@ impl WeightInfo for () { // Measured: `25 + c * (240 ±0)` // Estimated: `8232 + c * (5180 ±0)` // Minimum execution time: 20_167 nanoseconds. - Weight::from_ref_time(20_436_000) - .saturating_add(Weight::from_proof_size(8232)) + Weight::from_parts(20_436_000, 0) + .saturating_add(Weight::from_parts(0, 8232)) // Standard Error: 12_761 - .saturating_add(Weight::from_ref_time(15_535_268).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(15_535_268, 0).saturating_mul(c.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().reads((2_u64).saturating_mul(c.into()))) .saturating_add(RocksDbWeight::get().writes(1_u64)) .saturating_add(RocksDbWeight::get().writes((2_u64).saturating_mul(c.into()))) - .saturating_add(Weight::from_proof_size(5180).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(0, 5180).saturating_mul(c.into())) } /// Storage: Assets Asset (r:1 w:1) /// Proof: Assets Asset (max_values: None, max_size: Some(210), added: 2685, mode: MaxEncodedLen) @@ -549,15 +549,15 @@ impl WeightInfo for () { // Measured: `554 + a * (86 ±0)` // Estimated: `7288 + a * (2623 ±0)` // Minimum execution time: 20_349 nanoseconds. - Weight::from_ref_time(20_482_000) - .saturating_add(Weight::from_proof_size(7288)) + Weight::from_parts(20_482_000, 0) + .saturating_add(Weight::from_parts(0, 7288)) // Standard Error: 9_831 - .saturating_add(Weight::from_ref_time(15_771_918).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(15_771_918, 0).saturating_mul(a.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(a.into()))) .saturating_add(RocksDbWeight::get().writes(1_u64)) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(a.into()))) - .saturating_add(Weight::from_proof_size(2623).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(0, 2623).saturating_mul(a.into())) } /// Storage: Assets Asset (r:1 w:1) /// Proof: Assets Asset (max_values: None, max_size: Some(210), added: 2685, mode: MaxEncodedLen) @@ -568,8 +568,8 @@ impl WeightInfo for () { // Measured: `383` // Estimated: `7280` // Minimum execution time: 15_647 nanoseconds. - Weight::from_ref_time(15_975_000) - .saturating_add(Weight::from_proof_size(7280)) + Weight::from_parts(15_975_000, 0) + .saturating_add(Weight::from_parts(0, 7280)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -582,8 +582,8 @@ impl WeightInfo for () { // Measured: `383` // Estimated: `7242` // Minimum execution time: 28_383 nanoseconds. - Weight::from_ref_time(29_055_000) - .saturating_add(Weight::from_proof_size(7242)) + Weight::from_parts(29_055_000, 0) + .saturating_add(Weight::from_parts(0, 7242)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -596,8 +596,8 @@ impl WeightInfo for () { // Measured: `491` // Estimated: `7242` // Minimum execution time: 34_950 nanoseconds. - Weight::from_ref_time(35_296_000) - .saturating_add(Weight::from_proof_size(7242)) + Weight::from_parts(35_296_000, 0) + .saturating_add(Weight::from_parts(0, 7242)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -612,8 +612,8 @@ impl WeightInfo for () { // Measured: `530` // Estimated: `13412` // Minimum execution time: 50_129 nanoseconds. - Weight::from_ref_time(50_820_000) - .saturating_add(Weight::from_proof_size(13412)) + Weight::from_parts(50_820_000, 0) + .saturating_add(Weight::from_parts(0, 13412)) .saturating_add(RocksDbWeight::get().reads(4_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) } @@ -628,8 +628,8 @@ impl WeightInfo for () { // Measured: `530` // Estimated: `13412` // Minimum execution time: 43_424 nanoseconds. - Weight::from_ref_time(44_080_000) - .saturating_add(Weight::from_proof_size(13412)) + Weight::from_parts(44_080_000, 0) + .saturating_add(Weight::from_parts(0, 13412)) .saturating_add(RocksDbWeight::get().reads(4_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) } @@ -644,8 +644,8 @@ impl WeightInfo for () { // Measured: `530` // Estimated: `13412` // Minimum execution time: 48_919 nanoseconds. - Weight::from_ref_time(50_720_000) - .saturating_add(Weight::from_proof_size(13412)) + Weight::from_parts(50_720_000, 0) + .saturating_add(Weight::from_parts(0, 13412)) .saturating_add(RocksDbWeight::get().reads(4_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) } @@ -658,8 +658,8 @@ impl WeightInfo for () { // Measured: `491` // Estimated: `7242` // Minimum execution time: 19_750 nanoseconds. - Weight::from_ref_time(20_053_000) - .saturating_add(Weight::from_proof_size(7242)) + Weight::from_parts(20_053_000, 0) + .saturating_add(Weight::from_parts(0, 7242)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -672,8 +672,8 @@ impl WeightInfo for () { // Measured: `491` // Estimated: `7242` // Minimum execution time: 19_672 nanoseconds. - Weight::from_ref_time(19_928_000) - .saturating_add(Weight::from_proof_size(7242)) + Weight::from_parts(19_928_000, 0) + .saturating_add(Weight::from_parts(0, 7242)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -684,8 +684,8 @@ impl WeightInfo for () { // Measured: `417` // Estimated: `3675` // Minimum execution time: 15_367 nanoseconds. - Weight::from_ref_time(15_726_000) - .saturating_add(Weight::from_proof_size(3675)) + Weight::from_parts(15_726_000, 0) + .saturating_add(Weight::from_parts(0, 3675)) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -696,8 +696,8 @@ impl WeightInfo for () { // Measured: `417` // Estimated: `3675` // Minimum execution time: 14_814 nanoseconds. - Weight::from_ref_time(15_301_000) - .saturating_add(Weight::from_proof_size(3675)) + Weight::from_parts(15_301_000, 0) + .saturating_add(Weight::from_parts(0, 3675)) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -710,8 +710,8 @@ impl WeightInfo for () { // Measured: `383` // Estimated: `7280` // Minimum execution time: 17_426 nanoseconds. - Weight::from_ref_time(17_804_000) - .saturating_add(Weight::from_proof_size(7280)) + Weight::from_parts(17_804_000, 0) + .saturating_add(Weight::from_parts(0, 7280)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -722,8 +722,8 @@ impl WeightInfo for () { // Measured: `383` // Estimated: `3675` // Minimum execution time: 15_935 nanoseconds. - Weight::from_ref_time(16_165_000) - .saturating_add(Weight::from_proof_size(3675)) + Weight::from_parts(16_165_000, 0) + .saturating_add(Weight::from_parts(0, 3675)) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -738,10 +738,10 @@ impl WeightInfo for () { // Measured: `383` // Estimated: `7280` // Minimum execution time: 26_890 nanoseconds. - Weight::from_ref_time(28_766_510) - .saturating_add(Weight::from_proof_size(7280)) + Weight::from_parts(28_766_510, 0) + .saturating_add(Weight::from_parts(0, 7280)) // Standard Error: 7_444 - .saturating_add(Weight::from_ref_time(3_619).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(3_619, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -754,8 +754,8 @@ impl WeightInfo for () { // Measured: `579` // Estimated: `7280` // Minimum execution time: 27_146 nanoseconds. - Weight::from_ref_time(27_692_000) - .saturating_add(Weight::from_proof_size(7280)) + Weight::from_parts(27_692_000, 0) + .saturating_add(Weight::from_parts(0, 7280)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -770,8 +770,8 @@ impl WeightInfo for () { // Measured: `190` // Estimated: `7280` // Minimum execution time: 16_181 nanoseconds. - Weight::from_ref_time(18_317_178) - .saturating_add(Weight::from_proof_size(7280)) + Weight::from_parts(18_317_178, 0) + .saturating_add(Weight::from_parts(0, 7280)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -784,8 +784,8 @@ impl WeightInfo for () { // Measured: `579` // Estimated: `7280` // Minimum execution time: 26_962 nanoseconds. - Weight::from_ref_time(27_896_000) - .saturating_add(Weight::from_proof_size(7280)) + Weight::from_parts(27_896_000, 0) + .saturating_add(Weight::from_parts(0, 7280)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -796,8 +796,8 @@ impl WeightInfo for () { // Measured: `383` // Estimated: `3675` // Minimum execution time: 14_394 nanoseconds. - Weight::from_ref_time(14_917_000) - .saturating_add(Weight::from_proof_size(3675)) + Weight::from_parts(14_917_000, 0) + .saturating_add(Weight::from_parts(0, 3675)) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -810,8 +810,8 @@ impl WeightInfo for () { // Measured: `417` // Estimated: `7288` // Minimum execution time: 30_861 nanoseconds. - Weight::from_ref_time(31_356_000) - .saturating_add(Weight::from_proof_size(7288)) + Weight::from_parts(31_356_000, 0) + .saturating_add(Weight::from_parts(0, 7288)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -828,8 +828,8 @@ impl WeightInfo for () { // Measured: `700` // Estimated: `17025` // Minimum execution time: 64_510 nanoseconds. - Weight::from_ref_time(65_676_000) - .saturating_add(Weight::from_proof_size(17025)) + Weight::from_parts(65_676_000, 0) + .saturating_add(Weight::from_parts(0, 17025)) .saturating_add(RocksDbWeight::get().reads(5_u64)) .saturating_add(RocksDbWeight::get().writes(5_u64)) } @@ -842,8 +842,8 @@ impl WeightInfo for () { // Measured: `587` // Estimated: `7288` // Minimum execution time: 32_620 nanoseconds. - Weight::from_ref_time(33_183_000) - .saturating_add(Weight::from_proof_size(7288)) + Weight::from_parts(33_183_000, 0) + .saturating_add(Weight::from_parts(0, 7288)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -856,8 +856,8 @@ impl WeightInfo for () { // Measured: `587` // Estimated: `7288` // Minimum execution time: 33_277 nanoseconds. - Weight::from_ref_time(34_438_000) - .saturating_add(Weight::from_proof_size(7288)) + Weight::from_parts(34_438_000, 0) + .saturating_add(Weight::from_parts(0, 7288)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -868,8 +868,8 @@ impl WeightInfo for () { // Measured: `383` // Estimated: `3675` // Minimum execution time: 16_213 nanoseconds. - Weight::from_ref_time(16_575_000) - .saturating_add(Weight::from_proof_size(3675)) + Weight::from_parts(16_575_000, 0) + .saturating_add(Weight::from_parts(0, 3675)) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } diff --git a/frame/babe/src/default_weights.rs b/frame/babe/src/default_weights.rs index e875bc83522c2..2e880fd67cc22 100644 --- a/frame/babe/src/default_weights.rs +++ b/frame/babe/src/default_weights.rs @@ -38,18 +38,19 @@ impl crate::WeightInfo for () { const MAX_NOMINATORS: u64 = 200; // checking membership proof - Weight::from_ref_time(35u64 * WEIGHT_REF_TIME_PER_MICROS) + Weight::from_parts(35u64 * WEIGHT_REF_TIME_PER_MICROS, 0) .saturating_add( - Weight::from_ref_time(175u64 * WEIGHT_REF_TIME_PER_NANOS) + Weight::from_parts(175u64 * WEIGHT_REF_TIME_PER_NANOS, 0) .saturating_mul(validator_count), ) .saturating_add(DbWeight::get().reads(5)) // check equivocation proof - .saturating_add(Weight::from_ref_time(110u64 * WEIGHT_REF_TIME_PER_MICROS)) + .saturating_add(Weight::from_parts(110u64 * WEIGHT_REF_TIME_PER_MICROS, 0)) // report offence - .saturating_add(Weight::from_ref_time(110u64 * WEIGHT_REF_TIME_PER_MICROS)) - .saturating_add(Weight::from_ref_time( + .saturating_add(Weight::from_parts(110u64 * WEIGHT_REF_TIME_PER_MICROS, 0)) + .saturating_add(Weight::from_parts( 25u64 * WEIGHT_REF_TIME_PER_MICROS * MAX_NOMINATORS, + 0, )) .saturating_add(DbWeight::get().reads(14 + 3 * MAX_NOMINATORS)) .saturating_add(DbWeight::get().writes(10 + 3 * MAX_NOMINATORS)) diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs index 82a6ee5f6d33b..b4233a6c3a85c 100644 --- a/frame/balances/src/tests.rs +++ b/frame/balances/src/tests.rs @@ -188,14 +188,14 @@ macro_rules! decl_tests { ChargeTransactionPayment::from(1), &1, CALL, - &info_from_weight(Weight::from_ref_time(1)), + &info_from_weight(Weight::from_parts(1, 0)), 1, ).is_err()); assert_ok!( as SignedExtension>::pre_dispatch( ChargeTransactionPayment::from(0), &1, CALL, - &info_from_weight(Weight::from_ref_time(1)), + &info_from_weight(Weight::from_parts(1, 0)), 1, )); @@ -206,14 +206,14 @@ macro_rules! decl_tests { ChargeTransactionPayment::from(1), &1, CALL, - &info_from_weight(Weight::from_ref_time(1)), + &info_from_weight(Weight::from_parts(1, 0)), 1, ).is_err()); assert!( as SignedExtension>::pre_dispatch( ChargeTransactionPayment::from(0), &1, CALL, - &info_from_weight(Weight::from_ref_time(1)), + &info_from_weight(Weight::from_parts(1, 0)), 1, ).is_err()); }); diff --git a/frame/balances/src/tests_composite.rs b/frame/balances/src/tests_composite.rs index 6f371f1e23010..765ab194d2011 100644 --- a/frame/balances/src/tests_composite.rs +++ b/frame/balances/src/tests_composite.rs @@ -48,7 +48,7 @@ frame_support::construct_runtime!( parameter_types! { pub BlockWeights: frame_system::limits::BlockWeights = frame_system::limits::BlockWeights::simple_max( - frame_support::weights::Weight::from_ref_time(1024).set_proof_size(u64::MAX), + frame_support::weights::Weight::from_parts(1024, u64::MAX), ); pub static ExistentialDeposit: u64 = 0; } diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs index 0d57a33200147..929f77b540fe1 100644 --- a/frame/balances/src/tests_local.rs +++ b/frame/balances/src/tests_local.rs @@ -49,7 +49,7 @@ frame_support::construct_runtime!( parameter_types! { pub BlockWeights: frame_system::limits::BlockWeights = frame_system::limits::BlockWeights::simple_max( - frame_support::weights::Weight::from_ref_time(1024).set_proof_size(u64::MAX), + frame_support::weights::Weight::from_parts(1024, u64::MAX), ); pub static ExistentialDeposit: u64 = 0; } diff --git a/frame/balances/src/tests_reentrancy.rs b/frame/balances/src/tests_reentrancy.rs index 1699a879638e2..828dfa23707d0 100644 --- a/frame/balances/src/tests_reentrancy.rs +++ b/frame/balances/src/tests_reentrancy.rs @@ -52,7 +52,7 @@ frame_support::construct_runtime!( parameter_types! { pub BlockWeights: frame_system::limits::BlockWeights = frame_system::limits::BlockWeights::simple_max( - frame_support::weights::Weight::from_ref_time(1024).set_proof_size(u64::MAX), + frame_support::weights::Weight::from_parts(1024, u64::MAX), ); pub static ExistentialDeposit: u64 = 0; } diff --git a/frame/balances/src/weights.rs b/frame/balances/src/weights.rs index 8c307ff90924d..cdc657ce1656c 100644 --- a/frame/balances/src/weights.rs +++ b/frame/balances/src/weights.rs @@ -68,8 +68,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `3593` // Minimum execution time: 37_815 nanoseconds. - Weight::from_ref_time(38_109_000) - .saturating_add(Weight::from_proof_size(3593)) + Weight::from_parts(38_109_000, 0) + .saturating_add(Weight::from_parts(0, 3593)) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -80,8 +80,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `3593` // Minimum execution time: 28_184 nanoseconds. - Weight::from_ref_time(49_250_000) - .saturating_add(Weight::from_proof_size(3593)) + Weight::from_parts(49_250_000, 0) + .saturating_add(Weight::from_parts(0, 3593)) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -92,8 +92,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `206` // Estimated: `3593` // Minimum execution time: 17_474 nanoseconds. - Weight::from_ref_time(17_777_000) - .saturating_add(Weight::from_proof_size(3593)) + Weight::from_parts(17_777_000, 0) + .saturating_add(Weight::from_parts(0, 3593)) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -104,8 +104,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `206` // Estimated: `3593` // Minimum execution time: 20_962 nanoseconds. - Weight::from_ref_time(21_419_000) - .saturating_add(Weight::from_proof_size(3593)) + Weight::from_parts(21_419_000, 0) + .saturating_add(Weight::from_parts(0, 3593)) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -116,8 +116,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `135` // Estimated: `6196` // Minimum execution time: 39_713 nanoseconds. - Weight::from_ref_time(40_360_000) - .saturating_add(Weight::from_proof_size(6196)) + Weight::from_parts(40_360_000, 0) + .saturating_add(Weight::from_parts(0, 6196)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -128,8 +128,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `3593` // Minimum execution time: 34_878 nanoseconds. - Weight::from_ref_time(35_121_000) - .saturating_add(Weight::from_proof_size(3593)) + Weight::from_parts(35_121_000, 0) + .saturating_add(Weight::from_parts(0, 3593)) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -140,8 +140,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `206` // Estimated: `3593` // Minimum execution time: 16_790 nanoseconds. - Weight::from_ref_time(17_029_000) - .saturating_add(Weight::from_proof_size(3593)) + Weight::from_parts(17_029_000, 0) + .saturating_add(Weight::from_parts(0, 3593)) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -156,8 +156,8 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `3593` // Minimum execution time: 37_815 nanoseconds. - Weight::from_ref_time(38_109_000) - .saturating_add(Weight::from_proof_size(3593)) + Weight::from_parts(38_109_000, 0) + .saturating_add(Weight::from_parts(0, 3593)) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -168,8 +168,8 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `3593` // Minimum execution time: 28_184 nanoseconds. - Weight::from_ref_time(49_250_000) - .saturating_add(Weight::from_proof_size(3593)) + Weight::from_parts(49_250_000, 0) + .saturating_add(Weight::from_parts(0, 3593)) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -180,8 +180,8 @@ impl WeightInfo for () { // Measured: `206` // Estimated: `3593` // Minimum execution time: 17_474 nanoseconds. - Weight::from_ref_time(17_777_000) - .saturating_add(Weight::from_proof_size(3593)) + Weight::from_parts(17_777_000, 0) + .saturating_add(Weight::from_parts(0, 3593)) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -192,8 +192,8 @@ impl WeightInfo for () { // Measured: `206` // Estimated: `3593` // Minimum execution time: 20_962 nanoseconds. - Weight::from_ref_time(21_419_000) - .saturating_add(Weight::from_proof_size(3593)) + Weight::from_parts(21_419_000, 0) + .saturating_add(Weight::from_parts(0, 3593)) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -204,8 +204,8 @@ impl WeightInfo for () { // Measured: `135` // Estimated: `6196` // Minimum execution time: 39_713 nanoseconds. - Weight::from_ref_time(40_360_000) - .saturating_add(Weight::from_proof_size(6196)) + Weight::from_parts(40_360_000, 0) + .saturating_add(Weight::from_parts(0, 6196)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -216,8 +216,8 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `3593` // Minimum execution time: 34_878 nanoseconds. - Weight::from_ref_time(35_121_000) - .saturating_add(Weight::from_proof_size(3593)) + Weight::from_parts(35_121_000, 0) + .saturating_add(Weight::from_parts(0, 3593)) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -228,8 +228,8 @@ impl WeightInfo for () { // Measured: `206` // Estimated: `3593` // Minimum execution time: 16_790 nanoseconds. - Weight::from_ref_time(17_029_000) - .saturating_add(Weight::from_proof_size(3593)) + Weight::from_parts(17_029_000, 0) + .saturating_add(Weight::from_parts(0, 3593)) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } diff --git a/frame/beefy/src/default_weights.rs b/frame/beefy/src/default_weights.rs index 7743edf25ec6c..b15f1c88f9611 100644 --- a/frame/beefy/src/default_weights.rs +++ b/frame/beefy/src/default_weights.rs @@ -33,18 +33,19 @@ impl crate::WeightInfo for () { const MAX_NOMINATORS: u64 = 200; // checking membership proof - Weight::from_ref_time(35u64 * WEIGHT_REF_TIME_PER_MICROS) + Weight::from_parts(35u64 * WEIGHT_REF_TIME_PER_MICROS, 0) .saturating_add( - Weight::from_ref_time(175u64 * WEIGHT_REF_TIME_PER_NANOS) + Weight::from_parts(175u64 * WEIGHT_REF_TIME_PER_NANOS, 0) .saturating_mul(validator_count), ) .saturating_add(DbWeight::get().reads(5)) // check equivocation proof - .saturating_add(Weight::from_ref_time(95u64 * WEIGHT_REF_TIME_PER_MICROS)) + .saturating_add(Weight::from_parts(95u64 * WEIGHT_REF_TIME_PER_MICROS, 0)) // report offence - .saturating_add(Weight::from_ref_time(110u64 * WEIGHT_REF_TIME_PER_MICROS)) - .saturating_add(Weight::from_ref_time( + .saturating_add(Weight::from_parts(110u64 * WEIGHT_REF_TIME_PER_MICROS, 0)) + .saturating_add(Weight::from_parts( 25u64 * WEIGHT_REF_TIME_PER_MICROS * MAX_NOMINATORS, + 0, )) .saturating_add(DbWeight::get().reads(14 + 3 * MAX_NOMINATORS)) .saturating_add(DbWeight::get().writes(10 + 3 * MAX_NOMINATORS)) diff --git a/frame/benchmarking/pov/src/weights.rs b/frame/benchmarking/pov/src/weights.rs index 948d268cf7a4b..df6dba33b2dd3 100644 --- a/frame/benchmarking/pov/src/weights.rs +++ b/frame/benchmarking/pov/src/weights.rs @@ -73,8 +73,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `136` // Estimated: `1489` // Minimum execution time: 1_968 nanoseconds. - Weight::from_ref_time(2_060_000) - .saturating_add(Weight::from_proof_size(1489)) + Weight::from_parts(2_060_000, 0) + .saturating_add(Weight::from_parts(0, 1489)) .saturating_add(T::DbWeight::get().reads(1_u64)) } /// Storage: Pov Value (r:1 w:0) @@ -84,8 +84,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `136` // Estimated: `0` // Minimum execution time: 1_934 nanoseconds. - Weight::from_ref_time(2_092_000) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(2_092_000, 0) + .saturating_add(Weight::from_parts(0, 0)) .saturating_add(T::DbWeight::get().reads(1_u64)) } /// Storage: Pov Value (r:1 w:0) @@ -97,8 +97,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `160` // Estimated: `1649` // Minimum execution time: 2_605 nanoseconds. - Weight::from_ref_time(2_786_000) - .saturating_add(Weight::from_proof_size(1649)) + Weight::from_parts(2_786_000, 0) + .saturating_add(Weight::from_parts(0, 1649)) .saturating_add(T::DbWeight::get().reads(2_u64)) } /// Storage: Pov Value (r:1 w:0) @@ -108,8 +108,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `136` // Estimated: `1489` // Minimum execution time: 2_019 nanoseconds. - Weight::from_ref_time(2_214_000) - .saturating_add(Weight::from_proof_size(1489)) + Weight::from_parts(2_214_000, 0) + .saturating_add(Weight::from_parts(0, 1489)) .saturating_add(T::DbWeight::get().reads(1_u64)) } /// Storage: Pov Value (r:0 w:1) @@ -119,8 +119,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 279 nanoseconds. - Weight::from_ref_time(357_000) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(357_000, 0) + .saturating_add(Weight::from_parts(0, 0)) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Pov Value (r:0 w:1) @@ -130,8 +130,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 291 nanoseconds. - Weight::from_ref_time(378_000) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(378_000, 0) + .saturating_add(Weight::from_parts(0, 0)) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Pov Map1M (r:1 w:0) @@ -141,8 +141,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `1275` // Estimated: `4740` // Minimum execution time: 5_077 nanoseconds. - Weight::from_ref_time(5_400_000) - .saturating_add(Weight::from_proof_size(4740)) + Weight::from_parts(5_400_000, 0) + .saturating_add(Weight::from_parts(0, 4740)) .saturating_add(T::DbWeight::get().reads(1_u64)) } /// Storage: Pov Map1M (r:1 w:0) @@ -152,8 +152,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `1544` // Estimated: `5009` // Minimum execution time: 5_878 nanoseconds. - Weight::from_ref_time(6_239_000) - .saturating_add(Weight::from_proof_size(5009)) + Weight::from_parts(6_239_000, 0) + .saturating_add(Weight::from_parts(0, 5009)) .saturating_add(T::DbWeight::get().reads(1_u64)) } /// Storage: Pov Map1M (r:1 w:0) @@ -163,8 +163,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `2044` // Estimated: `5509` // Minimum execution time: 7_282 nanoseconds. - Weight::from_ref_time(8_022_000) - .saturating_add(Weight::from_proof_size(5509)) + Weight::from_parts(8_022_000, 0) + .saturating_add(Weight::from_parts(0, 5509)) .saturating_add(T::DbWeight::get().reads(1_u64)) } /// Storage: Pov Map1M (r:100 w:0) @@ -178,16 +178,16 @@ impl WeightInfo for SubstrateWeight { // Measured: `515 + n * (188 ±0) + m * (188 ±0)` // Estimated: `1980 + n * (3006 ±0) + m * (2511 ±0)` // Minimum execution time: 195_406 nanoseconds. - Weight::from_ref_time(129_093_464) - .saturating_add(Weight::from_proof_size(1980)) + Weight::from_parts(129_093_464, 0) + .saturating_add(Weight::from_parts(0, 1980)) // Standard Error: 12_134 - .saturating_add(Weight::from_ref_time(855_330).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(855_330, 0).saturating_mul(n.into())) // Standard Error: 12_134 - .saturating_add(Weight::from_ref_time(870_523).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(870_523, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into()))) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(m.into()))) - .saturating_add(Weight::from_proof_size(3006).saturating_mul(n.into())) - .saturating_add(Weight::from_proof_size(2511).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 3006).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 2511).saturating_mul(m.into())) } /// Storage: Pov Map1M (r:100 w:0) /// Proof: Pov Map1M (max_values: Some(1000000), max_size: Some(36), added: 2511, mode: Ignored) @@ -200,16 +200,16 @@ impl WeightInfo for SubstrateWeight { // Measured: `515 + n * (188 ±0) + m * (188 ±0)` // Estimated: `1685 + n * (3195 ±0) + m * (189 ±0)` // Minimum execution time: 195_053 nanoseconds. - Weight::from_ref_time(131_322_479) - .saturating_add(Weight::from_proof_size(1685)) + Weight::from_parts(131_322_479, 0) + .saturating_add(Weight::from_parts(0, 1685)) // Standard Error: 12_161 - .saturating_add(Weight::from_ref_time(843_047).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(843_047, 0).saturating_mul(n.into())) // Standard Error: 12_161 - .saturating_add(Weight::from_ref_time(858_668).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(858_668, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into()))) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(m.into()))) - .saturating_add(Weight::from_proof_size(3195).saturating_mul(n.into())) - .saturating_add(Weight::from_proof_size(189).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 3195).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 189).saturating_mul(m.into())) } /// Storage: Pov Map1M (r:1 w:0) /// Proof: Pov Map1M (max_values: Some(1000000), max_size: Some(36), added: 2511, mode: MaxEncodedLen) @@ -219,10 +219,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `170` // Estimated: `3501` // Minimum execution time: 22 nanoseconds. - Weight::from_ref_time(2_334_945) - .saturating_add(Weight::from_proof_size(3501)) + Weight::from_parts(2_334_945, 0) + .saturating_add(Weight::from_parts(0, 3501)) // Standard Error: 624 - .saturating_add(Weight::from_ref_time(282_046).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(282_046, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) } /// Storage: Pov Map1M (r:100 w:0) @@ -233,12 +233,12 @@ impl WeightInfo for SubstrateWeight { // Measured: `147 + n * (40 ±0)` // Estimated: `990 + n * (2511 ±0)` // Minimum execution time: 20 nanoseconds. - Weight::from_ref_time(525_027) - .saturating_add(Weight::from_proof_size(990)) + Weight::from_parts(525_027, 0) + .saturating_add(Weight::from_parts(0, 990)) // Standard Error: 2_767 - .saturating_add(Weight::from_ref_time(3_887_350).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(3_887_350, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into()))) - .saturating_add(Weight::from_proof_size(2511).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 2511).saturating_mul(n.into())) } /// Storage: Pov DoubleMap1M (r:1024 w:0) /// Proof: Pov DoubleMap1M (max_values: Some(1000000), max_size: Some(68), added: 2543, mode: MaxEncodedLen) @@ -248,12 +248,12 @@ impl WeightInfo for SubstrateWeight { // Measured: `21938 + n * (57 ±0)` // Estimated: `990 + n * (2543 ±0)` // Minimum execution time: 34 nanoseconds. - Weight::from_ref_time(18_341_393) - .saturating_add(Weight::from_proof_size(990)) + Weight::from_parts(18_341_393, 0) + .saturating_add(Weight::from_parts(0, 990)) // Standard Error: 1_312 - .saturating_add(Weight::from_ref_time(2_053_135).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(2_053_135, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into()))) - .saturating_add(Weight::from_proof_size(2543).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 2543).saturating_mul(n.into())) } /// Storage: Pov BoundedValue (r:1 w:0) /// Proof: Pov BoundedValue (max_values: Some(1), max_size: Some(33), added: 528, mode: MaxEncodedLen) @@ -262,8 +262,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `109` // Estimated: `1518` // Minimum execution time: 1_163 nanoseconds. - Weight::from_ref_time(1_274_000) - .saturating_add(Weight::from_proof_size(1518)) + Weight::from_parts(1_274_000, 0) + .saturating_add(Weight::from_parts(0, 1518)) .saturating_add(T::DbWeight::get().reads(1_u64)) } /// Storage: Pov UnboundedValue (r:1 w:0) @@ -273,8 +273,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `109` // Estimated: `1594` // Minimum execution time: 1_167 nanoseconds. - Weight::from_ref_time(1_367_000) - .saturating_add(Weight::from_proof_size(1594)) + Weight::from_parts(1_367_000, 0) + .saturating_add(Weight::from_parts(0, 1594)) .saturating_add(T::DbWeight::get().reads(1_u64)) } /// Storage: Pov UnboundedValue (r:1 w:0) @@ -284,8 +284,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `109` // Estimated: `0` // Minimum execution time: 1_155 nanoseconds. - Weight::from_ref_time(1_248_000) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_248_000, 0) + .saturating_add(Weight::from_parts(0, 0)) .saturating_add(T::DbWeight::get().reads(1_u64)) } /// Storage: Pov UnboundedValue (r:1 w:0) @@ -297,8 +297,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `109` // Estimated: `3112` // Minimum execution time: 1_424 nanoseconds. - Weight::from_ref_time(1_601_000) - .saturating_add(Weight::from_proof_size(3112)) + Weight::from_parts(1_601_000, 0) + .saturating_add(Weight::from_parts(0, 3112)) .saturating_add(T::DbWeight::get().reads(2_u64)) } /// Storage: Pov LargeValue (r:1 w:0) @@ -309,12 +309,12 @@ impl WeightInfo for SubstrateWeight { // Measured: `174 + l * (1 ±0)` // Estimated: `1656 + l * (1 ±0)` // Minimum execution time: 1_744 nanoseconds. - Weight::from_ref_time(1_800_000) - .saturating_add(Weight::from_proof_size(1656)) + Weight::from_parts(1_800_000, 0) + .saturating_add(Weight::from_parts(0, 1656)) // Standard Error: 4 - .saturating_add(Weight::from_ref_time(443).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(443, 0).saturating_mul(l.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) - .saturating_add(Weight::from_proof_size(1).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(0, 1).saturating_mul(l.into())) } /// Storage: Pov LargeValue (r:1 w:0) /// Proof: Pov LargeValue (max_values: Some(1), max_size: Some(4194308), added: 4194803, mode: MaxEncodedLen) @@ -324,10 +324,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `174 + l * (1 ±0)` // Estimated: `4195793` // Minimum execution time: 1_770 nanoseconds. - Weight::from_ref_time(1_813_000) - .saturating_add(Weight::from_proof_size(4195793)) + Weight::from_parts(1_813_000, 0) + .saturating_add(Weight::from_parts(0, 4195793)) // Standard Error: 6 - .saturating_add(Weight::from_ref_time(495).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(495, 0).saturating_mul(l.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) } /// Storage: Pov LargeValue (r:1 w:0) @@ -340,12 +340,12 @@ impl WeightInfo for SubstrateWeight { // Measured: `235 + l * (2 ±0)` // Estimated: `3428 + l * (4 ±0)` // Minimum execution time: 2_349 nanoseconds. - Weight::from_ref_time(2_423_000) - .saturating_add(Weight::from_proof_size(3428)) + Weight::from_parts(2_423_000, 0) + .saturating_add(Weight::from_parts(0, 3428)) // Standard Error: 11 - .saturating_add(Weight::from_ref_time(950).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(950, 0).saturating_mul(l.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) - .saturating_add(Weight::from_proof_size(4).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(0, 4).saturating_mul(l.into())) } /// Storage: Pov LargeValue (r:1 w:0) /// Proof: Pov LargeValue (max_values: Some(1), max_size: Some(4194308), added: 4194803, mode: MaxEncodedLen) @@ -357,10 +357,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `235 + l * (2 ±0)` // Estimated: `8391586` // Minimum execution time: 2_315 nanoseconds. - Weight::from_ref_time(2_409_000) - .saturating_add(Weight::from_proof_size(8391586)) + Weight::from_parts(2_409_000, 0) + .saturating_add(Weight::from_parts(0, 8391586)) // Standard Error: 12 - .saturating_add(Weight::from_ref_time(984).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(984, 0).saturating_mul(l.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) } /// Storage: Pov LargeValue (r:1 w:0) @@ -373,12 +373,12 @@ impl WeightInfo for SubstrateWeight { // Measured: `235 + l * (2 ±0)` // Estimated: `4197507 + l * (2 ±0)` // Minimum execution time: 2_370 nanoseconds. - Weight::from_ref_time(2_474_000) - .saturating_add(Weight::from_proof_size(4197507)) + Weight::from_parts(2_474_000, 0) + .saturating_add(Weight::from_parts(0, 4197507)) // Standard Error: 11 - .saturating_add(Weight::from_ref_time(956).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(956, 0).saturating_mul(l.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) - .saturating_add(Weight::from_proof_size(2).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(0, 2).saturating_mul(l.into())) } /// Storage: Pov LargeValue (r:1 w:0) /// Proof: Pov LargeValue (max_values: Some(1), max_size: Some(4194308), added: 4194803, mode: Measured) @@ -390,12 +390,12 @@ impl WeightInfo for SubstrateWeight { // Measured: `235 + l * (2 ±0)` // Estimated: `4197507 + l * (2 ±0)` // Minimum execution time: 2_375 nanoseconds. - Weight::from_ref_time(2_420_000) - .saturating_add(Weight::from_proof_size(4197507)) + Weight::from_parts(2_420_000, 0) + .saturating_add(Weight::from_parts(0, 4197507)) // Standard Error: 9 - .saturating_add(Weight::from_ref_time(914).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(914, 0).saturating_mul(l.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) - .saturating_add(Weight::from_proof_size(2).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(0, 2).saturating_mul(l.into())) } /// Storage: Pov UnboundedMap (r:1 w:0) /// Proof Skipped: Pov UnboundedMap (max_values: None, max_size: None, mode: Measured) @@ -407,12 +407,12 @@ impl WeightInfo for SubstrateWeight { // Measured: `293 + i * (8 ±0)` // Estimated: `7504 + i * (16 ±0)` // Minimum execution time: 3_305 nanoseconds. - Weight::from_ref_time(3_689_335) - .saturating_add(Weight::from_proof_size(7504)) + Weight::from_parts(3_689_335, 0) + .saturating_add(Weight::from_parts(0, 7504)) // Standard Error: 29 - .saturating_add(Weight::from_ref_time(638).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(638, 0).saturating_mul(i.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) - .saturating_add(Weight::from_proof_size(16).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(0, 16).saturating_mul(i.into())) } /// Storage: Pov Map1M (r:1 w:0) /// Proof: Pov Map1M (max_values: Some(1000000), max_size: Some(36), added: 2511, mode: MaxEncodedLen) @@ -424,12 +424,12 @@ impl WeightInfo for SubstrateWeight { // Measured: `260 + i * (4 ±0)` // Estimated: `7223 + i * (4 ±0)` // Minimum execution time: 3_469 nanoseconds. - Weight::from_ref_time(3_878_896) - .saturating_add(Weight::from_proof_size(7223)) + Weight::from_parts(3_878_896, 0) + .saturating_add(Weight::from_parts(0, 7223)) // Standard Error: 33 - .saturating_add(Weight::from_ref_time(356).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(356, 0).saturating_mul(i.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) - .saturating_add(Weight::from_proof_size(4).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(0, 4).saturating_mul(i.into())) } /// Storage: Pov Map1M (r:1 w:0) /// Proof: Pov Map1M (max_values: Some(1000000), max_size: Some(36), added: 2511, mode: MaxEncodedLen) @@ -441,28 +441,28 @@ impl WeightInfo for SubstrateWeight { // Measured: `260 + i * (4 ±0)` // Estimated: `3758 + i * (4 ±0)` // Minimum execution time: 3_442 nanoseconds. - Weight::from_ref_time(3_881_051) - .saturating_add(Weight::from_proof_size(3758)) + Weight::from_parts(3_881_051, 0) + .saturating_add(Weight::from_parts(0, 3758)) // Standard Error: 35 - .saturating_add(Weight::from_ref_time(384).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(384, 0).saturating_mul(i.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) - .saturating_add(Weight::from_proof_size(4).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(0, 4).saturating_mul(i.into())) } fn emit_event() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` // Minimum execution time: 1_619 nanoseconds. - Weight::from_ref_time(1_728_000) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_728_000, 0) + .saturating_add(Weight::from_parts(0, 0)) } fn noop() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` // Minimum execution time: 546 nanoseconds. - Weight::from_ref_time(640_000) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(640_000, 0) + .saturating_add(Weight::from_parts(0, 0)) } } @@ -475,8 +475,8 @@ impl WeightInfo for () { // Measured: `136` // Estimated: `1489` // Minimum execution time: 1_968 nanoseconds. - Weight::from_ref_time(2_060_000) - .saturating_add(Weight::from_proof_size(1489)) + Weight::from_parts(2_060_000, 0) + .saturating_add(Weight::from_parts(0, 1489)) .saturating_add(RocksDbWeight::get().reads(1_u64)) } /// Storage: Pov Value (r:1 w:0) @@ -486,8 +486,8 @@ impl WeightInfo for () { // Measured: `136` // Estimated: `0` // Minimum execution time: 1_934 nanoseconds. - Weight::from_ref_time(2_092_000) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(2_092_000, 0) + .saturating_add(Weight::from_parts(0, 0)) .saturating_add(RocksDbWeight::get().reads(1_u64)) } /// Storage: Pov Value (r:1 w:0) @@ -499,8 +499,8 @@ impl WeightInfo for () { // Measured: `160` // Estimated: `1649` // Minimum execution time: 2_605 nanoseconds. - Weight::from_ref_time(2_786_000) - .saturating_add(Weight::from_proof_size(1649)) + Weight::from_parts(2_786_000, 0) + .saturating_add(Weight::from_parts(0, 1649)) .saturating_add(RocksDbWeight::get().reads(2_u64)) } /// Storage: Pov Value (r:1 w:0) @@ -510,8 +510,8 @@ impl WeightInfo for () { // Measured: `136` // Estimated: `1489` // Minimum execution time: 2_019 nanoseconds. - Weight::from_ref_time(2_214_000) - .saturating_add(Weight::from_proof_size(1489)) + Weight::from_parts(2_214_000, 0) + .saturating_add(Weight::from_parts(0, 1489)) .saturating_add(RocksDbWeight::get().reads(1_u64)) } /// Storage: Pov Value (r:0 w:1) @@ -521,8 +521,8 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 279 nanoseconds. - Weight::from_ref_time(357_000) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(357_000, 0) + .saturating_add(Weight::from_parts(0, 0)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } /// Storage: Pov Value (r:0 w:1) @@ -532,8 +532,8 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 291 nanoseconds. - Weight::from_ref_time(378_000) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(378_000, 0) + .saturating_add(Weight::from_parts(0, 0)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } /// Storage: Pov Map1M (r:1 w:0) @@ -543,8 +543,8 @@ impl WeightInfo for () { // Measured: `1275` // Estimated: `4740` // Minimum execution time: 5_077 nanoseconds. - Weight::from_ref_time(5_400_000) - .saturating_add(Weight::from_proof_size(4740)) + Weight::from_parts(5_400_000, 0) + .saturating_add(Weight::from_parts(0, 4740)) .saturating_add(RocksDbWeight::get().reads(1_u64)) } /// Storage: Pov Map1M (r:1 w:0) @@ -554,8 +554,8 @@ impl WeightInfo for () { // Measured: `1544` // Estimated: `5009` // Minimum execution time: 5_878 nanoseconds. - Weight::from_ref_time(6_239_000) - .saturating_add(Weight::from_proof_size(5009)) + Weight::from_parts(6_239_000, 0) + .saturating_add(Weight::from_parts(0, 5009)) .saturating_add(RocksDbWeight::get().reads(1_u64)) } /// Storage: Pov Map1M (r:1 w:0) @@ -565,8 +565,8 @@ impl WeightInfo for () { // Measured: `2044` // Estimated: `5509` // Minimum execution time: 7_282 nanoseconds. - Weight::from_ref_time(8_022_000) - .saturating_add(Weight::from_proof_size(5509)) + Weight::from_parts(8_022_000, 0) + .saturating_add(Weight::from_parts(0, 5509)) .saturating_add(RocksDbWeight::get().reads(1_u64)) } /// Storage: Pov Map1M (r:100 w:0) @@ -580,16 +580,16 @@ impl WeightInfo for () { // Measured: `515 + n * (188 ±0) + m * (188 ±0)` // Estimated: `1980 + n * (3006 ±0) + m * (2511 ±0)` // Minimum execution time: 195_406 nanoseconds. - Weight::from_ref_time(129_093_464) - .saturating_add(Weight::from_proof_size(1980)) + Weight::from_parts(129_093_464, 0) + .saturating_add(Weight::from_parts(0, 1980)) // Standard Error: 12_134 - .saturating_add(Weight::from_ref_time(855_330).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(855_330, 0).saturating_mul(n.into())) // Standard Error: 12_134 - .saturating_add(Weight::from_ref_time(870_523).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(870_523, 0).saturating_mul(m.into())) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(n.into()))) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(m.into()))) - .saturating_add(Weight::from_proof_size(3006).saturating_mul(n.into())) - .saturating_add(Weight::from_proof_size(2511).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 3006).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 2511).saturating_mul(m.into())) } /// Storage: Pov Map1M (r:100 w:0) /// Proof: Pov Map1M (max_values: Some(1000000), max_size: Some(36), added: 2511, mode: Ignored) @@ -602,16 +602,16 @@ impl WeightInfo for () { // Measured: `515 + n * (188 ±0) + m * (188 ±0)` // Estimated: `1685 + n * (3195 ±0) + m * (189 ±0)` // Minimum execution time: 195_053 nanoseconds. - Weight::from_ref_time(131_322_479) - .saturating_add(Weight::from_proof_size(1685)) + Weight::from_parts(131_322_479, 0) + .saturating_add(Weight::from_parts(0, 1685)) // Standard Error: 12_161 - .saturating_add(Weight::from_ref_time(843_047).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(843_047, 0).saturating_mul(n.into())) // Standard Error: 12_161 - .saturating_add(Weight::from_ref_time(858_668).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(858_668, 0).saturating_mul(m.into())) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(n.into()))) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(m.into()))) - .saturating_add(Weight::from_proof_size(3195).saturating_mul(n.into())) - .saturating_add(Weight::from_proof_size(189).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 3195).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 189).saturating_mul(m.into())) } /// Storage: Pov Map1M (r:1 w:0) /// Proof: Pov Map1M (max_values: Some(1000000), max_size: Some(36), added: 2511, mode: MaxEncodedLen) @@ -621,10 +621,10 @@ impl WeightInfo for () { // Measured: `170` // Estimated: `3501` // Minimum execution time: 22 nanoseconds. - Weight::from_ref_time(2_334_945) - .saturating_add(Weight::from_proof_size(3501)) + Weight::from_parts(2_334_945, 0) + .saturating_add(Weight::from_parts(0, 3501)) // Standard Error: 624 - .saturating_add(Weight::from_ref_time(282_046).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(282_046, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) } /// Storage: Pov Map1M (r:100 w:0) @@ -635,12 +635,12 @@ impl WeightInfo for () { // Measured: `147 + n * (40 ±0)` // Estimated: `990 + n * (2511 ±0)` // Minimum execution time: 20 nanoseconds. - Weight::from_ref_time(525_027) - .saturating_add(Weight::from_proof_size(990)) + Weight::from_parts(525_027, 0) + .saturating_add(Weight::from_parts(0, 990)) // Standard Error: 2_767 - .saturating_add(Weight::from_ref_time(3_887_350).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(3_887_350, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(n.into()))) - .saturating_add(Weight::from_proof_size(2511).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 2511).saturating_mul(n.into())) } /// Storage: Pov DoubleMap1M (r:1024 w:0) /// Proof: Pov DoubleMap1M (max_values: Some(1000000), max_size: Some(68), added: 2543, mode: MaxEncodedLen) @@ -650,12 +650,12 @@ impl WeightInfo for () { // Measured: `21938 + n * (57 ±0)` // Estimated: `990 + n * (2543 ±0)` // Minimum execution time: 34 nanoseconds. - Weight::from_ref_time(18_341_393) - .saturating_add(Weight::from_proof_size(990)) + Weight::from_parts(18_341_393, 0) + .saturating_add(Weight::from_parts(0, 990)) // Standard Error: 1_312 - .saturating_add(Weight::from_ref_time(2_053_135).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(2_053_135, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(n.into()))) - .saturating_add(Weight::from_proof_size(2543).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 2543).saturating_mul(n.into())) } /// Storage: Pov BoundedValue (r:1 w:0) /// Proof: Pov BoundedValue (max_values: Some(1), max_size: Some(33), added: 528, mode: MaxEncodedLen) @@ -664,8 +664,8 @@ impl WeightInfo for () { // Measured: `109` // Estimated: `1518` // Minimum execution time: 1_163 nanoseconds. - Weight::from_ref_time(1_274_000) - .saturating_add(Weight::from_proof_size(1518)) + Weight::from_parts(1_274_000, 0) + .saturating_add(Weight::from_parts(0, 1518)) .saturating_add(RocksDbWeight::get().reads(1_u64)) } /// Storage: Pov UnboundedValue (r:1 w:0) @@ -675,8 +675,8 @@ impl WeightInfo for () { // Measured: `109` // Estimated: `1594` // Minimum execution time: 1_167 nanoseconds. - Weight::from_ref_time(1_367_000) - .saturating_add(Weight::from_proof_size(1594)) + Weight::from_parts(1_367_000, 0) + .saturating_add(Weight::from_parts(0, 1594)) .saturating_add(RocksDbWeight::get().reads(1_u64)) } /// Storage: Pov UnboundedValue (r:1 w:0) @@ -686,8 +686,8 @@ impl WeightInfo for () { // Measured: `109` // Estimated: `0` // Minimum execution time: 1_155 nanoseconds. - Weight::from_ref_time(1_248_000) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_248_000, 0) + .saturating_add(Weight::from_parts(0, 0)) .saturating_add(RocksDbWeight::get().reads(1_u64)) } /// Storage: Pov UnboundedValue (r:1 w:0) @@ -699,8 +699,8 @@ impl WeightInfo for () { // Measured: `109` // Estimated: `3112` // Minimum execution time: 1_424 nanoseconds. - Weight::from_ref_time(1_601_000) - .saturating_add(Weight::from_proof_size(3112)) + Weight::from_parts(1_601_000, 0) + .saturating_add(Weight::from_parts(0, 3112)) .saturating_add(RocksDbWeight::get().reads(2_u64)) } /// Storage: Pov LargeValue (r:1 w:0) @@ -711,12 +711,12 @@ impl WeightInfo for () { // Measured: `174 + l * (1 ±0)` // Estimated: `1656 + l * (1 ±0)` // Minimum execution time: 1_744 nanoseconds. - Weight::from_ref_time(1_800_000) - .saturating_add(Weight::from_proof_size(1656)) + Weight::from_parts(1_800_000, 0) + .saturating_add(Weight::from_parts(0, 1656)) // Standard Error: 4 - .saturating_add(Weight::from_ref_time(443).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(443, 0).saturating_mul(l.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) - .saturating_add(Weight::from_proof_size(1).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(0, 1).saturating_mul(l.into())) } /// Storage: Pov LargeValue (r:1 w:0) /// Proof: Pov LargeValue (max_values: Some(1), max_size: Some(4194308), added: 4194803, mode: MaxEncodedLen) @@ -726,10 +726,10 @@ impl WeightInfo for () { // Measured: `174 + l * (1 ±0)` // Estimated: `4195793` // Minimum execution time: 1_770 nanoseconds. - Weight::from_ref_time(1_813_000) - .saturating_add(Weight::from_proof_size(4195793)) + Weight::from_parts(1_813_000, 0) + .saturating_add(Weight::from_parts(0, 4195793)) // Standard Error: 6 - .saturating_add(Weight::from_ref_time(495).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(495, 0).saturating_mul(l.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) } /// Storage: Pov LargeValue (r:1 w:0) @@ -742,12 +742,12 @@ impl WeightInfo for () { // Measured: `235 + l * (2 ±0)` // Estimated: `3428 + l * (4 ±0)` // Minimum execution time: 2_349 nanoseconds. - Weight::from_ref_time(2_423_000) - .saturating_add(Weight::from_proof_size(3428)) + Weight::from_parts(2_423_000, 0) + .saturating_add(Weight::from_parts(0, 3428)) // Standard Error: 11 - .saturating_add(Weight::from_ref_time(950).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(950, 0).saturating_mul(l.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) - .saturating_add(Weight::from_proof_size(4).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(0, 4).saturating_mul(l.into())) } /// Storage: Pov LargeValue (r:1 w:0) /// Proof: Pov LargeValue (max_values: Some(1), max_size: Some(4194308), added: 4194803, mode: MaxEncodedLen) @@ -759,10 +759,10 @@ impl WeightInfo for () { // Measured: `235 + l * (2 ±0)` // Estimated: `8391586` // Minimum execution time: 2_315 nanoseconds. - Weight::from_ref_time(2_409_000) - .saturating_add(Weight::from_proof_size(8391586)) + Weight::from_parts(2_409_000, 0) + .saturating_add(Weight::from_parts(0, 8391586)) // Standard Error: 12 - .saturating_add(Weight::from_ref_time(984).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(984, 0).saturating_mul(l.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) } /// Storage: Pov LargeValue (r:1 w:0) @@ -775,12 +775,12 @@ impl WeightInfo for () { // Measured: `235 + l * (2 ±0)` // Estimated: `4197507 + l * (2 ±0)` // Minimum execution time: 2_370 nanoseconds. - Weight::from_ref_time(2_474_000) - .saturating_add(Weight::from_proof_size(4197507)) + Weight::from_parts(2_474_000, 0) + .saturating_add(Weight::from_parts(0, 4197507)) // Standard Error: 11 - .saturating_add(Weight::from_ref_time(956).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(956, 0).saturating_mul(l.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) - .saturating_add(Weight::from_proof_size(2).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(0, 2).saturating_mul(l.into())) } /// Storage: Pov LargeValue (r:1 w:0) /// Proof: Pov LargeValue (max_values: Some(1), max_size: Some(4194308), added: 4194803, mode: Measured) @@ -792,12 +792,12 @@ impl WeightInfo for () { // Measured: `235 + l * (2 ±0)` // Estimated: `4197507 + l * (2 ±0)` // Minimum execution time: 2_375 nanoseconds. - Weight::from_ref_time(2_420_000) - .saturating_add(Weight::from_proof_size(4197507)) + Weight::from_parts(2_420_000, 0) + .saturating_add(Weight::from_parts(0, 4197507)) // Standard Error: 9 - .saturating_add(Weight::from_ref_time(914).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(914, 0).saturating_mul(l.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) - .saturating_add(Weight::from_proof_size(2).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(0, 2).saturating_mul(l.into())) } /// Storage: Pov UnboundedMap (r:1 w:0) /// Proof Skipped: Pov UnboundedMap (max_values: None, max_size: None, mode: Measured) @@ -809,12 +809,12 @@ impl WeightInfo for () { // Measured: `293 + i * (8 ±0)` // Estimated: `7504 + i * (16 ±0)` // Minimum execution time: 3_305 nanoseconds. - Weight::from_ref_time(3_689_335) - .saturating_add(Weight::from_proof_size(7504)) + Weight::from_parts(3_689_335, 0) + .saturating_add(Weight::from_parts(0, 7504)) // Standard Error: 29 - .saturating_add(Weight::from_ref_time(638).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(638, 0).saturating_mul(i.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) - .saturating_add(Weight::from_proof_size(16).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(0, 16).saturating_mul(i.into())) } /// Storage: Pov Map1M (r:1 w:0) /// Proof: Pov Map1M (max_values: Some(1000000), max_size: Some(36), added: 2511, mode: MaxEncodedLen) @@ -826,12 +826,12 @@ impl WeightInfo for () { // Measured: `260 + i * (4 ±0)` // Estimated: `7223 + i * (4 ±0)` // Minimum execution time: 3_469 nanoseconds. - Weight::from_ref_time(3_878_896) - .saturating_add(Weight::from_proof_size(7223)) + Weight::from_parts(3_878_896, 0) + .saturating_add(Weight::from_parts(0, 7223)) // Standard Error: 33 - .saturating_add(Weight::from_ref_time(356).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(356, 0).saturating_mul(i.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) - .saturating_add(Weight::from_proof_size(4).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(0, 4).saturating_mul(i.into())) } /// Storage: Pov Map1M (r:1 w:0) /// Proof: Pov Map1M (max_values: Some(1000000), max_size: Some(36), added: 2511, mode: MaxEncodedLen) @@ -843,27 +843,27 @@ impl WeightInfo for () { // Measured: `260 + i * (4 ±0)` // Estimated: `3758 + i * (4 ±0)` // Minimum execution time: 3_442 nanoseconds. - Weight::from_ref_time(3_881_051) - .saturating_add(Weight::from_proof_size(3758)) + Weight::from_parts(3_881_051, 0) + .saturating_add(Weight::from_parts(0, 3758)) // Standard Error: 35 - .saturating_add(Weight::from_ref_time(384).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(384, 0).saturating_mul(i.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) - .saturating_add(Weight::from_proof_size(4).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(0, 4).saturating_mul(i.into())) } fn emit_event() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` // Minimum execution time: 1_619 nanoseconds. - Weight::from_ref_time(1_728_000) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_728_000, 0) + .saturating_add(Weight::from_parts(0, 0)) } fn noop() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` // Minimum execution time: 546 nanoseconds. - Weight::from_ref_time(640_000) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(640_000, 0) + .saturating_add(Weight::from_parts(0, 0)) } } diff --git a/frame/benchmarking/src/weights.rs b/frame/benchmarking/src/weights.rs index 85dbb18c7e024..fdd4429f2039b 100644 --- a/frame/benchmarking/src/weights.rs +++ b/frame/benchmarking/src/weights.rs @@ -65,7 +65,7 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 138 nanoseconds. - Weight::from_ref_time(199_805) + Weight::from_parts(199_805, 0) } /// The range of component `i` is `[0, 1000000]`. fn subtraction(_i: u32, ) -> Weight { @@ -73,7 +73,7 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 142 nanoseconds. - Weight::from_ref_time(201_435) + Weight::from_parts(201_435, 0) } /// The range of component `i` is `[0, 1000000]`. fn multiplication(_i: u32, ) -> Weight { @@ -81,7 +81,7 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 138 nanoseconds. - Weight::from_ref_time(207_037) + Weight::from_parts(207_037, 0) } /// The range of component `i` is `[0, 1000000]`. fn division(_i: u32, ) -> Weight { @@ -89,14 +89,14 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 151 nanoseconds. - Weight::from_ref_time(205_150) + Weight::from_parts(205_150, 0) } fn hashing() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` // Minimum execution time: 21_950_884 nanoseconds. - Weight::from_ref_time(21_994_001_000) + Weight::from_parts(21_994_001_000, 0) } /// The range of component `i` is `[0, 100]`. fn sr25519_verification(i: u32, ) -> Weight { @@ -104,9 +104,9 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 168 nanoseconds. - Weight::from_ref_time(1_680_898) + Weight::from_parts(1_680_898, 0) // Standard Error: 10_291 - .saturating_add(Weight::from_ref_time(46_867_301).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(46_867_301, 0).saturating_mul(i.into())) } } @@ -118,7 +118,7 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 138 nanoseconds. - Weight::from_ref_time(199_805) + Weight::from_parts(199_805, 0) } /// The range of component `i` is `[0, 1000000]`. fn subtraction(_i: u32, ) -> Weight { @@ -126,7 +126,7 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 142 nanoseconds. - Weight::from_ref_time(201_435) + Weight::from_parts(201_435, 0) } /// The range of component `i` is `[0, 1000000]`. fn multiplication(_i: u32, ) -> Weight { @@ -134,7 +134,7 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 138 nanoseconds. - Weight::from_ref_time(207_037) + Weight::from_parts(207_037, 0) } /// The range of component `i` is `[0, 1000000]`. fn division(_i: u32, ) -> Weight { @@ -142,14 +142,14 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 151 nanoseconds. - Weight::from_ref_time(205_150) + Weight::from_parts(205_150, 0) } fn hashing() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` // Minimum execution time: 21_950_884 nanoseconds. - Weight::from_ref_time(21_994_001_000) + Weight::from_parts(21_994_001_000, 0) } /// The range of component `i` is `[0, 100]`. fn sr25519_verification(i: u32, ) -> Weight { @@ -157,8 +157,8 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 168 nanoseconds. - Weight::from_ref_time(1_680_898) + Weight::from_parts(1_680_898, 0) // Standard Error: 10_291 - .saturating_add(Weight::from_ref_time(46_867_301).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(46_867_301, 0).saturating_mul(i.into())) } } diff --git a/frame/bounties/src/weights.rs b/frame/bounties/src/weights.rs index 174891f9589d3..f0ea78b5f1e8d 100644 --- a/frame/bounties/src/weights.rs +++ b/frame/bounties/src/weights.rs @@ -80,7 +80,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 22_787 nanoseconds. Weight::from_parts(23_898_632, 3102) // Standard Error: 141 - .saturating_add(Weight::from_ref_time(568).saturating_mul(d.into())) + .saturating_add(Weight::from_parts(568, 0).saturating_mul(d.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -223,12 +223,12 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 4_685 nanoseconds. Weight::from_parts(9_932_840, 897) // Standard Error: 14_301 - .saturating_add(Weight::from_ref_time(27_178_347).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(27_178_347, 0).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(b.into()))) .saturating_add(T::DbWeight::get().writes(1_u64)) .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(b.into()))) - .saturating_add(Weight::from_proof_size(7858).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(0, 7858).saturating_mul(b.into())) } } @@ -250,7 +250,7 @@ impl WeightInfo for () { // Minimum execution time: 22_787 nanoseconds. Weight::from_parts(23_898_632, 3102) // Standard Error: 141 - .saturating_add(Weight::from_ref_time(568).saturating_mul(d.into())) + .saturating_add(Weight::from_parts(568, 0).saturating_mul(d.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) } @@ -393,11 +393,11 @@ impl WeightInfo for () { // Minimum execution time: 4_685 nanoseconds. Weight::from_parts(9_932_840, 897) // Standard Error: 14_301 - .saturating_add(Weight::from_ref_time(27_178_347).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(27_178_347, 0).saturating_mul(b.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().reads((3_u64).saturating_mul(b.into()))) .saturating_add(RocksDbWeight::get().writes(1_u64)) .saturating_add(RocksDbWeight::get().writes((3_u64).saturating_mul(b.into()))) - .saturating_add(Weight::from_proof_size(7858).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(0, 7858).saturating_mul(b.into())) } } diff --git a/frame/child-bounties/src/tests.rs b/frame/child-bounties/src/tests.rs index b4b24eb910293..0172468ec55d6 100644 --- a/frame/child-bounties/src/tests.rs +++ b/frame/child-bounties/src/tests.rs @@ -59,7 +59,7 @@ frame_support::construct_runtime!( ); parameter_types! { - pub const MaximumBlockWeight: Weight = Weight::from_ref_time(1024); + pub const MaximumBlockWeight: Weight = Weight::from_parts(1024, 0); pub const MaximumBlockLength: u32 = 2 * 1024; pub const AvailableBlockRatio: Perbill = Perbill::one(); } diff --git a/frame/child-bounties/src/weights.rs b/frame/child-bounties/src/weights.rs index e27393de9d350..eeb14419678d7 100644 --- a/frame/child-bounties/src/weights.rs +++ b/frame/child-bounties/src/weights.rs @@ -81,7 +81,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 46_743 nanoseconds. Weight::from_parts(47_762_924, 10848) // Standard Error: 135 - .saturating_add(Weight::from_ref_time(599).saturating_mul(d.into())) + .saturating_add(Weight::from_parts(599, 0).saturating_mul(d.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(6_u64)) } @@ -226,7 +226,7 @@ impl WeightInfo for () { // Minimum execution time: 46_743 nanoseconds. Weight::from_parts(47_762_924, 10848) // Standard Error: 135 - .saturating_add(Weight::from_ref_time(599).saturating_mul(d.into())) + .saturating_add(Weight::from_parts(599, 0).saturating_mul(d.into())) .saturating_add(RocksDbWeight::get().reads(5_u64)) .saturating_add(RocksDbWeight::get().writes(6_u64)) } diff --git a/frame/collective/src/tests.rs b/frame/collective/src/tests.rs index bfc6a0249b76c..2d9b31a539d59 100644 --- a/frame/collective/src/tests.rs +++ b/frame/collective/src/tests.rs @@ -288,7 +288,7 @@ fn proposal_weight_limit_works_on_approve() { RuntimeOrigin::signed(4), hash, 0, - proposal_weight - Weight::from_ref_time(100), + proposal_weight - Weight::from_parts(100, 0), proposal_len ), Error::::WrongProposalWeight @@ -327,7 +327,7 @@ fn proposal_weight_limit_ignored_on_disapprove() { RuntimeOrigin::signed(4), hash, 0, - proposal_weight - Weight::from_ref_time(100), + proposal_weight - Weight::from_parts(100, 0), proposal_len )); }) @@ -750,7 +750,7 @@ fn correct_validate_and_get_proposal() { Collective::validate_and_get_proposal( &hash, length, - weight - Weight::from_ref_time(10) + weight - Weight::from_parts(10, 0) ), Error::::WrongProposalWeight ); diff --git a/frame/collective/src/weights.rs b/frame/collective/src/weights.rs index d8a7131186424..df233fc248e3d 100644 --- a/frame/collective/src/weights.rs +++ b/frame/collective/src/weights.rs @@ -81,15 +81,15 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 17_093 nanoseconds. Weight::from_parts(17_284_000, 16586) // Standard Error: 64_700 - .saturating_add(Weight::from_ref_time(5_143_145).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(5_143_145, 0).saturating_mul(m.into())) // Standard Error: 64_700 - .saturating_add(Weight::from_ref_time(7_480_941).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(7_480_941, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into()))) .saturating_add(T::DbWeight::get().writes(2_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into()))) - .saturating_add(Weight::from_proof_size(7809).saturating_mul(m.into())) - .saturating_add(Weight::from_proof_size(10238).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 7809).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 10238).saturating_mul(p.into())) } /// Storage: Council Members (r:1 w:0) /// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured) @@ -102,11 +102,11 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 15_972 nanoseconds. Weight::from_parts(14_971_445, 730) // Standard Error: 32 - .saturating_add(Weight::from_ref_time(1_775).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(1_775, 0).saturating_mul(b.into())) // Standard Error: 334 - .saturating_add(Weight::from_ref_time(17_052).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(17_052, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) - .saturating_add(Weight::from_proof_size(32).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into())) } /// Storage: Council Members (r:1 w:0) /// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured) @@ -121,11 +121,11 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 17_950 nanoseconds. Weight::from_parts(17_019_558, 3440) // Standard Error: 41 - .saturating_add(Weight::from_ref_time(1_807).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(1_807, 0).saturating_mul(b.into())) // Standard Error: 432 - .saturating_add(Weight::from_ref_time(27_986).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(27_986, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) - .saturating_add(Weight::from_proof_size(64).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) } /// Storage: Council Members (r:1 w:0) /// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured) @@ -147,15 +147,15 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 24_817 nanoseconds. Weight::from_parts(24_778_955, 6355) // Standard Error: 73 - .saturating_add(Weight::from_ref_time(2_355).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(2_355, 0).saturating_mul(b.into())) // Standard Error: 765 - .saturating_add(Weight::from_ref_time(20_518).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(20_518, 0).saturating_mul(m.into())) // Standard Error: 755 - .saturating_add(Weight::from_ref_time(85_670).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(85_670, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) - .saturating_add(Weight::from_proof_size(165).saturating_mul(m.into())) - .saturating_add(Weight::from_proof_size(180).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 165).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 180).saturating_mul(p.into())) } /// Storage: Council Members (r:1 w:0) /// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured) @@ -169,10 +169,10 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 19_790 nanoseconds. Weight::from_parts(20_528_275, 4980) // Standard Error: 651 - .saturating_add(Weight::from_ref_time(48_856).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(48_856, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(128).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 128).saturating_mul(m.into())) } /// Storage: Council Voting (r:1 w:1) /// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured) @@ -191,13 +191,13 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 25_564 nanoseconds. Weight::from_parts(25_535_497, 5893) // Standard Error: 610 - .saturating_add(Weight::from_ref_time(27_956).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(27_956, 0).saturating_mul(m.into())) // Standard Error: 595 - .saturating_add(Weight::from_ref_time(84_835).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(84_835, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(260).saturating_mul(m.into())) - .saturating_add(Weight::from_proof_size(144).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 260).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 144).saturating_mul(p.into())) } /// Storage: Council Voting (r:1 w:1) /// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured) @@ -217,16 +217,16 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 36_515 nanoseconds. Weight::from_parts(36_626_648, 9164) // Standard Error: 98 - .saturating_add(Weight::from_ref_time(2_295).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(2_295, 0).saturating_mul(b.into())) // Standard Error: 1_036 - .saturating_add(Weight::from_ref_time(22_182).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(22_182, 0).saturating_mul(m.into())) // Standard Error: 1_010 - .saturating_add(Weight::from_ref_time(100_034).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(100_034, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(4).saturating_mul(b.into())) - .saturating_add(Weight::from_proof_size(264).saturating_mul(m.into())) - .saturating_add(Weight::from_proof_size(160).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 4).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(0, 264).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 160).saturating_mul(p.into())) } /// Storage: Council Voting (r:1 w:1) /// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured) @@ -247,13 +247,13 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 28_858 nanoseconds. Weight::from_parts(28_050_047, 7095) // Standard Error: 614 - .saturating_add(Weight::from_ref_time(34_031).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(34_031, 0).saturating_mul(m.into())) // Standard Error: 599 - .saturating_add(Weight::from_ref_time(85_744).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(85_744, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(325).saturating_mul(m.into())) - .saturating_add(Weight::from_proof_size(180).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 325).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 180).saturating_mul(p.into())) } /// Storage: Council Voting (r:1 w:1) /// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured) @@ -275,16 +275,16 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 38_608 nanoseconds. Weight::from_parts(39_948_329, 10565) // Standard Error: 84 - .saturating_add(Weight::from_ref_time(2_045).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(2_045, 0).saturating_mul(b.into())) // Standard Error: 895 - .saturating_add(Weight::from_ref_time(22_669).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(22_669, 0).saturating_mul(m.into())) // Standard Error: 872 - .saturating_add(Weight::from_ref_time(95_525).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(95_525, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(5).saturating_mul(b.into())) - .saturating_add(Weight::from_proof_size(330).saturating_mul(m.into())) - .saturating_add(Weight::from_proof_size(200).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 5).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(0, 330).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 200).saturating_mul(p.into())) } /// Storage: Council Proposals (r:1 w:1) /// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured) @@ -300,10 +300,10 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 14_785 nanoseconds. Weight::from_parts(16_393_818, 1668) // Standard Error: 612 - .saturating_add(Weight::from_ref_time(76_786).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(76_786, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(96).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 96).saturating_mul(p.into())) } } @@ -327,15 +327,15 @@ impl WeightInfo for () { // Minimum execution time: 17_093 nanoseconds. Weight::from_parts(17_284_000, 16586) // Standard Error: 64_700 - .saturating_add(Weight::from_ref_time(5_143_145).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(5_143_145, 0).saturating_mul(m.into())) // Standard Error: 64_700 - .saturating_add(Weight::from_ref_time(7_480_941).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(7_480_941, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(p.into()))) .saturating_add(RocksDbWeight::get().writes(2_u64)) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(p.into()))) - .saturating_add(Weight::from_proof_size(7809).saturating_mul(m.into())) - .saturating_add(Weight::from_proof_size(10238).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 7809).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 10238).saturating_mul(p.into())) } /// Storage: Council Members (r:1 w:0) /// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured) @@ -348,11 +348,11 @@ impl WeightInfo for () { // Minimum execution time: 15_972 nanoseconds. Weight::from_parts(14_971_445, 730) // Standard Error: 32 - .saturating_add(Weight::from_ref_time(1_775).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(1_775, 0).saturating_mul(b.into())) // Standard Error: 334 - .saturating_add(Weight::from_ref_time(17_052).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(17_052, 0).saturating_mul(m.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) - .saturating_add(Weight::from_proof_size(32).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into())) } /// Storage: Council Members (r:1 w:0) /// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured) @@ -367,11 +367,11 @@ impl WeightInfo for () { // Minimum execution time: 17_950 nanoseconds. Weight::from_parts(17_019_558, 3440) // Standard Error: 41 - .saturating_add(Weight::from_ref_time(1_807).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(1_807, 0).saturating_mul(b.into())) // Standard Error: 432 - .saturating_add(Weight::from_ref_time(27_986).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(27_986, 0).saturating_mul(m.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) - .saturating_add(Weight::from_proof_size(64).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) } /// Storage: Council Members (r:1 w:0) /// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured) @@ -393,15 +393,15 @@ impl WeightInfo for () { // Minimum execution time: 24_817 nanoseconds. Weight::from_parts(24_778_955, 6355) // Standard Error: 73 - .saturating_add(Weight::from_ref_time(2_355).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(2_355, 0).saturating_mul(b.into())) // Standard Error: 765 - .saturating_add(Weight::from_ref_time(20_518).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(20_518, 0).saturating_mul(m.into())) // Standard Error: 755 - .saturating_add(Weight::from_ref_time(85_670).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(85_670, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().reads(4_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) - .saturating_add(Weight::from_proof_size(165).saturating_mul(m.into())) - .saturating_add(Weight::from_proof_size(180).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 165).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 180).saturating_mul(p.into())) } /// Storage: Council Members (r:1 w:0) /// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured) @@ -415,10 +415,10 @@ impl WeightInfo for () { // Minimum execution time: 19_790 nanoseconds. Weight::from_parts(20_528_275, 4980) // Standard Error: 651 - .saturating_add(Weight::from_ref_time(48_856).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(48_856, 0).saturating_mul(m.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(128).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 128).saturating_mul(m.into())) } /// Storage: Council Voting (r:1 w:1) /// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured) @@ -437,13 +437,13 @@ impl WeightInfo for () { // Minimum execution time: 25_564 nanoseconds. Weight::from_parts(25_535_497, 5893) // Standard Error: 610 - .saturating_add(Weight::from_ref_time(27_956).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(27_956, 0).saturating_mul(m.into())) // Standard Error: 595 - .saturating_add(Weight::from_ref_time(84_835).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(84_835, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(260).saturating_mul(m.into())) - .saturating_add(Weight::from_proof_size(144).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 260).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 144).saturating_mul(p.into())) } /// Storage: Council Voting (r:1 w:1) /// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured) @@ -463,16 +463,16 @@ impl WeightInfo for () { // Minimum execution time: 36_515 nanoseconds. Weight::from_parts(36_626_648, 9164) // Standard Error: 98 - .saturating_add(Weight::from_ref_time(2_295).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(2_295, 0).saturating_mul(b.into())) // Standard Error: 1_036 - .saturating_add(Weight::from_ref_time(22_182).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(22_182, 0).saturating_mul(m.into())) // Standard Error: 1_010 - .saturating_add(Weight::from_ref_time(100_034).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(100_034, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().reads(4_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(4).saturating_mul(b.into())) - .saturating_add(Weight::from_proof_size(264).saturating_mul(m.into())) - .saturating_add(Weight::from_proof_size(160).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 4).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(0, 264).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 160).saturating_mul(p.into())) } /// Storage: Council Voting (r:1 w:1) /// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured) @@ -493,13 +493,13 @@ impl WeightInfo for () { // Minimum execution time: 28_858 nanoseconds. Weight::from_parts(28_050_047, 7095) // Standard Error: 614 - .saturating_add(Weight::from_ref_time(34_031).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(34_031, 0).saturating_mul(m.into())) // Standard Error: 599 - .saturating_add(Weight::from_ref_time(85_744).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(85_744, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().reads(4_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(325).saturating_mul(m.into())) - .saturating_add(Weight::from_proof_size(180).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 325).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 180).saturating_mul(p.into())) } /// Storage: Council Voting (r:1 w:1) /// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured) @@ -521,16 +521,16 @@ impl WeightInfo for () { // Minimum execution time: 38_608 nanoseconds. Weight::from_parts(39_948_329, 10565) // Standard Error: 84 - .saturating_add(Weight::from_ref_time(2_045).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(2_045, 0).saturating_mul(b.into())) // Standard Error: 895 - .saturating_add(Weight::from_ref_time(22_669).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(22_669, 0).saturating_mul(m.into())) // Standard Error: 872 - .saturating_add(Weight::from_ref_time(95_525).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(95_525, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().reads(5_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(5).saturating_mul(b.into())) - .saturating_add(Weight::from_proof_size(330).saturating_mul(m.into())) - .saturating_add(Weight::from_proof_size(200).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 5).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(0, 330).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 200).saturating_mul(p.into())) } /// Storage: Council Proposals (r:1 w:1) /// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured) @@ -546,9 +546,9 @@ impl WeightInfo for () { // Minimum execution time: 14_785 nanoseconds. Weight::from_parts(16_393_818, 1668) // Standard Error: 612 - .saturating_add(Weight::from_ref_time(76_786).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(76_786, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(96).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 96).saturating_mul(p.into())) } } diff --git a/frame/contracts/src/gas.rs b/frame/contracts/src/gas.rs index c6f7d44be686e..f6484fbcf4630 100644 --- a/frame/contracts/src/gas.rs +++ b/frame/contracts/src/gas.rs @@ -275,19 +275,19 @@ mod tests { struct SimpleToken(u64); impl Token for SimpleToken { fn weight(&self) -> Weight { - Weight::from_ref_time(self.0) + Weight::from_parts(self.0, 0) } } #[test] fn it_works() { - let gas_meter = GasMeter::::new(Weight::from_ref_time(50000)); - assert_eq!(gas_meter.gas_left(), Weight::from_ref_time(50000)); + let gas_meter = GasMeter::::new(Weight::from_parts(50000, 0)); + assert_eq!(gas_meter.gas_left(), Weight::from_parts(50000, 0)); } #[test] fn tracing() { - let mut gas_meter = GasMeter::::new(Weight::from_ref_time(50000)); + let mut gas_meter = GasMeter::::new(Weight::from_parts(50000, 0)); assert!(!gas_meter.charge(SimpleToken(1)).is_err()); let mut tokens = gas_meter.tokens().iter(); @@ -304,7 +304,7 @@ mod tests { // Make sure that the gas meter does not charge in case of overcharger #[test] fn overcharge_does_not_charge() { - let mut gas_meter = GasMeter::::new(Weight::from_ref_time(200)); + let mut gas_meter = GasMeter::::new(Weight::from_parts(200, 0)); // The first charge is should lead to OOG. assert!(gas_meter.charge(SimpleToken(300)).is_err()); @@ -317,7 +317,7 @@ mod tests { // possible. #[test] fn charge_exact_amount() { - let mut gas_meter = GasMeter::::new(Weight::from_ref_time(25)); + let mut gas_meter = GasMeter::::new(Weight::from_parts(25, 0)); assert!(!gas_meter.charge(SimpleToken(25)).is_err()); } } diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs index bf1bd4f65442f..cecac03388d1b 100644 --- a/frame/contracts/src/tests.rs +++ b/frame/contracts/src/tests.rs @@ -190,7 +190,7 @@ impl ChainExtension for TestExtension { }, 2 => { let mut env = env.buf_in_buf_out(); - let weight = Weight::from_ref_time(env.read(5)?[4].into()); + let weight = Weight::from_parts(env.read(5)?[4].into(), 0); env.charge_weight(weight)?; Ok(RetVal::Converging(id)) }, @@ -705,7 +705,7 @@ fn run_out_of_gas() { RuntimeOrigin::signed(ALICE), addr, // newly created account 0, - Weight::from_ref_time(1_000_000_000_000).set_proof_size(u64::MAX), + Weight::from_parts(1_000_000_000_000, u64::MAX), None, vec![], ), @@ -2115,7 +2115,7 @@ fn lazy_removal_partial_remove_works() { // We create a contract with some extra keys above the weight limit let extra_keys = 7u32; - let weight_limit = Weight::from_ref_time(5_000_000_000); + let weight_limit = Weight::from_parts(5_000_000_000, 0); let (_, max_keys) = ContractInfo::::deletion_budget(1, weight_limit); let vals: Vec<_> = (0..max_keys + extra_keys) .map(|i| (blake2_256(&i.encode()), (i as u32), (i as u32).encode())) diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs index ab873331cbbc6..e80e2cde302fe 100644 --- a/frame/contracts/src/wasm/runtime.rs +++ b/frame/contracts/src/wasm/runtime.rs @@ -282,7 +282,7 @@ impl RuntimeCosts { fn token(&self, s: &HostFnWeights) -> RuntimeToken { use self::RuntimeCosts::*; let weight = match *self { - MeteringBlock(amount) => s.gas.saturating_add(Weight::from_ref_time(amount)), + MeteringBlock(amount) => s.gas.saturating_add(Weight::from_parts(amount, 0)), CopyFromContract(len) => s.return_per_byte.saturating_mul(len.into()), CopyToContract(len) => s.input_per_byte.saturating_mul(len.into()), Caller => s.caller, @@ -903,7 +903,7 @@ impl<'a, E: Ext + 'a> Runtime<'a, E> { self.charge_gas(RuntimeCosts::CallSurchargeTransfer)?; } self.ext.call( - Weight::from_ref_time(gas), + Weight::from_parts(gas, 0), callee, value, input_data, @@ -958,7 +958,7 @@ impl<'a, E: Ext + 'a> Runtime<'a, E> { salt_ptr: u32, salt_len: u32, ) -> Result { - let gas = Weight::from_ref_time(gas); + let gas = Weight::from_parts(gas, 0); self.charge_gas(RuntimeCosts::InstantiateBase { input_data_len, salt_len })?; let value: BalanceOf<::T> = self.read_sandbox_memory_as(memory, value_ptr)?; if value > 0u32.into() { @@ -1802,7 +1802,7 @@ pub mod env { out_ptr: u32, out_len_ptr: u32, ) -> Result<(), TrapReason> { - let gas = Weight::from_ref_time(gas); + let gas = Weight::from_parts(gas, 0); ctx.charge_gas(RuntimeCosts::WeightToFee)?; Ok(ctx.write_sandbox_output( memory, diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs index 880b7305f3bc1..14e680fb6a0ed 100644 --- a/frame/contracts/src/weights.rs +++ b/frame/contracts/src/weights.rs @@ -179,8 +179,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `109` // Estimated: `604` // Minimum execution time: 2_591 nanoseconds. - Weight::from_ref_time(2_817_000) - .saturating_add(Weight::from_proof_size(604)) + Weight::from_parts(2_817_000, 0) + .saturating_add(Weight::from_parts(0, 604)) .saturating_add(T::DbWeight::get().reads(1_u64)) } /// Storage: Skipped Metadata (r:0 w:0) @@ -191,14 +191,14 @@ impl WeightInfo for SubstrateWeight { // Measured: `481 + k * (69 ±0)` // Estimated: `471 + k * (70 ±0)` // Minimum execution time: 10_190 nanoseconds. - Weight::from_ref_time(6_642_117) - .saturating_add(Weight::from_proof_size(471)) + Weight::from_parts(6_642_117, 0) + .saturating_add(Weight::from_parts(0, 471)) // Standard Error: 992 - .saturating_add(Weight::from_ref_time(919_828).saturating_mul(k.into())) + .saturating_add(Weight::from_parts(919_828, 0).saturating_mul(k.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(k.into()))) - .saturating_add(Weight::from_proof_size(70).saturating_mul(k.into())) + .saturating_add(Weight::from_parts(0, 70).saturating_mul(k.into())) } /// Storage: Contracts DeletionQueue (r:1 w:1) /// Proof: Contracts DeletionQueue (max_values: Some(1), max_size: Some(16642), added: 17137, mode: Measured) @@ -208,13 +208,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `281 + q * (33 ±0)` // Estimated: `763 + q * (33 ±0)` // Minimum execution time: 2_598 nanoseconds. - Weight::from_ref_time(10_288_252) - .saturating_add(Weight::from_proof_size(763)) + Weight::from_parts(10_288_252, 0) + .saturating_add(Weight::from_parts(0, 763)) // Standard Error: 2_886 - .saturating_add(Weight::from_ref_time(1_092_420).saturating_mul(q.into())) + .saturating_add(Weight::from_parts(1_092_420, 0).saturating_mul(q.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(33).saturating_mul(q.into())) + .saturating_add(Weight::from_parts(0, 33).saturating_mul(q.into())) } /// Storage: Contracts PristineCode (r:1 w:0) /// Proof: Contracts PristineCode (max_values: None, max_size: Some(125988), added: 128463, mode: Measured) @@ -226,13 +226,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `270 + c * (1 ±0)` // Estimated: `3025 + c * (2 ±0)` // Minimum execution time: 34_338 nanoseconds. - Weight::from_ref_time(32_159_677) - .saturating_add(Weight::from_proof_size(3025)) + Weight::from_parts(32_159_677, 0) + .saturating_add(Weight::from_parts(0, 3025)) // Standard Error: 53 - .saturating_add(Weight::from_ref_time(51_034).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(51_034, 0).saturating_mul(c.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(2).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(0, 2).saturating_mul(c.into())) } /// Storage: Contracts ContractInfoOf (r:1 w:1) /// Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured) @@ -250,13 +250,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `803` // Estimated: `16930 + c * (5 ±0)` // Minimum execution time: 385_587 nanoseconds. - Weight::from_ref_time(395_545_811) - .saturating_add(Weight::from_proof_size(16930)) + Weight::from_parts(395_545_811, 0) + .saturating_add(Weight::from_parts(0, 16930)) // Standard Error: 27 - .saturating_add(Weight::from_ref_time(31_342).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(31_342, 0).saturating_mul(c.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) - .saturating_add(Weight::from_proof_size(5).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(0, 5).saturating_mul(c.into())) } /// Storage: Contracts OwnerInfoOf (r:1 w:1) /// Proof: Contracts OwnerInfoOf (max_values: None, max_size: Some(88), added: 2563, mode: Measured) @@ -282,14 +282,14 @@ impl WeightInfo for SubstrateWeight { // Measured: `270` // Estimated: `20267` // Minimum execution time: 3_799_742 nanoseconds. - Weight::from_ref_time(670_115_588) - .saturating_add(Weight::from_proof_size(20267)) + Weight::from_parts(670_115_588, 0) + .saturating_add(Weight::from_parts(0, 20267)) // Standard Error: 287 - .saturating_add(Weight::from_ref_time(93_885).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(93_885, 0).saturating_mul(c.into())) // Standard Error: 16 - .saturating_add(Weight::from_ref_time(1_367).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(1_367, 0).saturating_mul(i.into())) // Standard Error: 16 - .saturating_add(Weight::from_ref_time(1_781).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(1_781, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(9_u64)) .saturating_add(T::DbWeight::get().writes(10_u64)) } @@ -314,12 +314,12 @@ impl WeightInfo for SubstrateWeight { // Measured: `546` // Estimated: `22039` // Minimum execution time: 1_949_008 nanoseconds. - Weight::from_ref_time(214_033_418) - .saturating_add(Weight::from_proof_size(22039)) + Weight::from_parts(214_033_418, 0) + .saturating_add(Weight::from_parts(0, 22039)) // Standard Error: 8 - .saturating_add(Weight::from_ref_time(1_666).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(1_666, 0).saturating_mul(i.into())) // Standard Error: 8 - .saturating_add(Weight::from_ref_time(1_801).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(1_801, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(9_u64)) .saturating_add(T::DbWeight::get().writes(7_u64)) } @@ -338,8 +338,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `855` // Estimated: `17145` // Minimum execution time: 146_654 nanoseconds. - Weight::from_ref_time(147_528_000) - .saturating_add(Weight::from_proof_size(17145)) + Weight::from_parts(147_528_000, 0) + .saturating_add(Weight::from_parts(0, 17145)) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -357,10 +357,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `109` // Estimated: `5386` // Minimum execution time: 387_889 nanoseconds. - Weight::from_ref_time(391_379_335) - .saturating_add(Weight::from_proof_size(5386)) + Weight::from_parts(391_379_335, 0) + .saturating_add(Weight::from_parts(0, 5386)) // Standard Error: 89 - .saturating_add(Weight::from_ref_time(94_810).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(94_810, 0).saturating_mul(c.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -377,8 +377,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `287` // Estimated: `6098` // Minimum execution time: 26_014 nanoseconds. - Weight::from_ref_time(26_510_000) - .saturating_add(Weight::from_proof_size(6098)) + Weight::from_parts(26_510_000, 0) + .saturating_add(Weight::from_parts(0, 6098)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -393,8 +393,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `666` // Estimated: `16848` // Minimum execution time: 30_177 nanoseconds. - Weight::from_ref_time(30_639_000) - .saturating_add(Weight::from_proof_size(16848)) + Weight::from_parts(30_639_000, 0) + .saturating_add(Weight::from_parts(0, 16848)) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(6_u64)) } @@ -414,13 +414,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `877 + r * (480 ±0)` // Estimated: `17295 + r * (2400 ±0)` // Minimum execution time: 373_786 nanoseconds. - Weight::from_ref_time(377_332_691) - .saturating_add(Weight::from_proof_size(17295)) + Weight::from_parts(377_332_691, 0) + .saturating_add(Weight::from_parts(0, 17295)) // Standard Error: 51_211 - .saturating_add(Weight::from_ref_time(17_715_615).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(17_715_615, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(2400).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2400).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -438,14 +438,14 @@ impl WeightInfo for SubstrateWeight { // Measured: `917 + r * (21778 ±0)` // Estimated: `17295 + r * (306895 ±0)` // Minimum execution time: 374_009 nanoseconds. - Weight::from_ref_time(238_991_986) - .saturating_add(Weight::from_proof_size(17295)) + Weight::from_parts(238_991_986, 0) + .saturating_add(Weight::from_parts(0, 17295)) // Standard Error: 464_711 - .saturating_add(Weight::from_ref_time(249_099_538).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(249_099_538, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().reads((80_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(306895).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 306895).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -463,14 +463,14 @@ impl WeightInfo for SubstrateWeight { // Measured: `921 + r * (22099 ±0)` // Estimated: `17340 + r * (308500 ±0)` // Minimum execution time: 375_058 nanoseconds. - Weight::from_ref_time(238_765_068) - .saturating_add(Weight::from_proof_size(17340)) + Weight::from_parts(238_765_068, 0) + .saturating_add(Weight::from_parts(0, 17340)) // Standard Error: 662_617 - .saturating_add(Weight::from_ref_time(302_175_089).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(302_175_089, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().reads((80_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(308500).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 308500).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -488,13 +488,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `884 + r * (480 ±0)` // Estimated: `17330 + r * (2400 ±0)` // Minimum execution time: 374_747 nanoseconds. - Weight::from_ref_time(376_482_380) - .saturating_add(Weight::from_proof_size(17330)) + Weight::from_parts(376_482_380, 0) + .saturating_add(Weight::from_parts(0, 17330)) // Standard Error: 61_919 - .saturating_add(Weight::from_ref_time(22_376_795).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(22_376_795, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(2400).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2400).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -512,13 +512,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `874 + r * (240 ±0)` // Estimated: `17265 + r * (1200 ±0)` // Minimum execution time: 372_287 nanoseconds. - Weight::from_ref_time(376_250_858) - .saturating_add(Weight::from_proof_size(17265)) + Weight::from_parts(376_250_858, 0) + .saturating_add(Weight::from_parts(0, 17265)) // Standard Error: 40_119 - .saturating_add(Weight::from_ref_time(11_359_647).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(11_359_647, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(1200).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 1200).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -536,13 +536,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `878 + r * (480 ±0)` // Estimated: `17260 + r * (2400 ±0)` // Minimum execution time: 374_445 nanoseconds. - Weight::from_ref_time(377_243_521) - .saturating_add(Weight::from_proof_size(17260)) + Weight::from_parts(377_243_521, 0) + .saturating_add(Weight::from_parts(0, 17260)) // Standard Error: 53_032 - .saturating_add(Weight::from_ref_time(17_684_246).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(17_684_246, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(2400).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2400).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -560,13 +560,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `879 + r * (480 ±0)` // Estimated: `17250 + r * (2405 ±0)` // Minimum execution time: 374_029 nanoseconds. - Weight::from_ref_time(380_415_186) - .saturating_add(Weight::from_proof_size(17250)) + Weight::from_parts(380_415_186, 0) + .saturating_add(Weight::from_parts(0, 17250)) // Standard Error: 60_562 - .saturating_add(Weight::from_ref_time(17_152_599).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(17_152_599, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(2405).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2405).saturating_mul(r.into())) } /// Storage: System Account (r:2 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -584,13 +584,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `1049 + r * (480 ±0)` // Estimated: `19849 + r * (2456 ±0)` // Minimum execution time: 373_999 nanoseconds. - Weight::from_ref_time(381_757_033) - .saturating_add(Weight::from_proof_size(19849)) + Weight::from_parts(381_757_033, 0) + .saturating_add(Weight::from_parts(0, 19849)) // Standard Error: 97_983 - .saturating_add(Weight::from_ref_time(98_290_984).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(98_290_984, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(2456).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2456).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -608,13 +608,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `888 + r * (480 ±0)` // Estimated: `17360 + r * (2400 ±0)` // Minimum execution time: 374_197 nanoseconds. - Weight::from_ref_time(377_755_896) - .saturating_add(Weight::from_proof_size(17360)) + Weight::from_parts(377_755_896, 0) + .saturating_add(Weight::from_parts(0, 17360)) // Standard Error: 60_542 - .saturating_add(Weight::from_ref_time(17_442_065).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(17_442_065, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(2400).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2400).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -632,13 +632,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `886 + r * (480 ±0)` // Estimated: `17290 + r * (2400 ±0)` // Minimum execution time: 373_888 nanoseconds. - Weight::from_ref_time(377_825_771) - .saturating_add(Weight::from_proof_size(17290)) + Weight::from_parts(377_825_771, 0) + .saturating_add(Weight::from_parts(0, 17290)) // Standard Error: 38_026 - .saturating_add(Weight::from_ref_time(17_147_903).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(17_147_903, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(2400).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2400).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -656,13 +656,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `883 + r * (480 ±0)` // Estimated: `17315 + r * (2400 ±0)` // Minimum execution time: 373_904 nanoseconds. - Weight::from_ref_time(378_652_372) - .saturating_add(Weight::from_proof_size(17315)) + Weight::from_parts(378_652_372, 0) + .saturating_add(Weight::from_parts(0, 17315)) // Standard Error: 43_833 - .saturating_add(Weight::from_ref_time(16_936_781).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(16_936_781, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(2400).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2400).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -680,13 +680,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `874 + r * (480 ±0)` // Estimated: `17245 + r * (2400 ±0)` // Minimum execution time: 373_473 nanoseconds. - Weight::from_ref_time(376_386_312) - .saturating_add(Weight::from_proof_size(17245)) + Weight::from_parts(376_386_312, 0) + .saturating_add(Weight::from_parts(0, 17245)) // Standard Error: 46_945 - .saturating_add(Weight::from_ref_time(17_336_462).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(17_336_462, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(2400).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2400).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -706,13 +706,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `951 + r * (800 ±0)` // Estimated: `19046 + r * (4805 ±0)` // Minimum execution time: 373_661 nanoseconds. - Weight::from_ref_time(385_824_015) - .saturating_add(Weight::from_proof_size(19046)) + Weight::from_parts(385_824_015, 0) + .saturating_add(Weight::from_parts(0, 19046)) // Standard Error: 75_964 - .saturating_add(Weight::from_ref_time(88_530_074).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(88_530_074, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(4805).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 4805).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -730,13 +730,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `841 + r * (320 ±0)` // Estimated: `17120 + r * (1600 ±0)` // Minimum execution time: 133_849 nanoseconds. - Weight::from_ref_time(137_283_391) - .saturating_add(Weight::from_proof_size(17120)) + Weight::from_parts(137_283_391, 0) + .saturating_add(Weight::from_parts(0, 17120)) // Standard Error: 13_312 - .saturating_add(Weight::from_ref_time(8_055_328).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(8_055_328, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(1600).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 1600).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -754,13 +754,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `876 + r * (480 ±0)` // Estimated: `17245 + r * (2400 ±0)` // Minimum execution time: 373_468 nanoseconds. - Weight::from_ref_time(376_121_093) - .saturating_add(Weight::from_proof_size(17245)) + Weight::from_parts(376_121_093, 0) + .saturating_add(Weight::from_parts(0, 17245)) // Standard Error: 61_857 - .saturating_add(Weight::from_ref_time(15_868_414).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(15_868_414, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(2400).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2400).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -778,10 +778,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `1356` // Estimated: `19650` // Minimum execution time: 390_668 nanoseconds. - Weight::from_ref_time(419_608_449) - .saturating_add(Weight::from_proof_size(19650)) + Weight::from_parts(419_608_449, 0) + .saturating_add(Weight::from_parts(0, 19650)) // Standard Error: 4_890 - .saturating_add(Weight::from_ref_time(9_672_288).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(9_672_288, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -801,13 +801,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `864 + r * (45 ±0)` // Estimated: `17190 + r * (225 ±0)` // Minimum execution time: 371_309 nanoseconds. - Weight::from_ref_time(373_625_402) - .saturating_add(Weight::from_proof_size(17190)) + Weight::from_parts(373_625_402, 0) + .saturating_add(Weight::from_parts(0, 17190)) // Standard Error: 419_605 - .saturating_add(Weight::from_ref_time(1_737_397).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_737_397, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(225).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 225).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -825,10 +825,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `874` // Estimated: `17285` // Minimum execution time: 374_094 nanoseconds. - Weight::from_ref_time(375_965_200) - .saturating_add(Weight::from_proof_size(17285)) + Weight::from_parts(375_965_200, 0) + .saturating_add(Weight::from_parts(0, 17285)) // Standard Error: 1_127 - .saturating_add(Weight::from_ref_time(232_645).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(232_645, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -852,15 +852,15 @@ impl WeightInfo for SubstrateWeight { // Measured: `906 + r * (452 ±0)` // Estimated: `20242 + r * (15004 ±0)` // Minimum execution time: 373_123 nanoseconds. - Weight::from_ref_time(374_924_634) - .saturating_add(Weight::from_proof_size(20242)) + Weight::from_parts(374_924_634, 0) + .saturating_add(Weight::from_parts(0, 20242)) // Standard Error: 378_010 - .saturating_add(Weight::from_ref_time(70_441_665).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(70_441_665, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().reads((6_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(3_u64)) .saturating_add(T::DbWeight::get().writes((7_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(15004).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 15004).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -880,13 +880,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `921 + r * (800 ±0)` // Estimated: `18835 + r * (4805 ±0)` // Minimum execution time: 373_291 nanoseconds. - Weight::from_ref_time(385_684_344) - .saturating_add(Weight::from_proof_size(18835)) + Weight::from_parts(385_684_344, 0) + .saturating_add(Weight::from_parts(0, 18835)) // Standard Error: 99_025 - .saturating_add(Weight::from_ref_time(111_308_793).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(111_308_793, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(4805).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 4805).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -904,13 +904,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `874 + r * (800 ±0)` // Estimated: `17250 + r * (4000 ±0)` // Minimum execution time: 371_900 nanoseconds. - Weight::from_ref_time(384_166_626) - .saturating_add(Weight::from_proof_size(17250)) + Weight::from_parts(384_166_626, 0) + .saturating_add(Weight::from_parts(0, 17250)) // Standard Error: 205_255 - .saturating_add(Weight::from_ref_time(229_214_157).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(229_214_157, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(4000).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 4000).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -929,18 +929,18 @@ impl WeightInfo for SubstrateWeight { // Measured: `1821 + t * (2608 ±0) + n * (7 ±0)` // Estimated: `21870 + t * (211030 ±0) + n * (50 ±0)` // Minimum execution time: 1_289_873 nanoseconds. - Weight::from_ref_time(581_702_206) - .saturating_add(Weight::from_proof_size(21870)) + Weight::from_parts(581_702_206, 0) + .saturating_add(Weight::from_parts(0, 21870)) // Standard Error: 665_638 - .saturating_add(Weight::from_ref_time(181_470_553).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(181_470_553, 0).saturating_mul(t.into())) // Standard Error: 182_816 - .saturating_add(Weight::from_ref_time(71_635_250).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(71_635_250, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().reads((80_u64).saturating_mul(t.into()))) .saturating_add(T::DbWeight::get().writes(3_u64)) .saturating_add(T::DbWeight::get().writes((80_u64).saturating_mul(t.into()))) - .saturating_add(Weight::from_proof_size(211030).saturating_mul(t.into())) - .saturating_add(Weight::from_proof_size(50).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 211030).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(0, 50).saturating_mul(n.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -958,13 +958,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `873 + r * (560 ±0)` // Estimated: `17240 + r * (2800 ±0)` // Minimum execution time: 148_635 nanoseconds. - Weight::from_ref_time(154_095_712) - .saturating_add(Weight::from_proof_size(17240)) + Weight::from_parts(154_095_712, 0) + .saturating_add(Weight::from_parts(0, 17240)) // Standard Error: 77_790 - .saturating_add(Weight::from_ref_time(14_837_085).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(14_837_085, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(2800).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2800).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) @@ -982,10 +982,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `125824` // Estimated: `265128` // Minimum execution time: 501_014 nanoseconds. - Weight::from_ref_time(505_634_218) - .saturating_add(Weight::from_proof_size(265128)) + Weight::from_parts(505_634_218, 0) + .saturating_add(Weight::from_parts(0, 265128)) // Standard Error: 2_441 - .saturating_add(Weight::from_ref_time(819_257).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(819_257, 0).saturating_mul(i.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -997,15 +997,15 @@ impl WeightInfo for SubstrateWeight { // Measured: `911 + r * (23420 ±0)` // Estimated: `911 + r * (23418 ±0)` // Minimum execution time: 375_301 nanoseconds. - Weight::from_ref_time(291_498_841) - .saturating_add(Weight::from_proof_size(911)) + Weight::from_parts(291_498_841, 0) + .saturating_add(Weight::from_parts(0, 911)) // Standard Error: 809_989 - .saturating_add(Weight::from_ref_time(464_550_291).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(464_550_291, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().reads((80_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(3_u64)) .saturating_add(T::DbWeight::get().writes((80_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(23418).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 23418).saturating_mul(r.into())) } /// Storage: Skipped Metadata (r:0 w:0) /// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured) @@ -1015,15 +1015,15 @@ impl WeightInfo for SubstrateWeight { // Measured: `12672 + n * (11945 ±0)` // Estimated: `8529 + n * (12814 ±61)` // Minimum execution time: 506_318 nanoseconds. - Weight::from_ref_time(676_935_313) - .saturating_add(Weight::from_proof_size(8529)) + Weight::from_parts(676_935_313, 0) + .saturating_add(Weight::from_parts(0, 8529)) // Standard Error: 1_589_291 - .saturating_add(Weight::from_ref_time(97_839_399).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(97_839_399, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(52_u64)) .saturating_add(T::DbWeight::get().reads((7_u64).saturating_mul(n.into()))) .saturating_add(T::DbWeight::get().writes(50_u64)) .saturating_add(T::DbWeight::get().writes((7_u64).saturating_mul(n.into()))) - .saturating_add(Weight::from_proof_size(12814).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 12814).saturating_mul(n.into())) } /// Storage: Skipped Metadata (r:0 w:0) /// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured) @@ -1033,15 +1033,15 @@ impl WeightInfo for SubstrateWeight { // Measured: `15170 + n * (175775 ±0)` // Estimated: `9914 + n * (176858 ±74)` // Minimum execution time: 506_148 nanoseconds. - Weight::from_ref_time(648_278_778) - .saturating_add(Weight::from_proof_size(9914)) + Weight::from_parts(648_278_778, 0) + .saturating_add(Weight::from_parts(0, 9914)) // Standard Error: 1_343_586 - .saturating_add(Weight::from_ref_time(65_789_595).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(65_789_595, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(51_u64)) .saturating_add(T::DbWeight::get().reads((7_u64).saturating_mul(n.into()))) .saturating_add(T::DbWeight::get().writes(49_u64)) .saturating_add(T::DbWeight::get().writes((7_u64).saturating_mul(n.into()))) - .saturating_add(Weight::from_proof_size(176858).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 176858).saturating_mul(n.into())) } /// Storage: Skipped Metadata (r:0 w:0) /// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured) @@ -1051,15 +1051,15 @@ impl WeightInfo for SubstrateWeight { // Measured: `903 + r * (23099 ±0)` // Estimated: `908 + r * (23099 ±0)` // Minimum execution time: 374_344 nanoseconds. - Weight::from_ref_time(293_272_061) - .saturating_add(Weight::from_proof_size(908)) + Weight::from_parts(293_272_061, 0) + .saturating_add(Weight::from_parts(0, 908)) // Standard Error: 810_412 - .saturating_add(Weight::from_ref_time(453_315_956).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(453_315_956, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().reads((80_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(3_u64)) .saturating_add(T::DbWeight::get().writes((80_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(23099).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 23099).saturating_mul(r.into())) } /// Storage: Skipped Metadata (r:0 w:0) /// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured) @@ -1069,15 +1069,15 @@ impl WeightInfo for SubstrateWeight { // Measured: `14895 + n * (175768 ±0)` // Estimated: `9551 + n * (176867 ±75)` // Minimum execution time: 478_564 nanoseconds. - Weight::from_ref_time(630_839_142) - .saturating_add(Weight::from_proof_size(9551)) + Weight::from_parts(630_839_142, 0) + .saturating_add(Weight::from_parts(0, 9551)) // Standard Error: 1_427_520 - .saturating_add(Weight::from_ref_time(66_813_592).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(66_813_592, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(51_u64)) .saturating_add(T::DbWeight::get().reads((7_u64).saturating_mul(n.into()))) .saturating_add(T::DbWeight::get().writes(48_u64)) .saturating_add(T::DbWeight::get().writes((7_u64).saturating_mul(n.into()))) - .saturating_add(Weight::from_proof_size(176867).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 176867).saturating_mul(n.into())) } /// Storage: Skipped Metadata (r:0 w:0) /// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured) @@ -1087,14 +1087,14 @@ impl WeightInfo for SubstrateWeight { // Measured: `896 + r * (23744 ±0)` // Estimated: `909 + r * (23740 ±0)` // Minimum execution time: 374_479 nanoseconds. - Weight::from_ref_time(311_839_315) - .saturating_add(Weight::from_proof_size(909)) + Weight::from_parts(311_839_315, 0) + .saturating_add(Weight::from_parts(0, 909)) // Standard Error: 666_553 - .saturating_add(Weight::from_ref_time(371_213_042).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(371_213_042, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().reads((80_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(23740).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 23740).saturating_mul(r.into())) } /// Storage: Skipped Metadata (r:0 w:0) /// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured) @@ -1104,14 +1104,14 @@ impl WeightInfo for SubstrateWeight { // Measured: `15501 + n * (175775 ±0)` // Estimated: `10042 + n * (176900 ±76)` // Minimum execution time: 460_639 nanoseconds. - Weight::from_ref_time(591_187_094) - .saturating_add(Weight::from_proof_size(10042)) + Weight::from_parts(591_187_094, 0) + .saturating_add(Weight::from_parts(0, 10042)) // Standard Error: 1_233_792 - .saturating_add(Weight::from_ref_time(160_874_477).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(160_874_477, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(51_u64)) .saturating_add(T::DbWeight::get().reads((7_u64).saturating_mul(n.into()))) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(176900).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 176900).saturating_mul(n.into())) } /// Storage: Skipped Metadata (r:0 w:0) /// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured) @@ -1121,14 +1121,14 @@ impl WeightInfo for SubstrateWeight { // Measured: `914 + r * (23098 ±0)` // Estimated: `920 + r * (23098 ±0)` // Minimum execution time: 374_272 nanoseconds. - Weight::from_ref_time(311_446_269) - .saturating_add(Weight::from_proof_size(920)) + Weight::from_parts(311_446_269, 0) + .saturating_add(Weight::from_parts(0, 920)) // Standard Error: 630_307 - .saturating_add(Weight::from_ref_time(357_134_931).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(357_134_931, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().reads((80_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(23098).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 23098).saturating_mul(r.into())) } /// Storage: Skipped Metadata (r:0 w:0) /// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured) @@ -1138,14 +1138,14 @@ impl WeightInfo for SubstrateWeight { // Measured: `14839 + n * (175789 ±0)` // Estimated: `9532 + n * (176874 ±75)` // Minimum execution time: 456_013 nanoseconds. - Weight::from_ref_time(575_116_352) - .saturating_add(Weight::from_proof_size(9532)) + Weight::from_parts(575_116_352, 0) + .saturating_add(Weight::from_parts(0, 9532)) // Standard Error: 1_122_298 - .saturating_add(Weight::from_ref_time(61_786_107).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(61_786_107, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(51_u64)) .saturating_add(T::DbWeight::get().reads((7_u64).saturating_mul(n.into()))) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(176874).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 176874).saturating_mul(n.into())) } /// Storage: Skipped Metadata (r:0 w:0) /// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured) @@ -1155,15 +1155,15 @@ impl WeightInfo for SubstrateWeight { // Measured: `911 + r * (23740 ±0)` // Estimated: `913 + r * (23739 ±0)` // Minimum execution time: 374_621 nanoseconds. - Weight::from_ref_time(299_689_489) - .saturating_add(Weight::from_proof_size(913)) + Weight::from_parts(299_689_489, 0) + .saturating_add(Weight::from_parts(0, 913)) // Standard Error: 757_735 - .saturating_add(Weight::from_ref_time(465_213_246).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(465_213_246, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().reads((80_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(3_u64)) .saturating_add(T::DbWeight::get().writes((80_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(23739).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 23739).saturating_mul(r.into())) } /// Storage: Skipped Metadata (r:0 w:0) /// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured) @@ -1173,15 +1173,15 @@ impl WeightInfo for SubstrateWeight { // Measured: `15502 + n * (175775 ±0)` // Estimated: `10042 + n * (176898 ±76)` // Minimum execution time: 481_980 nanoseconds. - Weight::from_ref_time(647_289_053) - .saturating_add(Weight::from_proof_size(10042)) + Weight::from_parts(647_289_053, 0) + .saturating_add(Weight::from_parts(0, 10042)) // Standard Error: 1_556_155 - .saturating_add(Weight::from_ref_time(166_592_657).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(166_592_657, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(51_u64)) .saturating_add(T::DbWeight::get().reads((7_u64).saturating_mul(n.into()))) .saturating_add(T::DbWeight::get().writes(48_u64)) .saturating_add(T::DbWeight::get().writes((7_u64).saturating_mul(n.into()))) - .saturating_add(Weight::from_proof_size(176898).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 176898).saturating_mul(n.into())) } /// Storage: System Account (r:1602 w:1601) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -1199,15 +1199,15 @@ impl WeightInfo for SubstrateWeight { // Measured: `1457 + r * (3604 ±0)` // Estimated: `21583 + r * (216101 ±0)` // Minimum execution time: 374_962 nanoseconds. - Weight::from_ref_time(313_416_386) - .saturating_add(Weight::from_proof_size(21583)) + Weight::from_parts(313_416_386, 0) + .saturating_add(Weight::from_parts(0, 21583)) // Standard Error: 710_675 - .saturating_add(Weight::from_ref_time(1_396_551_156).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_396_551_156, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().reads((80_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(4_u64)) .saturating_add(T::DbWeight::get().writes((80_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(216101).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 216101).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -1225,15 +1225,15 @@ impl WeightInfo for SubstrateWeight { // Measured: `1609 + r * (23073 ±0)` // Estimated: `22098 + r * (511456 ±1)` // Minimum execution time: 375_916 nanoseconds. - Weight::from_ref_time(376_468_000) - .saturating_add(Weight::from_proof_size(22098)) + Weight::from_parts(376_468_000, 0) + .saturating_add(Weight::from_parts(0, 22098)) // Standard Error: 7_246_855 - .saturating_add(Weight::from_ref_time(28_982_425_139).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(28_982_425_139, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().reads((160_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(3_u64)) .saturating_add(T::DbWeight::get().writes((160_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(511456).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 511456).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -1251,15 +1251,15 @@ impl WeightInfo for SubstrateWeight { // Measured: `0 + r * (71670 ±0)` // Estimated: `17285 + r * (659930 ±563)` // Minimum execution time: 375_412 nanoseconds. - Weight::from_ref_time(376_493_000) - .saturating_add(Weight::from_proof_size(17285)) + Weight::from_parts(376_493_000, 0) + .saturating_add(Weight::from_parts(0, 17285)) // Standard Error: 8_239_575 - .saturating_add(Weight::from_ref_time(28_716_347_183).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(28_716_347_183, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().reads((150_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(3_u64)) .saturating_add(T::DbWeight::get().writes((75_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(659930).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 659930).saturating_mul(r.into())) } /// Storage: System Account (r:82 w:81) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -1278,17 +1278,17 @@ impl WeightInfo for SubstrateWeight { // Measured: `24269 + t * (16910 ±0)` // Estimated: `532690 + t * (285025 ±0)` // Minimum execution time: 10_443_315 nanoseconds. - Weight::from_ref_time(9_342_574_069) - .saturating_add(Weight::from_proof_size(532690)) + Weight::from_parts(9_342_574_069, 0) + .saturating_add(Weight::from_parts(0, 532690)) // Standard Error: 7_237_279 - .saturating_add(Weight::from_ref_time(1_390_221_936).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(1_390_221_936, 0).saturating_mul(t.into())) // Standard Error: 10_851 - .saturating_add(Weight::from_ref_time(9_842_151).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(9_842_151, 0).saturating_mul(c.into())) .saturating_add(T::DbWeight::get().reads(167_u64)) .saturating_add(T::DbWeight::get().reads((81_u64).saturating_mul(t.into()))) .saturating_add(T::DbWeight::get().writes(163_u64)) .saturating_add(T::DbWeight::get().writes((81_u64).saturating_mul(t.into()))) - .saturating_add(Weight::from_proof_size(285025).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(0, 285025).saturating_mul(t.into())) } /// Storage: System Account (r:3202 w:3202) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -1310,15 +1310,15 @@ impl WeightInfo for SubstrateWeight { // Measured: `1775 + r * (25568 ±0)` // Estimated: `26563 + r * (1367114 ±2)` // Minimum execution time: 376_418 nanoseconds. - Weight::from_ref_time(377_292_000) - .saturating_add(Weight::from_proof_size(26563)) + Weight::from_parts(377_292_000, 0) + .saturating_add(Weight::from_parts(0, 26563)) // Standard Error: 32_312_545 - .saturating_add(Weight::from_ref_time(35_904_826_312).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(35_904_826_312, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().reads((480_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(5_u64)) .saturating_add(T::DbWeight::get().writes((400_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(1367114).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 1367114).saturating_mul(r.into())) } /// Storage: System Account (r:162 w:162) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -1342,19 +1342,19 @@ impl WeightInfo for SubstrateWeight { // Measured: `5785 + t * (33 ±0)` // Estimated: `850985 + t * (2671 ±3)` // Minimum execution time: 132_157_340 nanoseconds. - Weight::from_ref_time(11_329_968_948) - .saturating_add(Weight::from_proof_size(850985)) + Weight::from_parts(11_329_968_948, 0) + .saturating_add(Weight::from_parts(0, 850985)) // Standard Error: 99_102_968 - .saturating_add(Weight::from_ref_time(84_719_458).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(84_719_458, 0).saturating_mul(t.into())) // Standard Error: 161_609 - .saturating_add(Weight::from_ref_time(126_156_627).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(126_156_627, 0).saturating_mul(i.into())) // Standard Error: 161_609 - .saturating_add(Weight::from_ref_time(126_628_313).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(126_628_313, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(329_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(t.into()))) .saturating_add(T::DbWeight::get().writes(326_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(t.into()))) - .saturating_add(Weight::from_proof_size(2671).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(0, 2671).saturating_mul(t.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -1372,13 +1372,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `871 + r * (642 ±0)` // Estimated: `17225 + r * (3210 ±0)` // Minimum execution time: 373_559 nanoseconds. - Weight::from_ref_time(375_166_904) - .saturating_add(Weight::from_proof_size(17225)) + Weight::from_parts(375_166_904, 0) + .saturating_add(Weight::from_parts(0, 17225)) // Standard Error: 125_024 - .saturating_add(Weight::from_ref_time(42_291_595).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(42_291_595, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(3210).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 3210).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -1396,10 +1396,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `1673` // Estimated: `21160` // Minimum execution time: 416_233 nanoseconds. - Weight::from_ref_time(416_785_000) - .saturating_add(Weight::from_proof_size(21160)) + Weight::from_parts(416_785_000, 0) + .saturating_add(Weight::from_parts(0, 21160)) // Standard Error: 56_223 - .saturating_add(Weight::from_ref_time(324_513_835).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(324_513_835, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -1419,13 +1419,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `873 + r * (642 ±0)` // Estimated: `17235 + r * (3210 ±0)` // Minimum execution time: 371_735 nanoseconds. - Weight::from_ref_time(375_979_430) - .saturating_add(Weight::from_proof_size(17235)) + Weight::from_parts(375_979_430, 0) + .saturating_add(Weight::from_parts(0, 17235)) // Standard Error: 968_037 - .saturating_add(Weight::from_ref_time(57_780_769).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(57_780_769, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(3210).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 3210).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -1443,10 +1443,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `1675` // Estimated: `21205` // Minimum execution time: 428_196 nanoseconds. - Weight::from_ref_time(429_438_000) - .saturating_add(Weight::from_proof_size(21205)) + Weight::from_parts(429_438_000, 0) + .saturating_add(Weight::from_parts(0, 21205)) // Standard Error: 57_860 - .saturating_add(Weight::from_ref_time(260_917_896).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(260_917_896, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -1466,13 +1466,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `873 + r * (642 ±0)` // Estimated: `17235 + r * (3210 ±0)` // Minimum execution time: 371_412 nanoseconds. - Weight::from_ref_time(373_635_818) - .saturating_add(Weight::from_proof_size(17235)) + Weight::from_parts(373_635_818, 0) + .saturating_add(Weight::from_parts(0, 17235)) // Standard Error: 222_973 - .saturating_add(Weight::from_ref_time(33_347_181).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(33_347_181, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(3210).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 3210).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -1490,10 +1490,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `1675` // Estimated: `21180` // Minimum execution time: 405_858 nanoseconds. - Weight::from_ref_time(406_498_000) - .saturating_add(Weight::from_proof_size(21180)) + Weight::from_parts(406_498_000, 0) + .saturating_add(Weight::from_parts(0, 21180)) // Standard Error: 48_388 - .saturating_add(Weight::from_ref_time(103_283_157).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(103_283_157, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -1513,13 +1513,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `873 + r * (679 ±0)` // Estimated: `17235 + r * (3395 ±0)` // Minimum execution time: 371_746 nanoseconds. - Weight::from_ref_time(373_538_171) - .saturating_add(Weight::from_proof_size(17235)) + Weight::from_parts(373_538_171, 0) + .saturating_add(Weight::from_parts(0, 17235)) // Standard Error: 387_332 - .saturating_add(Weight::from_ref_time(35_933_528).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(35_933_528, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(3395).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 3395).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -1537,10 +1537,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `1675` // Estimated: `21225` // Minimum execution time: 405_752 nanoseconds. - Weight::from_ref_time(406_417_000) - .saturating_add(Weight::from_proof_size(21225)) + Weight::from_parts(406_417_000, 0) + .saturating_add(Weight::from_parts(0, 21225)) // Standard Error: 47_051 - .saturating_add(Weight::from_ref_time(103_325_027).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(103_325_027, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -1560,13 +1560,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `917 + r * (6083 ±0)` // Estimated: `17455 + r * (30415 ±0)` // Minimum execution time: 373_882 nanoseconds. - Weight::from_ref_time(376_553_787) - .saturating_add(Weight::from_proof_size(17455)) + Weight::from_parts(376_553_787, 0) + .saturating_add(Weight::from_parts(0, 17455)) // Standard Error: 912_833 - .saturating_add(Weight::from_ref_time(3_021_100_412).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(3_021_100_412, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(30415).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 30415).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -1584,13 +1584,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `886 + r * (3362 ±0)` // Estimated: `17300 + r * (16810 ±0)` // Minimum execution time: 373_673 nanoseconds. - Weight::from_ref_time(375_712_961) - .saturating_add(Weight::from_proof_size(17300)) + Weight::from_parts(375_712_961, 0) + .saturating_add(Weight::from_parts(0, 17300)) // Standard Error: 596_297 - .saturating_add(Weight::from_ref_time(738_257_638).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(738_257_638, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(16810).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 16810).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -1610,15 +1610,15 @@ impl WeightInfo for SubstrateWeight { // Measured: `0 + r * (79300 ±0)` // Estimated: `64844 + r * (942952 ±833)` // Minimum execution time: 374_097 nanoseconds. - Weight::from_ref_time(374_985_000) - .saturating_add(Weight::from_proof_size(64844)) + Weight::from_parts(374_985_000, 0) + .saturating_add(Weight::from_parts(0, 64844)) // Standard Error: 3_772_336 - .saturating_add(Weight::from_ref_time(1_546_402_854).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_546_402_854, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().reads((225_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(3_u64)) .saturating_add(T::DbWeight::get().writes((150_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(942952).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 942952).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -1636,13 +1636,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `869 + r * (240 ±0)` // Estimated: `17215 + r * (1200 ±0)` // Minimum execution time: 374_249 nanoseconds. - Weight::from_ref_time(377_990_998) - .saturating_add(Weight::from_proof_size(17215)) + Weight::from_parts(377_990_998, 0) + .saturating_add(Weight::from_parts(0, 17215)) // Standard Error: 38_133 - .saturating_add(Weight::from_ref_time(11_483_273).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(11_483_273, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(1200).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 1200).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -1660,13 +1660,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `2102 + r * (3154 ±0)` // Estimated: `21980 + r * (15875 ±2)` // Minimum execution time: 375_552 nanoseconds. - Weight::from_ref_time(400_624_032) - .saturating_add(Weight::from_proof_size(21980)) + Weight::from_parts(400_624_032, 0) + .saturating_add(Weight::from_parts(0, 21980)) // Standard Error: 82_523 - .saturating_add(Weight::from_ref_time(18_057_327).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(18_057_327, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(15875).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 15875).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -1686,13 +1686,13 @@ impl WeightInfo for SubstrateWeight { // Measured: `872 + r * (240 ±0)` // Estimated: `18598 + r * (1440 ±0)` // Minimum execution time: 373_899 nanoseconds. - Weight::from_ref_time(379_733_943) - .saturating_add(Weight::from_proof_size(18598)) + Weight::from_parts(379_733_943, 0) + .saturating_add(Weight::from_parts(0, 18598)) // Standard Error: 32_022 - .saturating_add(Weight::from_ref_time(9_381_180).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(9_381_180, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) - .saturating_add(Weight::from_proof_size(1440).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 1440).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64const(r: u32, ) -> Weight { @@ -1700,10 +1700,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 834 nanoseconds. - Weight::from_ref_time(1_009_646) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_009_646, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 388 - .saturating_add(Weight::from_ref_time(411_979).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(411_979, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64load(r: u32, ) -> Weight { @@ -1711,10 +1711,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 882 nanoseconds. - Weight::from_ref_time(1_416_377) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_416_377, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 1_133 - .saturating_add(Weight::from_ref_time(1_075_838).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_075_838, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64store(r: u32, ) -> Weight { @@ -1722,10 +1722,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 878 nanoseconds. - Weight::from_ref_time(1_343_056) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_343_056, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 426 - .saturating_add(Weight::from_ref_time(1_001_214).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_001_214, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_select(r: u32, ) -> Weight { @@ -1733,10 +1733,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 796 nanoseconds. - Weight::from_ref_time(1_079_086) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_079_086, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 409 - .saturating_add(Weight::from_ref_time(1_149_188).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_149_188, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_if(r: u32, ) -> Weight { @@ -1744,10 +1744,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 800 nanoseconds. - Weight::from_ref_time(1_044_184) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_044_184, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 707 - .saturating_add(Weight::from_ref_time(1_315_686).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_315_686, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_br(r: u32, ) -> Weight { @@ -1755,10 +1755,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 807 nanoseconds. - Weight::from_ref_time(1_049_633) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_049_633, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 361 - .saturating_add(Weight::from_ref_time(640_530).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(640_530, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_br_if(r: u32, ) -> Weight { @@ -1766,10 +1766,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 774 nanoseconds. - Weight::from_ref_time(1_124_053) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_124_053, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 784 - .saturating_add(Weight::from_ref_time(949_398).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(949_398, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_br_table(r: u32, ) -> Weight { @@ -1777,10 +1777,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 810 nanoseconds. - Weight::from_ref_time(676_581) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(676_581, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 2_356 - .saturating_add(Weight::from_ref_time(1_163_465).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_163_465, 0).saturating_mul(r.into())) } /// The range of component `e` is `[1, 256]`. fn instr_br_table_per_entry(e: u32, ) -> Weight { @@ -1788,10 +1788,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 2_580 nanoseconds. - Weight::from_ref_time(2_835_656) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(2_835_656, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 71 - .saturating_add(Weight::from_ref_time(4_686).saturating_mul(e.into())) + .saturating_add(Weight::from_parts(4_686, 0).saturating_mul(e.into())) } /// The range of component `r` is `[0, 50]`. fn instr_call(r: u32, ) -> Weight { @@ -1799,10 +1799,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 826 nanoseconds. - Weight::from_ref_time(1_625_698) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_625_698, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 1_740 - .saturating_add(Weight::from_ref_time(2_332_187).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(2_332_187, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_call_indirect(r: u32, ) -> Weight { @@ -1810,10 +1810,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 901 nanoseconds. - Weight::from_ref_time(2_338_620) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(2_338_620, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 1_642 - .saturating_add(Weight::from_ref_time(2_924_090).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(2_924_090, 0).saturating_mul(r.into())) } /// The range of component `p` is `[0, 128]`. fn instr_call_indirect_per_param(p: u32, ) -> Weight { @@ -1821,10 +1821,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 4_670 nanoseconds. - Weight::from_ref_time(5_556_246) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(5_556_246, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 1_491 - .saturating_add(Weight::from_ref_time(228_965).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(228_965, 0).saturating_mul(p.into())) } /// The range of component `l` is `[0, 1024]`. fn instr_call_per_local(l: u32, ) -> Weight { @@ -1832,10 +1832,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 3_099 nanoseconds. - Weight::from_ref_time(3_896_177) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(3_896_177, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 99 - .saturating_add(Weight::from_ref_time(91_304).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(91_304, 0).saturating_mul(l.into())) } /// The range of component `r` is `[0, 50]`. fn instr_local_get(r: u32, ) -> Weight { @@ -1843,10 +1843,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 3_042 nanoseconds. - Weight::from_ref_time(3_334_621) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(3_334_621, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 793 - .saturating_add(Weight::from_ref_time(459_346).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(459_346, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_local_set(r: u32, ) -> Weight { @@ -1854,10 +1854,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 2_968 nanoseconds. - Weight::from_ref_time(3_235_286) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(3_235_286, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 427 - .saturating_add(Weight::from_ref_time(485_454).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(485_454, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_local_tee(r: u32, ) -> Weight { @@ -1865,10 +1865,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 3_012 nanoseconds. - Weight::from_ref_time(3_303_555) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(3_303_555, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 371 - .saturating_add(Weight::from_ref_time(657_811).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(657_811, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_global_get(r: u32, ) -> Weight { @@ -1876,10 +1876,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 865 nanoseconds. - Weight::from_ref_time(1_249_987) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_249_987, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 417 - .saturating_add(Weight::from_ref_time(896_704).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(896_704, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_global_set(r: u32, ) -> Weight { @@ -1887,10 +1887,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 866 nanoseconds. - Weight::from_ref_time(1_216_218) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_216_218, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 503 - .saturating_add(Weight::from_ref_time(919_719).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(919_719, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_memory_current(r: u32, ) -> Weight { @@ -1898,10 +1898,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 921 nanoseconds. - Weight::from_ref_time(1_228_408) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_228_408, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 309 - .saturating_add(Weight::from_ref_time(813_007).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(813_007, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 1]`. fn instr_memory_grow(r: u32, ) -> Weight { @@ -1909,10 +1909,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 820 nanoseconds. - Weight::from_ref_time(914_830) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(914_830, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 6_018 - .saturating_add(Weight::from_ref_time(237_062_769).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(237_062_769, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64clz(r: u32, ) -> Weight { @@ -1920,10 +1920,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 812 nanoseconds. - Weight::from_ref_time(1_554_406) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_554_406, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 9_979 - .saturating_add(Weight::from_ref_time(625_434).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(625_434, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64ctz(r: u32, ) -> Weight { @@ -1931,10 +1931,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 798 nanoseconds. - Weight::from_ref_time(1_095_113) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_095_113, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 243 - .saturating_add(Weight::from_ref_time(634_204).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(634_204, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64popcnt(r: u32, ) -> Weight { @@ -1942,10 +1942,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 792 nanoseconds. - Weight::from_ref_time(1_109_845) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_109_845, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 14_944 - .saturating_add(Weight::from_ref_time(658_834).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(658_834, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64eqz(r: u32, ) -> Weight { @@ -1953,10 +1953,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 815 nanoseconds. - Weight::from_ref_time(1_068_916) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_068_916, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 327 - .saturating_add(Weight::from_ref_time(652_897).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(652_897, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64extendsi32(r: u32, ) -> Weight { @@ -1964,10 +1964,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 798 nanoseconds. - Weight::from_ref_time(1_069_745) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_069_745, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 306 - .saturating_add(Weight::from_ref_time(618_481).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(618_481, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64extendui32(r: u32, ) -> Weight { @@ -1975,10 +1975,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 799 nanoseconds. - Weight::from_ref_time(1_398_001) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_398_001, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 6_234 - .saturating_add(Weight::from_ref_time(611_399).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(611_399, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i32wrapi64(r: u32, ) -> Weight { @@ -1986,10 +1986,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 811 nanoseconds. - Weight::from_ref_time(1_098_083) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_098_083, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 297 - .saturating_add(Weight::from_ref_time(617_692).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(617_692, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64eq(r: u32, ) -> Weight { @@ -1997,10 +1997,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 815 nanoseconds. - Weight::from_ref_time(1_046_922) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_046_922, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 335 - .saturating_add(Weight::from_ref_time(909_196).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(909_196, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64ne(r: u32, ) -> Weight { @@ -2008,10 +2008,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 805 nanoseconds. - Weight::from_ref_time(1_093_667) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_093_667, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 233 - .saturating_add(Weight::from_ref_time(907_378).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(907_378, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64lts(r: u32, ) -> Weight { @@ -2019,10 +2019,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 805 nanoseconds. - Weight::from_ref_time(1_290_591) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_290_591, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 3_201 - .saturating_add(Weight::from_ref_time(902_006).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(902_006, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64ltu(r: u32, ) -> Weight { @@ -2030,10 +2030,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 783 nanoseconds. - Weight::from_ref_time(1_159_977) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_159_977, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 2_310 - .saturating_add(Weight::from_ref_time(906_489).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(906_489, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64gts(r: u32, ) -> Weight { @@ -2041,10 +2041,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 790 nanoseconds. - Weight::from_ref_time(1_109_719) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_109_719, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 261 - .saturating_add(Weight::from_ref_time(906_614).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(906_614, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64gtu(r: u32, ) -> Weight { @@ -2052,10 +2052,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 776 nanoseconds. - Weight::from_ref_time(1_076_567) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_076_567, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 348 - .saturating_add(Weight::from_ref_time(919_374).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(919_374, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64les(r: u32, ) -> Weight { @@ -2063,10 +2063,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 780 nanoseconds. - Weight::from_ref_time(1_069_663) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_069_663, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 265 - .saturating_add(Weight::from_ref_time(908_037).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(908_037, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64leu(r: u32, ) -> Weight { @@ -2074,10 +2074,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 832 nanoseconds. - Weight::from_ref_time(930_920) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(930_920, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 2_170 - .saturating_add(Weight::from_ref_time(929_811).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(929_811, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64ges(r: u32, ) -> Weight { @@ -2085,10 +2085,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 787 nanoseconds. - Weight::from_ref_time(1_087_325) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_087_325, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 315 - .saturating_add(Weight::from_ref_time(908_321).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(908_321, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64geu(r: u32, ) -> Weight { @@ -2096,10 +2096,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 798 nanoseconds. - Weight::from_ref_time(1_029_132) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_029_132, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 2_095 - .saturating_add(Weight::from_ref_time(913_553).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(913_553, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64add(r: u32, ) -> Weight { @@ -2107,10 +2107,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 791 nanoseconds. - Weight::from_ref_time(1_086_314) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_086_314, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 197 - .saturating_add(Weight::from_ref_time(896_392).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(896_392, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64sub(r: u32, ) -> Weight { @@ -2118,10 +2118,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 793 nanoseconds. - Weight::from_ref_time(1_078_172) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_078_172, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 404 - .saturating_add(Weight::from_ref_time(886_329).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(886_329, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64mul(r: u32, ) -> Weight { @@ -2129,10 +2129,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 799 nanoseconds. - Weight::from_ref_time(1_095_010) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_095_010, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 431 - .saturating_add(Weight::from_ref_time(886_513).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(886_513, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64divs(r: u32, ) -> Weight { @@ -2140,10 +2140,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 810 nanoseconds. - Weight::from_ref_time(1_114_325) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_114_325, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 452 - .saturating_add(Weight::from_ref_time(1_521_849).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_521_849, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64divu(r: u32, ) -> Weight { @@ -2151,10 +2151,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 784 nanoseconds. - Weight::from_ref_time(1_123_153) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_123_153, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 475 - .saturating_add(Weight::from_ref_time(1_457_746).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_457_746, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64rems(r: u32, ) -> Weight { @@ -2162,10 +2162,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 809 nanoseconds. - Weight::from_ref_time(1_145_906) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_145_906, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 718 - .saturating_add(Weight::from_ref_time(1_549_964).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_549_964, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64remu(r: u32, ) -> Weight { @@ -2173,10 +2173,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 803 nanoseconds. - Weight::from_ref_time(1_110_328) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_110_328, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 627 - .saturating_add(Weight::from_ref_time(1_453_013).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_453_013, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64and(r: u32, ) -> Weight { @@ -2184,10 +2184,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 786 nanoseconds. - Weight::from_ref_time(1_108_792) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_108_792, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 286 - .saturating_add(Weight::from_ref_time(897_035).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(897_035, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64or(r: u32, ) -> Weight { @@ -2195,10 +2195,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 787 nanoseconds. - Weight::from_ref_time(830_000) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(830_000, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 15_995 - .saturating_add(Weight::from_ref_time(963_344).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(963_344, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64xor(r: u32, ) -> Weight { @@ -2206,10 +2206,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 773 nanoseconds. - Weight::from_ref_time(1_082_459) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_082_459, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 330 - .saturating_add(Weight::from_ref_time(897_077).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(897_077, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64shl(r: u32, ) -> Weight { @@ -2217,10 +2217,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 810 nanoseconds. - Weight::from_ref_time(1_325_815) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_325_815, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 3_352 - .saturating_add(Weight::from_ref_time(899_555).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(899_555, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64shrs(r: u32, ) -> Weight { @@ -2228,10 +2228,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 808 nanoseconds. - Weight::from_ref_time(1_085_903) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_085_903, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 430 - .saturating_add(Weight::from_ref_time(903_249).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(903_249, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64shru(r: u32, ) -> Weight { @@ -2239,10 +2239,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 792 nanoseconds. - Weight::from_ref_time(1_091_261) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_091_261, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 312 - .saturating_add(Weight::from_ref_time(902_245).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(902_245, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64rotl(r: u32, ) -> Weight { @@ -2250,10 +2250,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 807 nanoseconds. - Weight::from_ref_time(1_121_052) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_121_052, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 506 - .saturating_add(Weight::from_ref_time(902_772).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(902_772, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64rotr(r: u32, ) -> Weight { @@ -2261,10 +2261,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 823 nanoseconds. - Weight::from_ref_time(1_317_597) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_317_597, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 6_219 - .saturating_add(Weight::from_ref_time(896_692).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(896_692, 0).saturating_mul(r.into())) } } @@ -2277,8 +2277,8 @@ impl WeightInfo for () { // Measured: `109` // Estimated: `604` // Minimum execution time: 2_591 nanoseconds. - Weight::from_ref_time(2_817_000) - .saturating_add(Weight::from_proof_size(604)) + Weight::from_parts(2_817_000, 0) + .saturating_add(Weight::from_parts(0, 604)) .saturating_add(RocksDbWeight::get().reads(1_u64)) } /// Storage: Skipped Metadata (r:0 w:0) @@ -2289,14 +2289,14 @@ impl WeightInfo for () { // Measured: `481 + k * (69 ±0)` // Estimated: `471 + k * (70 ±0)` // Minimum execution time: 10_190 nanoseconds. - Weight::from_ref_time(6_642_117) - .saturating_add(Weight::from_proof_size(471)) + Weight::from_parts(6_642_117, 0) + .saturating_add(Weight::from_parts(0, 471)) // Standard Error: 992 - .saturating_add(Weight::from_ref_time(919_828).saturating_mul(k.into())) + .saturating_add(Weight::from_parts(919_828, 0).saturating_mul(k.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(k.into()))) - .saturating_add(Weight::from_proof_size(70).saturating_mul(k.into())) + .saturating_add(Weight::from_parts(0, 70).saturating_mul(k.into())) } /// Storage: Contracts DeletionQueue (r:1 w:1) /// Proof: Contracts DeletionQueue (max_values: Some(1), max_size: Some(16642), added: 17137, mode: Measured) @@ -2306,13 +2306,13 @@ impl WeightInfo for () { // Measured: `281 + q * (33 ±0)` // Estimated: `763 + q * (33 ±0)` // Minimum execution time: 2_598 nanoseconds. - Weight::from_ref_time(10_288_252) - .saturating_add(Weight::from_proof_size(763)) + Weight::from_parts(10_288_252, 0) + .saturating_add(Weight::from_parts(0, 763)) // Standard Error: 2_886 - .saturating_add(Weight::from_ref_time(1_092_420).saturating_mul(q.into())) + .saturating_add(Weight::from_parts(1_092_420, 0).saturating_mul(q.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(33).saturating_mul(q.into())) + .saturating_add(Weight::from_parts(0, 33).saturating_mul(q.into())) } /// Storage: Contracts PristineCode (r:1 w:0) /// Proof: Contracts PristineCode (max_values: None, max_size: Some(125988), added: 128463, mode: Measured) @@ -2324,13 +2324,13 @@ impl WeightInfo for () { // Measured: `270 + c * (1 ±0)` // Estimated: `3025 + c * (2 ±0)` // Minimum execution time: 34_338 nanoseconds. - Weight::from_ref_time(32_159_677) - .saturating_add(Weight::from_proof_size(3025)) + Weight::from_parts(32_159_677, 0) + .saturating_add(Weight::from_parts(0, 3025)) // Standard Error: 53 - .saturating_add(Weight::from_ref_time(51_034).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(51_034, 0).saturating_mul(c.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(2).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(0, 2).saturating_mul(c.into())) } /// Storage: Contracts ContractInfoOf (r:1 w:1) /// Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured) @@ -2348,13 +2348,13 @@ impl WeightInfo for () { // Measured: `803` // Estimated: `16930 + c * (5 ±0)` // Minimum execution time: 385_587 nanoseconds. - Weight::from_ref_time(395_545_811) - .saturating_add(Weight::from_proof_size(16930)) + Weight::from_parts(395_545_811, 0) + .saturating_add(Weight::from_parts(0, 16930)) // Standard Error: 27 - .saturating_add(Weight::from_ref_time(31_342).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(31_342, 0).saturating_mul(c.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) - .saturating_add(Weight::from_proof_size(5).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(0, 5).saturating_mul(c.into())) } /// Storage: Contracts OwnerInfoOf (r:1 w:1) /// Proof: Contracts OwnerInfoOf (max_values: None, max_size: Some(88), added: 2563, mode: Measured) @@ -2380,14 +2380,14 @@ impl WeightInfo for () { // Measured: `270` // Estimated: `20267` // Minimum execution time: 3_799_742 nanoseconds. - Weight::from_ref_time(670_115_588) - .saturating_add(Weight::from_proof_size(20267)) + Weight::from_parts(670_115_588, 0) + .saturating_add(Weight::from_parts(0, 20267)) // Standard Error: 287 - .saturating_add(Weight::from_ref_time(93_885).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(93_885, 0).saturating_mul(c.into())) // Standard Error: 16 - .saturating_add(Weight::from_ref_time(1_367).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(1_367, 0).saturating_mul(i.into())) // Standard Error: 16 - .saturating_add(Weight::from_ref_time(1_781).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(1_781, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(9_u64)) .saturating_add(RocksDbWeight::get().writes(10_u64)) } @@ -2412,12 +2412,12 @@ impl WeightInfo for () { // Measured: `546` // Estimated: `22039` // Minimum execution time: 1_949_008 nanoseconds. - Weight::from_ref_time(214_033_418) - .saturating_add(Weight::from_proof_size(22039)) + Weight::from_parts(214_033_418, 0) + .saturating_add(Weight::from_parts(0, 22039)) // Standard Error: 8 - .saturating_add(Weight::from_ref_time(1_666).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(1_666, 0).saturating_mul(i.into())) // Standard Error: 8 - .saturating_add(Weight::from_ref_time(1_801).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(1_801, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(9_u64)) .saturating_add(RocksDbWeight::get().writes(7_u64)) } @@ -2436,8 +2436,8 @@ impl WeightInfo for () { // Measured: `855` // Estimated: `17145` // Minimum execution time: 146_654 nanoseconds. - Weight::from_ref_time(147_528_000) - .saturating_add(Weight::from_proof_size(17145)) + Weight::from_parts(147_528_000, 0) + .saturating_add(Weight::from_parts(0, 17145)) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) } @@ -2455,10 +2455,10 @@ impl WeightInfo for () { // Measured: `109` // Estimated: `5386` // Minimum execution time: 387_889 nanoseconds. - Weight::from_ref_time(391_379_335) - .saturating_add(Weight::from_proof_size(5386)) + Weight::from_parts(391_379_335, 0) + .saturating_add(Weight::from_parts(0, 5386)) // Standard Error: 89 - .saturating_add(Weight::from_ref_time(94_810).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(94_810, 0).saturating_mul(c.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) } @@ -2475,8 +2475,8 @@ impl WeightInfo for () { // Measured: `287` // Estimated: `6098` // Minimum execution time: 26_014 nanoseconds. - Weight::from_ref_time(26_510_000) - .saturating_add(Weight::from_proof_size(6098)) + Weight::from_parts(26_510_000, 0) + .saturating_add(Weight::from_parts(0, 6098)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) } @@ -2491,8 +2491,8 @@ impl WeightInfo for () { // Measured: `666` // Estimated: `16848` // Minimum execution time: 30_177 nanoseconds. - Weight::from_ref_time(30_639_000) - .saturating_add(Weight::from_proof_size(16848)) + Weight::from_parts(30_639_000, 0) + .saturating_add(Weight::from_parts(0, 16848)) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(6_u64)) } @@ -2512,13 +2512,13 @@ impl WeightInfo for () { // Measured: `877 + r * (480 ±0)` // Estimated: `17295 + r * (2400 ±0)` // Minimum execution time: 373_786 nanoseconds. - Weight::from_ref_time(377_332_691) - .saturating_add(Weight::from_proof_size(17295)) + Weight::from_parts(377_332_691, 0) + .saturating_add(Weight::from_parts(0, 17295)) // Standard Error: 51_211 - .saturating_add(Weight::from_ref_time(17_715_615).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(17_715_615, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(2400).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2400).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -2536,14 +2536,14 @@ impl WeightInfo for () { // Measured: `917 + r * (21778 ±0)` // Estimated: `17295 + r * (306895 ±0)` // Minimum execution time: 374_009 nanoseconds. - Weight::from_ref_time(238_991_986) - .saturating_add(Weight::from_proof_size(17295)) + Weight::from_parts(238_991_986, 0) + .saturating_add(Weight::from_parts(0, 17295)) // Standard Error: 464_711 - .saturating_add(Weight::from_ref_time(249_099_538).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(249_099_538, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().reads((80_u64).saturating_mul(r.into()))) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(306895).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 306895).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -2561,14 +2561,14 @@ impl WeightInfo for () { // Measured: `921 + r * (22099 ±0)` // Estimated: `17340 + r * (308500 ±0)` // Minimum execution time: 375_058 nanoseconds. - Weight::from_ref_time(238_765_068) - .saturating_add(Weight::from_proof_size(17340)) + Weight::from_parts(238_765_068, 0) + .saturating_add(Weight::from_parts(0, 17340)) // Standard Error: 662_617 - .saturating_add(Weight::from_ref_time(302_175_089).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(302_175_089, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().reads((80_u64).saturating_mul(r.into()))) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(308500).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 308500).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -2586,13 +2586,13 @@ impl WeightInfo for () { // Measured: `884 + r * (480 ±0)` // Estimated: `17330 + r * (2400 ±0)` // Minimum execution time: 374_747 nanoseconds. - Weight::from_ref_time(376_482_380) - .saturating_add(Weight::from_proof_size(17330)) + Weight::from_parts(376_482_380, 0) + .saturating_add(Weight::from_parts(0, 17330)) // Standard Error: 61_919 - .saturating_add(Weight::from_ref_time(22_376_795).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(22_376_795, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(2400).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2400).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -2610,13 +2610,13 @@ impl WeightInfo for () { // Measured: `874 + r * (240 ±0)` // Estimated: `17265 + r * (1200 ±0)` // Minimum execution time: 372_287 nanoseconds. - Weight::from_ref_time(376_250_858) - .saturating_add(Weight::from_proof_size(17265)) + Weight::from_parts(376_250_858, 0) + .saturating_add(Weight::from_parts(0, 17265)) // Standard Error: 40_119 - .saturating_add(Weight::from_ref_time(11_359_647).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(11_359_647, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(1200).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 1200).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -2634,13 +2634,13 @@ impl WeightInfo for () { // Measured: `878 + r * (480 ±0)` // Estimated: `17260 + r * (2400 ±0)` // Minimum execution time: 374_445 nanoseconds. - Weight::from_ref_time(377_243_521) - .saturating_add(Weight::from_proof_size(17260)) + Weight::from_parts(377_243_521, 0) + .saturating_add(Weight::from_parts(0, 17260)) // Standard Error: 53_032 - .saturating_add(Weight::from_ref_time(17_684_246).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(17_684_246, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(2400).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2400).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -2658,13 +2658,13 @@ impl WeightInfo for () { // Measured: `879 + r * (480 ±0)` // Estimated: `17250 + r * (2405 ±0)` // Minimum execution time: 374_029 nanoseconds. - Weight::from_ref_time(380_415_186) - .saturating_add(Weight::from_proof_size(17250)) + Weight::from_parts(380_415_186, 0) + .saturating_add(Weight::from_parts(0, 17250)) // Standard Error: 60_562 - .saturating_add(Weight::from_ref_time(17_152_599).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(17_152_599, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(2405).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2405).saturating_mul(r.into())) } /// Storage: System Account (r:2 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -2682,13 +2682,13 @@ impl WeightInfo for () { // Measured: `1049 + r * (480 ±0)` // Estimated: `19849 + r * (2456 ±0)` // Minimum execution time: 373_999 nanoseconds. - Weight::from_ref_time(381_757_033) - .saturating_add(Weight::from_proof_size(19849)) + Weight::from_parts(381_757_033, 0) + .saturating_add(Weight::from_parts(0, 19849)) // Standard Error: 97_983 - .saturating_add(Weight::from_ref_time(98_290_984).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(98_290_984, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(7_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(2456).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2456).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -2706,13 +2706,13 @@ impl WeightInfo for () { // Measured: `888 + r * (480 ±0)` // Estimated: `17360 + r * (2400 ±0)` // Minimum execution time: 374_197 nanoseconds. - Weight::from_ref_time(377_755_896) - .saturating_add(Weight::from_proof_size(17360)) + Weight::from_parts(377_755_896, 0) + .saturating_add(Weight::from_parts(0, 17360)) // Standard Error: 60_542 - .saturating_add(Weight::from_ref_time(17_442_065).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(17_442_065, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(2400).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2400).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -2730,13 +2730,13 @@ impl WeightInfo for () { // Measured: `886 + r * (480 ±0)` // Estimated: `17290 + r * (2400 ±0)` // Minimum execution time: 373_888 nanoseconds. - Weight::from_ref_time(377_825_771) - .saturating_add(Weight::from_proof_size(17290)) + Weight::from_parts(377_825_771, 0) + .saturating_add(Weight::from_parts(0, 17290)) // Standard Error: 38_026 - .saturating_add(Weight::from_ref_time(17_147_903).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(17_147_903, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(2400).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2400).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -2754,13 +2754,13 @@ impl WeightInfo for () { // Measured: `883 + r * (480 ±0)` // Estimated: `17315 + r * (2400 ±0)` // Minimum execution time: 373_904 nanoseconds. - Weight::from_ref_time(378_652_372) - .saturating_add(Weight::from_proof_size(17315)) + Weight::from_parts(378_652_372, 0) + .saturating_add(Weight::from_parts(0, 17315)) // Standard Error: 43_833 - .saturating_add(Weight::from_ref_time(16_936_781).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(16_936_781, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(2400).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2400).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -2778,13 +2778,13 @@ impl WeightInfo for () { // Measured: `874 + r * (480 ±0)` // Estimated: `17245 + r * (2400 ±0)` // Minimum execution time: 373_473 nanoseconds. - Weight::from_ref_time(376_386_312) - .saturating_add(Weight::from_proof_size(17245)) + Weight::from_parts(376_386_312, 0) + .saturating_add(Weight::from_parts(0, 17245)) // Standard Error: 46_945 - .saturating_add(Weight::from_ref_time(17_336_462).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(17_336_462, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(2400).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2400).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -2804,13 +2804,13 @@ impl WeightInfo for () { // Measured: `951 + r * (800 ±0)` // Estimated: `19046 + r * (4805 ±0)` // Minimum execution time: 373_661 nanoseconds. - Weight::from_ref_time(385_824_015) - .saturating_add(Weight::from_proof_size(19046)) + Weight::from_parts(385_824_015, 0) + .saturating_add(Weight::from_parts(0, 19046)) // Standard Error: 75_964 - .saturating_add(Weight::from_ref_time(88_530_074).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(88_530_074, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(7_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(4805).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 4805).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -2828,13 +2828,13 @@ impl WeightInfo for () { // Measured: `841 + r * (320 ±0)` // Estimated: `17120 + r * (1600 ±0)` // Minimum execution time: 133_849 nanoseconds. - Weight::from_ref_time(137_283_391) - .saturating_add(Weight::from_proof_size(17120)) + Weight::from_parts(137_283_391, 0) + .saturating_add(Weight::from_parts(0, 17120)) // Standard Error: 13_312 - .saturating_add(Weight::from_ref_time(8_055_328).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(8_055_328, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(1600).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 1600).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -2852,13 +2852,13 @@ impl WeightInfo for () { // Measured: `876 + r * (480 ±0)` // Estimated: `17245 + r * (2400 ±0)` // Minimum execution time: 373_468 nanoseconds. - Weight::from_ref_time(376_121_093) - .saturating_add(Weight::from_proof_size(17245)) + Weight::from_parts(376_121_093, 0) + .saturating_add(Weight::from_parts(0, 17245)) // Standard Error: 61_857 - .saturating_add(Weight::from_ref_time(15_868_414).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(15_868_414, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(2400).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2400).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -2876,10 +2876,10 @@ impl WeightInfo for () { // Measured: `1356` // Estimated: `19650` // Minimum execution time: 390_668 nanoseconds. - Weight::from_ref_time(419_608_449) - .saturating_add(Weight::from_proof_size(19650)) + Weight::from_parts(419_608_449, 0) + .saturating_add(Weight::from_parts(0, 19650)) // Standard Error: 4_890 - .saturating_add(Weight::from_ref_time(9_672_288).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(9_672_288, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) } @@ -2899,13 +2899,13 @@ impl WeightInfo for () { // Measured: `864 + r * (45 ±0)` // Estimated: `17190 + r * (225 ±0)` // Minimum execution time: 371_309 nanoseconds. - Weight::from_ref_time(373_625_402) - .saturating_add(Weight::from_proof_size(17190)) + Weight::from_parts(373_625_402, 0) + .saturating_add(Weight::from_parts(0, 17190)) // Standard Error: 419_605 - .saturating_add(Weight::from_ref_time(1_737_397).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_737_397, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(225).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 225).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -2923,10 +2923,10 @@ impl WeightInfo for () { // Measured: `874` // Estimated: `17285` // Minimum execution time: 374_094 nanoseconds. - Weight::from_ref_time(375_965_200) - .saturating_add(Weight::from_proof_size(17285)) + Weight::from_parts(375_965_200, 0) + .saturating_add(Weight::from_parts(0, 17285)) // Standard Error: 1_127 - .saturating_add(Weight::from_ref_time(232_645).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(232_645, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) } @@ -2950,15 +2950,15 @@ impl WeightInfo for () { // Measured: `906 + r * (452 ±0)` // Estimated: `20242 + r * (15004 ±0)` // Minimum execution time: 373_123 nanoseconds. - Weight::from_ref_time(374_924_634) - .saturating_add(Weight::from_proof_size(20242)) + Weight::from_parts(374_924_634, 0) + .saturating_add(Weight::from_parts(0, 20242)) // Standard Error: 378_010 - .saturating_add(Weight::from_ref_time(70_441_665).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(70_441_665, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().reads((6_u64).saturating_mul(r.into()))) .saturating_add(RocksDbWeight::get().writes(3_u64)) .saturating_add(RocksDbWeight::get().writes((7_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(15004).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 15004).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -2978,13 +2978,13 @@ impl WeightInfo for () { // Measured: `921 + r * (800 ±0)` // Estimated: `18835 + r * (4805 ±0)` // Minimum execution time: 373_291 nanoseconds. - Weight::from_ref_time(385_684_344) - .saturating_add(Weight::from_proof_size(18835)) + Weight::from_parts(385_684_344, 0) + .saturating_add(Weight::from_parts(0, 18835)) // Standard Error: 99_025 - .saturating_add(Weight::from_ref_time(111_308_793).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(111_308_793, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(7_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(4805).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 4805).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -3002,13 +3002,13 @@ impl WeightInfo for () { // Measured: `874 + r * (800 ±0)` // Estimated: `17250 + r * (4000 ±0)` // Minimum execution time: 371_900 nanoseconds. - Weight::from_ref_time(384_166_626) - .saturating_add(Weight::from_proof_size(17250)) + Weight::from_parts(384_166_626, 0) + .saturating_add(Weight::from_parts(0, 17250)) // Standard Error: 205_255 - .saturating_add(Weight::from_ref_time(229_214_157).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(229_214_157, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(4000).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 4000).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -3027,18 +3027,18 @@ impl WeightInfo for () { // Measured: `1821 + t * (2608 ±0) + n * (7 ±0)` // Estimated: `21870 + t * (211030 ±0) + n * (50 ±0)` // Minimum execution time: 1_289_873 nanoseconds. - Weight::from_ref_time(581_702_206) - .saturating_add(Weight::from_proof_size(21870)) + Weight::from_parts(581_702_206, 0) + .saturating_add(Weight::from_parts(0, 21870)) // Standard Error: 665_638 - .saturating_add(Weight::from_ref_time(181_470_553).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(181_470_553, 0).saturating_mul(t.into())) // Standard Error: 182_816 - .saturating_add(Weight::from_ref_time(71_635_250).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(71_635_250, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().reads((80_u64).saturating_mul(t.into()))) .saturating_add(RocksDbWeight::get().writes(3_u64)) .saturating_add(RocksDbWeight::get().writes((80_u64).saturating_mul(t.into()))) - .saturating_add(Weight::from_proof_size(211030).saturating_mul(t.into())) - .saturating_add(Weight::from_proof_size(50).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 211030).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(0, 50).saturating_mul(n.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -3056,13 +3056,13 @@ impl WeightInfo for () { // Measured: `873 + r * (560 ±0)` // Estimated: `17240 + r * (2800 ±0)` // Minimum execution time: 148_635 nanoseconds. - Weight::from_ref_time(154_095_712) - .saturating_add(Weight::from_proof_size(17240)) + Weight::from_parts(154_095_712, 0) + .saturating_add(Weight::from_parts(0, 17240)) // Standard Error: 77_790 - .saturating_add(Weight::from_ref_time(14_837_085).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(14_837_085, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(2800).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2800).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) @@ -3080,10 +3080,10 @@ impl WeightInfo for () { // Measured: `125824` // Estimated: `265128` // Minimum execution time: 501_014 nanoseconds. - Weight::from_ref_time(505_634_218) - .saturating_add(Weight::from_proof_size(265128)) + Weight::from_parts(505_634_218, 0) + .saturating_add(Weight::from_parts(0, 265128)) // Standard Error: 2_441 - .saturating_add(Weight::from_ref_time(819_257).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(819_257, 0).saturating_mul(i.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) } @@ -3095,15 +3095,15 @@ impl WeightInfo for () { // Measured: `911 + r * (23420 ±0)` // Estimated: `911 + r * (23418 ±0)` // Minimum execution time: 375_301 nanoseconds. - Weight::from_ref_time(291_498_841) - .saturating_add(Weight::from_proof_size(911)) + Weight::from_parts(291_498_841, 0) + .saturating_add(Weight::from_parts(0, 911)) // Standard Error: 809_989 - .saturating_add(Weight::from_ref_time(464_550_291).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(464_550_291, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().reads((80_u64).saturating_mul(r.into()))) .saturating_add(RocksDbWeight::get().writes(3_u64)) .saturating_add(RocksDbWeight::get().writes((80_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(23418).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 23418).saturating_mul(r.into())) } /// Storage: Skipped Metadata (r:0 w:0) /// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured) @@ -3113,15 +3113,15 @@ impl WeightInfo for () { // Measured: `12672 + n * (11945 ±0)` // Estimated: `8529 + n * (12814 ±61)` // Minimum execution time: 506_318 nanoseconds. - Weight::from_ref_time(676_935_313) - .saturating_add(Weight::from_proof_size(8529)) + Weight::from_parts(676_935_313, 0) + .saturating_add(Weight::from_parts(0, 8529)) // Standard Error: 1_589_291 - .saturating_add(Weight::from_ref_time(97_839_399).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(97_839_399, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(52_u64)) .saturating_add(RocksDbWeight::get().reads((7_u64).saturating_mul(n.into()))) .saturating_add(RocksDbWeight::get().writes(50_u64)) .saturating_add(RocksDbWeight::get().writes((7_u64).saturating_mul(n.into()))) - .saturating_add(Weight::from_proof_size(12814).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 12814).saturating_mul(n.into())) } /// Storage: Skipped Metadata (r:0 w:0) /// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured) @@ -3131,15 +3131,15 @@ impl WeightInfo for () { // Measured: `15170 + n * (175775 ±0)` // Estimated: `9914 + n * (176858 ±74)` // Minimum execution time: 506_148 nanoseconds. - Weight::from_ref_time(648_278_778) - .saturating_add(Weight::from_proof_size(9914)) + Weight::from_parts(648_278_778, 0) + .saturating_add(Weight::from_parts(0, 9914)) // Standard Error: 1_343_586 - .saturating_add(Weight::from_ref_time(65_789_595).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(65_789_595, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(51_u64)) .saturating_add(RocksDbWeight::get().reads((7_u64).saturating_mul(n.into()))) .saturating_add(RocksDbWeight::get().writes(49_u64)) .saturating_add(RocksDbWeight::get().writes((7_u64).saturating_mul(n.into()))) - .saturating_add(Weight::from_proof_size(176858).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 176858).saturating_mul(n.into())) } /// Storage: Skipped Metadata (r:0 w:0) /// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured) @@ -3149,15 +3149,15 @@ impl WeightInfo for () { // Measured: `903 + r * (23099 ±0)` // Estimated: `908 + r * (23099 ±0)` // Minimum execution time: 374_344 nanoseconds. - Weight::from_ref_time(293_272_061) - .saturating_add(Weight::from_proof_size(908)) + Weight::from_parts(293_272_061, 0) + .saturating_add(Weight::from_parts(0, 908)) // Standard Error: 810_412 - .saturating_add(Weight::from_ref_time(453_315_956).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(453_315_956, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().reads((80_u64).saturating_mul(r.into()))) .saturating_add(RocksDbWeight::get().writes(3_u64)) .saturating_add(RocksDbWeight::get().writes((80_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(23099).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 23099).saturating_mul(r.into())) } /// Storage: Skipped Metadata (r:0 w:0) /// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured) @@ -3167,15 +3167,15 @@ impl WeightInfo for () { // Measured: `14895 + n * (175768 ±0)` // Estimated: `9551 + n * (176867 ±75)` // Minimum execution time: 478_564 nanoseconds. - Weight::from_ref_time(630_839_142) - .saturating_add(Weight::from_proof_size(9551)) + Weight::from_parts(630_839_142, 0) + .saturating_add(Weight::from_parts(0, 9551)) // Standard Error: 1_427_520 - .saturating_add(Weight::from_ref_time(66_813_592).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(66_813_592, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(51_u64)) .saturating_add(RocksDbWeight::get().reads((7_u64).saturating_mul(n.into()))) .saturating_add(RocksDbWeight::get().writes(48_u64)) .saturating_add(RocksDbWeight::get().writes((7_u64).saturating_mul(n.into()))) - .saturating_add(Weight::from_proof_size(176867).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 176867).saturating_mul(n.into())) } /// Storage: Skipped Metadata (r:0 w:0) /// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured) @@ -3185,14 +3185,14 @@ impl WeightInfo for () { // Measured: `896 + r * (23744 ±0)` // Estimated: `909 + r * (23740 ±0)` // Minimum execution time: 374_479 nanoseconds. - Weight::from_ref_time(311_839_315) - .saturating_add(Weight::from_proof_size(909)) + Weight::from_parts(311_839_315, 0) + .saturating_add(Weight::from_parts(0, 909)) // Standard Error: 666_553 - .saturating_add(Weight::from_ref_time(371_213_042).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(371_213_042, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().reads((80_u64).saturating_mul(r.into()))) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(23740).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 23740).saturating_mul(r.into())) } /// Storage: Skipped Metadata (r:0 w:0) /// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured) @@ -3202,14 +3202,14 @@ impl WeightInfo for () { // Measured: `15501 + n * (175775 ±0)` // Estimated: `10042 + n * (176900 ±76)` // Minimum execution time: 460_639 nanoseconds. - Weight::from_ref_time(591_187_094) - .saturating_add(Weight::from_proof_size(10042)) + Weight::from_parts(591_187_094, 0) + .saturating_add(Weight::from_parts(0, 10042)) // Standard Error: 1_233_792 - .saturating_add(Weight::from_ref_time(160_874_477).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(160_874_477, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(51_u64)) .saturating_add(RocksDbWeight::get().reads((7_u64).saturating_mul(n.into()))) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(176900).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 176900).saturating_mul(n.into())) } /// Storage: Skipped Metadata (r:0 w:0) /// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured) @@ -3219,14 +3219,14 @@ impl WeightInfo for () { // Measured: `914 + r * (23098 ±0)` // Estimated: `920 + r * (23098 ±0)` // Minimum execution time: 374_272 nanoseconds. - Weight::from_ref_time(311_446_269) - .saturating_add(Weight::from_proof_size(920)) + Weight::from_parts(311_446_269, 0) + .saturating_add(Weight::from_parts(0, 920)) // Standard Error: 630_307 - .saturating_add(Weight::from_ref_time(357_134_931).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(357_134_931, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().reads((80_u64).saturating_mul(r.into()))) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(23098).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 23098).saturating_mul(r.into())) } /// Storage: Skipped Metadata (r:0 w:0) /// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured) @@ -3236,14 +3236,14 @@ impl WeightInfo for () { // Measured: `14839 + n * (175789 ±0)` // Estimated: `9532 + n * (176874 ±75)` // Minimum execution time: 456_013 nanoseconds. - Weight::from_ref_time(575_116_352) - .saturating_add(Weight::from_proof_size(9532)) + Weight::from_parts(575_116_352, 0) + .saturating_add(Weight::from_parts(0, 9532)) // Standard Error: 1_122_298 - .saturating_add(Weight::from_ref_time(61_786_107).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(61_786_107, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(51_u64)) .saturating_add(RocksDbWeight::get().reads((7_u64).saturating_mul(n.into()))) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(176874).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 176874).saturating_mul(n.into())) } /// Storage: Skipped Metadata (r:0 w:0) /// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured) @@ -3253,15 +3253,15 @@ impl WeightInfo for () { // Measured: `911 + r * (23740 ±0)` // Estimated: `913 + r * (23739 ±0)` // Minimum execution time: 374_621 nanoseconds. - Weight::from_ref_time(299_689_489) - .saturating_add(Weight::from_proof_size(913)) + Weight::from_parts(299_689_489, 0) + .saturating_add(Weight::from_parts(0, 913)) // Standard Error: 757_735 - .saturating_add(Weight::from_ref_time(465_213_246).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(465_213_246, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().reads((80_u64).saturating_mul(r.into()))) .saturating_add(RocksDbWeight::get().writes(3_u64)) .saturating_add(RocksDbWeight::get().writes((80_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(23739).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 23739).saturating_mul(r.into())) } /// Storage: Skipped Metadata (r:0 w:0) /// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured) @@ -3271,15 +3271,15 @@ impl WeightInfo for () { // Measured: `15502 + n * (175775 ±0)` // Estimated: `10042 + n * (176898 ±76)` // Minimum execution time: 481_980 nanoseconds. - Weight::from_ref_time(647_289_053) - .saturating_add(Weight::from_proof_size(10042)) + Weight::from_parts(647_289_053, 0) + .saturating_add(Weight::from_parts(0, 10042)) // Standard Error: 1_556_155 - .saturating_add(Weight::from_ref_time(166_592_657).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(166_592_657, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(51_u64)) .saturating_add(RocksDbWeight::get().reads((7_u64).saturating_mul(n.into()))) .saturating_add(RocksDbWeight::get().writes(48_u64)) .saturating_add(RocksDbWeight::get().writes((7_u64).saturating_mul(n.into()))) - .saturating_add(Weight::from_proof_size(176898).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 176898).saturating_mul(n.into())) } /// Storage: System Account (r:1602 w:1601) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -3297,15 +3297,15 @@ impl WeightInfo for () { // Measured: `1457 + r * (3604 ±0)` // Estimated: `21583 + r * (216101 ±0)` // Minimum execution time: 374_962 nanoseconds. - Weight::from_ref_time(313_416_386) - .saturating_add(Weight::from_proof_size(21583)) + Weight::from_parts(313_416_386, 0) + .saturating_add(Weight::from_parts(0, 21583)) // Standard Error: 710_675 - .saturating_add(Weight::from_ref_time(1_396_551_156).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_396_551_156, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(7_u64)) .saturating_add(RocksDbWeight::get().reads((80_u64).saturating_mul(r.into()))) .saturating_add(RocksDbWeight::get().writes(4_u64)) .saturating_add(RocksDbWeight::get().writes((80_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(216101).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 216101).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -3323,15 +3323,15 @@ impl WeightInfo for () { // Measured: `1609 + r * (23073 ±0)` // Estimated: `22098 + r * (511456 ±1)` // Minimum execution time: 375_916 nanoseconds. - Weight::from_ref_time(376_468_000) - .saturating_add(Weight::from_proof_size(22098)) + Weight::from_parts(376_468_000, 0) + .saturating_add(Weight::from_parts(0, 22098)) // Standard Error: 7_246_855 - .saturating_add(Weight::from_ref_time(28_982_425_139).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(28_982_425_139, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(7_u64)) .saturating_add(RocksDbWeight::get().reads((160_u64).saturating_mul(r.into()))) .saturating_add(RocksDbWeight::get().writes(3_u64)) .saturating_add(RocksDbWeight::get().writes((160_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(511456).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 511456).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -3349,15 +3349,15 @@ impl WeightInfo for () { // Measured: `0 + r * (71670 ±0)` // Estimated: `17285 + r * (659930 ±563)` // Minimum execution time: 375_412 nanoseconds. - Weight::from_ref_time(376_493_000) - .saturating_add(Weight::from_proof_size(17285)) + Weight::from_parts(376_493_000, 0) + .saturating_add(Weight::from_parts(0, 17285)) // Standard Error: 8_239_575 - .saturating_add(Weight::from_ref_time(28_716_347_183).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(28_716_347_183, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().reads((150_u64).saturating_mul(r.into()))) .saturating_add(RocksDbWeight::get().writes(3_u64)) .saturating_add(RocksDbWeight::get().writes((75_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(659930).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 659930).saturating_mul(r.into())) } /// Storage: System Account (r:82 w:81) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -3376,17 +3376,17 @@ impl WeightInfo for () { // Measured: `24269 + t * (16910 ±0)` // Estimated: `532690 + t * (285025 ±0)` // Minimum execution time: 10_443_315 nanoseconds. - Weight::from_ref_time(9_342_574_069) - .saturating_add(Weight::from_proof_size(532690)) + Weight::from_parts(9_342_574_069, 0) + .saturating_add(Weight::from_parts(0, 532690)) // Standard Error: 7_237_279 - .saturating_add(Weight::from_ref_time(1_390_221_936).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(1_390_221_936, 0).saturating_mul(t.into())) // Standard Error: 10_851 - .saturating_add(Weight::from_ref_time(9_842_151).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(9_842_151, 0).saturating_mul(c.into())) .saturating_add(RocksDbWeight::get().reads(167_u64)) .saturating_add(RocksDbWeight::get().reads((81_u64).saturating_mul(t.into()))) .saturating_add(RocksDbWeight::get().writes(163_u64)) .saturating_add(RocksDbWeight::get().writes((81_u64).saturating_mul(t.into()))) - .saturating_add(Weight::from_proof_size(285025).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(0, 285025).saturating_mul(t.into())) } /// Storage: System Account (r:3202 w:3202) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -3408,15 +3408,15 @@ impl WeightInfo for () { // Measured: `1775 + r * (25568 ±0)` // Estimated: `26563 + r * (1367114 ±2)` // Minimum execution time: 376_418 nanoseconds. - Weight::from_ref_time(377_292_000) - .saturating_add(Weight::from_proof_size(26563)) + Weight::from_parts(377_292_000, 0) + .saturating_add(Weight::from_parts(0, 26563)) // Standard Error: 32_312_545 - .saturating_add(Weight::from_ref_time(35_904_826_312).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(35_904_826_312, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(8_u64)) .saturating_add(RocksDbWeight::get().reads((480_u64).saturating_mul(r.into()))) .saturating_add(RocksDbWeight::get().writes(5_u64)) .saturating_add(RocksDbWeight::get().writes((400_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(1367114).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 1367114).saturating_mul(r.into())) } /// Storage: System Account (r:162 w:162) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -3440,19 +3440,19 @@ impl WeightInfo for () { // Measured: `5785 + t * (33 ±0)` // Estimated: `850985 + t * (2671 ±3)` // Minimum execution time: 132_157_340 nanoseconds. - Weight::from_ref_time(11_329_968_948) - .saturating_add(Weight::from_proof_size(850985)) + Weight::from_parts(11_329_968_948, 0) + .saturating_add(Weight::from_parts(0, 850985)) // Standard Error: 99_102_968 - .saturating_add(Weight::from_ref_time(84_719_458).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(84_719_458, 0).saturating_mul(t.into())) // Standard Error: 161_609 - .saturating_add(Weight::from_ref_time(126_156_627).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(126_156_627, 0).saturating_mul(i.into())) // Standard Error: 161_609 - .saturating_add(Weight::from_ref_time(126_628_313).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(126_628_313, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(329_u64)) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(t.into()))) .saturating_add(RocksDbWeight::get().writes(326_u64)) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(t.into()))) - .saturating_add(Weight::from_proof_size(2671).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(0, 2671).saturating_mul(t.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -3470,13 +3470,13 @@ impl WeightInfo for () { // Measured: `871 + r * (642 ±0)` // Estimated: `17225 + r * (3210 ±0)` // Minimum execution time: 373_559 nanoseconds. - Weight::from_ref_time(375_166_904) - .saturating_add(Weight::from_proof_size(17225)) + Weight::from_parts(375_166_904, 0) + .saturating_add(Weight::from_parts(0, 17225)) // Standard Error: 125_024 - .saturating_add(Weight::from_ref_time(42_291_595).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(42_291_595, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(3210).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 3210).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -3494,10 +3494,10 @@ impl WeightInfo for () { // Measured: `1673` // Estimated: `21160` // Minimum execution time: 416_233 nanoseconds. - Weight::from_ref_time(416_785_000) - .saturating_add(Weight::from_proof_size(21160)) + Weight::from_parts(416_785_000, 0) + .saturating_add(Weight::from_parts(0, 21160)) // Standard Error: 56_223 - .saturating_add(Weight::from_ref_time(324_513_835).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(324_513_835, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) } @@ -3517,13 +3517,13 @@ impl WeightInfo for () { // Measured: `873 + r * (642 ±0)` // Estimated: `17235 + r * (3210 ±0)` // Minimum execution time: 371_735 nanoseconds. - Weight::from_ref_time(375_979_430) - .saturating_add(Weight::from_proof_size(17235)) + Weight::from_parts(375_979_430, 0) + .saturating_add(Weight::from_parts(0, 17235)) // Standard Error: 968_037 - .saturating_add(Weight::from_ref_time(57_780_769).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(57_780_769, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(3210).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 3210).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -3541,10 +3541,10 @@ impl WeightInfo for () { // Measured: `1675` // Estimated: `21205` // Minimum execution time: 428_196 nanoseconds. - Weight::from_ref_time(429_438_000) - .saturating_add(Weight::from_proof_size(21205)) + Weight::from_parts(429_438_000, 0) + .saturating_add(Weight::from_parts(0, 21205)) // Standard Error: 57_860 - .saturating_add(Weight::from_ref_time(260_917_896).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(260_917_896, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) } @@ -3564,13 +3564,13 @@ impl WeightInfo for () { // Measured: `873 + r * (642 ±0)` // Estimated: `17235 + r * (3210 ±0)` // Minimum execution time: 371_412 nanoseconds. - Weight::from_ref_time(373_635_818) - .saturating_add(Weight::from_proof_size(17235)) + Weight::from_parts(373_635_818, 0) + .saturating_add(Weight::from_parts(0, 17235)) // Standard Error: 222_973 - .saturating_add(Weight::from_ref_time(33_347_181).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(33_347_181, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(3210).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 3210).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -3588,10 +3588,10 @@ impl WeightInfo for () { // Measured: `1675` // Estimated: `21180` // Minimum execution time: 405_858 nanoseconds. - Weight::from_ref_time(406_498_000) - .saturating_add(Weight::from_proof_size(21180)) + Weight::from_parts(406_498_000, 0) + .saturating_add(Weight::from_parts(0, 21180)) // Standard Error: 48_388 - .saturating_add(Weight::from_ref_time(103_283_157).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(103_283_157, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) } @@ -3611,13 +3611,13 @@ impl WeightInfo for () { // Measured: `873 + r * (679 ±0)` // Estimated: `17235 + r * (3395 ±0)` // Minimum execution time: 371_746 nanoseconds. - Weight::from_ref_time(373_538_171) - .saturating_add(Weight::from_proof_size(17235)) + Weight::from_parts(373_538_171, 0) + .saturating_add(Weight::from_parts(0, 17235)) // Standard Error: 387_332 - .saturating_add(Weight::from_ref_time(35_933_528).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(35_933_528, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(3395).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 3395).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -3635,10 +3635,10 @@ impl WeightInfo for () { // Measured: `1675` // Estimated: `21225` // Minimum execution time: 405_752 nanoseconds. - Weight::from_ref_time(406_417_000) - .saturating_add(Weight::from_proof_size(21225)) + Weight::from_parts(406_417_000, 0) + .saturating_add(Weight::from_parts(0, 21225)) // Standard Error: 47_051 - .saturating_add(Weight::from_ref_time(103_325_027).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(103_325_027, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) } @@ -3658,13 +3658,13 @@ impl WeightInfo for () { // Measured: `917 + r * (6083 ±0)` // Estimated: `17455 + r * (30415 ±0)` // Minimum execution time: 373_882 nanoseconds. - Weight::from_ref_time(376_553_787) - .saturating_add(Weight::from_proof_size(17455)) + Weight::from_parts(376_553_787, 0) + .saturating_add(Weight::from_parts(0, 17455)) // Standard Error: 912_833 - .saturating_add(Weight::from_ref_time(3_021_100_412).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(3_021_100_412, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(30415).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 30415).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -3682,13 +3682,13 @@ impl WeightInfo for () { // Measured: `886 + r * (3362 ±0)` // Estimated: `17300 + r * (16810 ±0)` // Minimum execution time: 373_673 nanoseconds. - Weight::from_ref_time(375_712_961) - .saturating_add(Weight::from_proof_size(17300)) + Weight::from_parts(375_712_961, 0) + .saturating_add(Weight::from_parts(0, 17300)) // Standard Error: 596_297 - .saturating_add(Weight::from_ref_time(738_257_638).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(738_257_638, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(16810).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 16810).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -3708,15 +3708,15 @@ impl WeightInfo for () { // Measured: `0 + r * (79300 ±0)` // Estimated: `64844 + r * (942952 ±833)` // Minimum execution time: 374_097 nanoseconds. - Weight::from_ref_time(374_985_000) - .saturating_add(Weight::from_proof_size(64844)) + Weight::from_parts(374_985_000, 0) + .saturating_add(Weight::from_parts(0, 64844)) // Standard Error: 3_772_336 - .saturating_add(Weight::from_ref_time(1_546_402_854).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_546_402_854, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().reads((225_u64).saturating_mul(r.into()))) .saturating_add(RocksDbWeight::get().writes(3_u64)) .saturating_add(RocksDbWeight::get().writes((150_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(942952).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 942952).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -3734,13 +3734,13 @@ impl WeightInfo for () { // Measured: `869 + r * (240 ±0)` // Estimated: `17215 + r * (1200 ±0)` // Minimum execution time: 374_249 nanoseconds. - Weight::from_ref_time(377_990_998) - .saturating_add(Weight::from_proof_size(17215)) + Weight::from_parts(377_990_998, 0) + .saturating_add(Weight::from_parts(0, 17215)) // Standard Error: 38_133 - .saturating_add(Weight::from_ref_time(11_483_273).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(11_483_273, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(1200).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 1200).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -3758,13 +3758,13 @@ impl WeightInfo for () { // Measured: `2102 + r * (3154 ±0)` // Estimated: `21980 + r * (15875 ±2)` // Minimum execution time: 375_552 nanoseconds. - Weight::from_ref_time(400_624_032) - .saturating_add(Weight::from_proof_size(21980)) + Weight::from_parts(400_624_032, 0) + .saturating_add(Weight::from_parts(0, 21980)) // Standard Error: 82_523 - .saturating_add(Weight::from_ref_time(18_057_327).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(18_057_327, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(15875).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 15875).saturating_mul(r.into())) } /// Storage: System Account (r:1 w:0) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured) @@ -3784,13 +3784,13 @@ impl WeightInfo for () { // Measured: `872 + r * (240 ±0)` // Estimated: `18598 + r * (1440 ±0)` // Minimum execution time: 373_899 nanoseconds. - Weight::from_ref_time(379_733_943) - .saturating_add(Weight::from_proof_size(18598)) + Weight::from_parts(379_733_943, 0) + .saturating_add(Weight::from_parts(0, 18598)) // Standard Error: 32_022 - .saturating_add(Weight::from_ref_time(9_381_180).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(9_381_180, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(7_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) - .saturating_add(Weight::from_proof_size(1440).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 1440).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64const(r: u32, ) -> Weight { @@ -3798,10 +3798,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 834 nanoseconds. - Weight::from_ref_time(1_009_646) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_009_646, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 388 - .saturating_add(Weight::from_ref_time(411_979).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(411_979, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64load(r: u32, ) -> Weight { @@ -3809,10 +3809,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 882 nanoseconds. - Weight::from_ref_time(1_416_377) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_416_377, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 1_133 - .saturating_add(Weight::from_ref_time(1_075_838).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_075_838, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64store(r: u32, ) -> Weight { @@ -3820,10 +3820,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 878 nanoseconds. - Weight::from_ref_time(1_343_056) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_343_056, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 426 - .saturating_add(Weight::from_ref_time(1_001_214).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_001_214, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_select(r: u32, ) -> Weight { @@ -3831,10 +3831,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 796 nanoseconds. - Weight::from_ref_time(1_079_086) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_079_086, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 409 - .saturating_add(Weight::from_ref_time(1_149_188).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_149_188, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_if(r: u32, ) -> Weight { @@ -3842,10 +3842,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 800 nanoseconds. - Weight::from_ref_time(1_044_184) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_044_184, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 707 - .saturating_add(Weight::from_ref_time(1_315_686).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_315_686, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_br(r: u32, ) -> Weight { @@ -3853,10 +3853,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 807 nanoseconds. - Weight::from_ref_time(1_049_633) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_049_633, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 361 - .saturating_add(Weight::from_ref_time(640_530).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(640_530, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_br_if(r: u32, ) -> Weight { @@ -3864,10 +3864,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 774 nanoseconds. - Weight::from_ref_time(1_124_053) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_124_053, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 784 - .saturating_add(Weight::from_ref_time(949_398).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(949_398, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_br_table(r: u32, ) -> Weight { @@ -3875,10 +3875,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 810 nanoseconds. - Weight::from_ref_time(676_581) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(676_581, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 2_356 - .saturating_add(Weight::from_ref_time(1_163_465).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_163_465, 0).saturating_mul(r.into())) } /// The range of component `e` is `[1, 256]`. fn instr_br_table_per_entry(e: u32, ) -> Weight { @@ -3886,10 +3886,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 2_580 nanoseconds. - Weight::from_ref_time(2_835_656) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(2_835_656, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 71 - .saturating_add(Weight::from_ref_time(4_686).saturating_mul(e.into())) + .saturating_add(Weight::from_parts(4_686, 0).saturating_mul(e.into())) } /// The range of component `r` is `[0, 50]`. fn instr_call(r: u32, ) -> Weight { @@ -3897,10 +3897,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 826 nanoseconds. - Weight::from_ref_time(1_625_698) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_625_698, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 1_740 - .saturating_add(Weight::from_ref_time(2_332_187).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(2_332_187, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_call_indirect(r: u32, ) -> Weight { @@ -3908,10 +3908,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 901 nanoseconds. - Weight::from_ref_time(2_338_620) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(2_338_620, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 1_642 - .saturating_add(Weight::from_ref_time(2_924_090).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(2_924_090, 0).saturating_mul(r.into())) } /// The range of component `p` is `[0, 128]`. fn instr_call_indirect_per_param(p: u32, ) -> Weight { @@ -3919,10 +3919,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 4_670 nanoseconds. - Weight::from_ref_time(5_556_246) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(5_556_246, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 1_491 - .saturating_add(Weight::from_ref_time(228_965).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(228_965, 0).saturating_mul(p.into())) } /// The range of component `l` is `[0, 1024]`. fn instr_call_per_local(l: u32, ) -> Weight { @@ -3930,10 +3930,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 3_099 nanoseconds. - Weight::from_ref_time(3_896_177) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(3_896_177, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 99 - .saturating_add(Weight::from_ref_time(91_304).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(91_304, 0).saturating_mul(l.into())) } /// The range of component `r` is `[0, 50]`. fn instr_local_get(r: u32, ) -> Weight { @@ -3941,10 +3941,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 3_042 nanoseconds. - Weight::from_ref_time(3_334_621) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(3_334_621, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 793 - .saturating_add(Weight::from_ref_time(459_346).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(459_346, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_local_set(r: u32, ) -> Weight { @@ -3952,10 +3952,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 2_968 nanoseconds. - Weight::from_ref_time(3_235_286) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(3_235_286, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 427 - .saturating_add(Weight::from_ref_time(485_454).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(485_454, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_local_tee(r: u32, ) -> Weight { @@ -3963,10 +3963,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 3_012 nanoseconds. - Weight::from_ref_time(3_303_555) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(3_303_555, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 371 - .saturating_add(Weight::from_ref_time(657_811).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(657_811, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_global_get(r: u32, ) -> Weight { @@ -3974,10 +3974,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 865 nanoseconds. - Weight::from_ref_time(1_249_987) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_249_987, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 417 - .saturating_add(Weight::from_ref_time(896_704).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(896_704, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_global_set(r: u32, ) -> Weight { @@ -3985,10 +3985,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 866 nanoseconds. - Weight::from_ref_time(1_216_218) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_216_218, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 503 - .saturating_add(Weight::from_ref_time(919_719).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(919_719, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_memory_current(r: u32, ) -> Weight { @@ -3996,10 +3996,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 921 nanoseconds. - Weight::from_ref_time(1_228_408) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_228_408, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 309 - .saturating_add(Weight::from_ref_time(813_007).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(813_007, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 1]`. fn instr_memory_grow(r: u32, ) -> Weight { @@ -4007,10 +4007,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 820 nanoseconds. - Weight::from_ref_time(914_830) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(914_830, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 6_018 - .saturating_add(Weight::from_ref_time(237_062_769).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(237_062_769, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64clz(r: u32, ) -> Weight { @@ -4018,10 +4018,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 812 nanoseconds. - Weight::from_ref_time(1_554_406) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_554_406, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 9_979 - .saturating_add(Weight::from_ref_time(625_434).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(625_434, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64ctz(r: u32, ) -> Weight { @@ -4029,10 +4029,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 798 nanoseconds. - Weight::from_ref_time(1_095_113) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_095_113, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 243 - .saturating_add(Weight::from_ref_time(634_204).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(634_204, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64popcnt(r: u32, ) -> Weight { @@ -4040,10 +4040,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 792 nanoseconds. - Weight::from_ref_time(1_109_845) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_109_845, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 14_944 - .saturating_add(Weight::from_ref_time(658_834).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(658_834, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64eqz(r: u32, ) -> Weight { @@ -4051,10 +4051,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 815 nanoseconds. - Weight::from_ref_time(1_068_916) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_068_916, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 327 - .saturating_add(Weight::from_ref_time(652_897).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(652_897, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64extendsi32(r: u32, ) -> Weight { @@ -4062,10 +4062,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 798 nanoseconds. - Weight::from_ref_time(1_069_745) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_069_745, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 306 - .saturating_add(Weight::from_ref_time(618_481).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(618_481, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64extendui32(r: u32, ) -> Weight { @@ -4073,10 +4073,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 799 nanoseconds. - Weight::from_ref_time(1_398_001) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_398_001, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 6_234 - .saturating_add(Weight::from_ref_time(611_399).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(611_399, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i32wrapi64(r: u32, ) -> Weight { @@ -4084,10 +4084,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 811 nanoseconds. - Weight::from_ref_time(1_098_083) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_098_083, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 297 - .saturating_add(Weight::from_ref_time(617_692).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(617_692, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64eq(r: u32, ) -> Weight { @@ -4095,10 +4095,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 815 nanoseconds. - Weight::from_ref_time(1_046_922) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_046_922, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 335 - .saturating_add(Weight::from_ref_time(909_196).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(909_196, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64ne(r: u32, ) -> Weight { @@ -4106,10 +4106,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 805 nanoseconds. - Weight::from_ref_time(1_093_667) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_093_667, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 233 - .saturating_add(Weight::from_ref_time(907_378).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(907_378, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64lts(r: u32, ) -> Weight { @@ -4117,10 +4117,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 805 nanoseconds. - Weight::from_ref_time(1_290_591) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_290_591, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 3_201 - .saturating_add(Weight::from_ref_time(902_006).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(902_006, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64ltu(r: u32, ) -> Weight { @@ -4128,10 +4128,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 783 nanoseconds. - Weight::from_ref_time(1_159_977) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_159_977, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 2_310 - .saturating_add(Weight::from_ref_time(906_489).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(906_489, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64gts(r: u32, ) -> Weight { @@ -4139,10 +4139,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 790 nanoseconds. - Weight::from_ref_time(1_109_719) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_109_719, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 261 - .saturating_add(Weight::from_ref_time(906_614).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(906_614, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64gtu(r: u32, ) -> Weight { @@ -4150,10 +4150,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 776 nanoseconds. - Weight::from_ref_time(1_076_567) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_076_567, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 348 - .saturating_add(Weight::from_ref_time(919_374).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(919_374, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64les(r: u32, ) -> Weight { @@ -4161,10 +4161,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 780 nanoseconds. - Weight::from_ref_time(1_069_663) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_069_663, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 265 - .saturating_add(Weight::from_ref_time(908_037).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(908_037, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64leu(r: u32, ) -> Weight { @@ -4172,10 +4172,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 832 nanoseconds. - Weight::from_ref_time(930_920) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(930_920, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 2_170 - .saturating_add(Weight::from_ref_time(929_811).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(929_811, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64ges(r: u32, ) -> Weight { @@ -4183,10 +4183,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 787 nanoseconds. - Weight::from_ref_time(1_087_325) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_087_325, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 315 - .saturating_add(Weight::from_ref_time(908_321).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(908_321, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64geu(r: u32, ) -> Weight { @@ -4194,10 +4194,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 798 nanoseconds. - Weight::from_ref_time(1_029_132) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_029_132, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 2_095 - .saturating_add(Weight::from_ref_time(913_553).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(913_553, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64add(r: u32, ) -> Weight { @@ -4205,10 +4205,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 791 nanoseconds. - Weight::from_ref_time(1_086_314) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_086_314, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 197 - .saturating_add(Weight::from_ref_time(896_392).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(896_392, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64sub(r: u32, ) -> Weight { @@ -4216,10 +4216,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 793 nanoseconds. - Weight::from_ref_time(1_078_172) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_078_172, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 404 - .saturating_add(Weight::from_ref_time(886_329).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(886_329, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64mul(r: u32, ) -> Weight { @@ -4227,10 +4227,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 799 nanoseconds. - Weight::from_ref_time(1_095_010) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_095_010, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 431 - .saturating_add(Weight::from_ref_time(886_513).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(886_513, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64divs(r: u32, ) -> Weight { @@ -4238,10 +4238,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 810 nanoseconds. - Weight::from_ref_time(1_114_325) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_114_325, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 452 - .saturating_add(Weight::from_ref_time(1_521_849).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_521_849, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64divu(r: u32, ) -> Weight { @@ -4249,10 +4249,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 784 nanoseconds. - Weight::from_ref_time(1_123_153) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_123_153, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 475 - .saturating_add(Weight::from_ref_time(1_457_746).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_457_746, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64rems(r: u32, ) -> Weight { @@ -4260,10 +4260,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 809 nanoseconds. - Weight::from_ref_time(1_145_906) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_145_906, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 718 - .saturating_add(Weight::from_ref_time(1_549_964).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_549_964, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64remu(r: u32, ) -> Weight { @@ -4271,10 +4271,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 803 nanoseconds. - Weight::from_ref_time(1_110_328) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_110_328, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 627 - .saturating_add(Weight::from_ref_time(1_453_013).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_453_013, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64and(r: u32, ) -> Weight { @@ -4282,10 +4282,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 786 nanoseconds. - Weight::from_ref_time(1_108_792) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_108_792, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 286 - .saturating_add(Weight::from_ref_time(897_035).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(897_035, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64or(r: u32, ) -> Weight { @@ -4293,10 +4293,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 787 nanoseconds. - Weight::from_ref_time(830_000) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(830_000, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 15_995 - .saturating_add(Weight::from_ref_time(963_344).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(963_344, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64xor(r: u32, ) -> Weight { @@ -4304,10 +4304,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 773 nanoseconds. - Weight::from_ref_time(1_082_459) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_082_459, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 330 - .saturating_add(Weight::from_ref_time(897_077).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(897_077, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64shl(r: u32, ) -> Weight { @@ -4315,10 +4315,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 810 nanoseconds. - Weight::from_ref_time(1_325_815) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_325_815, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 3_352 - .saturating_add(Weight::from_ref_time(899_555).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(899_555, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64shrs(r: u32, ) -> Weight { @@ -4326,10 +4326,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 808 nanoseconds. - Weight::from_ref_time(1_085_903) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_085_903, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 430 - .saturating_add(Weight::from_ref_time(903_249).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(903_249, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64shru(r: u32, ) -> Weight { @@ -4337,10 +4337,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 792 nanoseconds. - Weight::from_ref_time(1_091_261) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_091_261, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 312 - .saturating_add(Weight::from_ref_time(902_245).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(902_245, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64rotl(r: u32, ) -> Weight { @@ -4348,10 +4348,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 807 nanoseconds. - Weight::from_ref_time(1_121_052) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_121_052, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 506 - .saturating_add(Weight::from_ref_time(902_772).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(902_772, 0).saturating_mul(r.into())) } /// The range of component `r` is `[0, 50]`. fn instr_i64rotr(r: u32, ) -> Weight { @@ -4359,9 +4359,9 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 823 nanoseconds. - Weight::from_ref_time(1_317_597) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(1_317_597, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 6_219 - .saturating_add(Weight::from_ref_time(896_692).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(896_692, 0).saturating_mul(r.into())) } } diff --git a/frame/conviction-voting/src/weights.rs b/frame/conviction-voting/src/weights.rs index a2f992b1f3a29..91c4c013051db 100644 --- a/frame/conviction-voting/src/weights.rs +++ b/frame/conviction-voting/src/weights.rs @@ -144,12 +144,12 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 33_246 nanoseconds. Weight::from_parts(34_560_391, 176657) // Standard Error: 63_925 - .saturating_add(Weight::from_ref_time(34_500_408).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(34_500_408, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(4_u64)) .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(110917).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 110917).saturating_mul(r.into())) } /// Storage: ConvictionVoting VotingFor (r:2 w:2) /// Proof: ConvictionVoting VotingFor (max_values: None, max_size: Some(27241), added: 29716, mode: MaxEncodedLen) @@ -165,12 +165,12 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 20_508 nanoseconds. Weight::from_parts(21_240_024, 170349) // Standard Error: 37_314 - .saturating_add(Weight::from_ref_time(30_890_875).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(30_890_875, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(2_u64)) .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(110917).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 110917).saturating_mul(r.into())) } /// Storage: ConvictionVoting VotingFor (r:1 w:1) /// Proof: ConvictionVoting VotingFor (max_values: None, max_size: Some(27241), added: 29716, mode: MaxEncodedLen) @@ -275,12 +275,12 @@ impl WeightInfo for () { // Minimum execution time: 33_246 nanoseconds. Weight::from_parts(34_560_391, 176657) // Standard Error: 63_925 - .saturating_add(Weight::from_ref_time(34_500_408).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(34_500_408, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(4_u64)) .saturating_add(RocksDbWeight::get().reads((3_u64).saturating_mul(r.into()))) .saturating_add(RocksDbWeight::get().writes(4_u64)) .saturating_add(RocksDbWeight::get().writes((3_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(110917).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 110917).saturating_mul(r.into())) } /// Storage: ConvictionVoting VotingFor (r:2 w:2) /// Proof: ConvictionVoting VotingFor (max_values: None, max_size: Some(27241), added: 29716, mode: MaxEncodedLen) @@ -296,12 +296,12 @@ impl WeightInfo for () { // Minimum execution time: 20_508 nanoseconds. Weight::from_parts(21_240_024, 170349) // Standard Error: 37_314 - .saturating_add(Weight::from_ref_time(30_890_875).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(30_890_875, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().reads((3_u64).saturating_mul(r.into()))) .saturating_add(RocksDbWeight::get().writes(2_u64)) .saturating_add(RocksDbWeight::get().writes((3_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(110917).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 110917).saturating_mul(r.into())) } /// Storage: ConvictionVoting VotingFor (r:1 w:1) /// Proof: ConvictionVoting VotingFor (max_values: None, max_size: Some(27241), added: 29716, mode: MaxEncodedLen) diff --git a/frame/democracy/src/weights.rs b/frame/democracy/src/weights.rs index a2cdeead6f400..9241b27bbe1fb 100644 --- a/frame/democracy/src/weights.rs +++ b/frame/democracy/src/weights.rs @@ -198,7 +198,7 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 2_961 nanoseconds. - Weight::from_ref_time(3_139_000) + Weight::from_parts(3_139_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Democracy NextExternal (r:0 w:1) @@ -208,7 +208,7 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 3_040 nanoseconds. - Weight::from_ref_time(3_261_000) + Weight::from_parts(3_261_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Democracy NextExternal (r:1 w:1) @@ -287,11 +287,11 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 7_093 nanoseconds. Weight::from_parts(8_792_955, 998) // Standard Error: 6_630 - .saturating_add(Weight::from_ref_time(3_091_565).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(3_091_565, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(2676).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into())) } /// Storage: Democracy LowestUnbaked (r:1 w:1) /// Proof: Democracy LowestUnbaked (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -313,11 +313,11 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 10_372 nanoseconds. Weight::from_parts(10_961_165, 19318) // Standard Error: 7_284 - .saturating_add(Weight::from_ref_time(3_112_573).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(3_112_573, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(2676).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into())) } /// Storage: Democracy VotingOf (r:3 w:3) /// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen) @@ -333,12 +333,12 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 36_618 nanoseconds. Weight::from_parts(42_803_184, 22584) // Standard Error: 7_268 - .saturating_add(Weight::from_ref_time(4_537_902).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(4_537_902, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(4_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(2676).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into())) } /// Storage: Democracy VotingOf (r:2 w:2) /// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen) @@ -352,12 +352,12 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 19_758 nanoseconds. Weight::from_parts(21_641_793, 12540) // Standard Error: 6_889 - .saturating_add(Weight::from_ref_time(4_478_884).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(4_478_884, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(2_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(2676).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into())) } /// Storage: Democracy PublicProps (r:0 w:1) /// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen) @@ -366,7 +366,7 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 2_844 nanoseconds. - Weight::from_ref_time(3_017_000) + Weight::from_parts(3_017_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Democracy VotingOf (r:1 w:1) @@ -383,7 +383,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 20_380 nanoseconds. Weight::from_parts(28_295_875, 12647) // Standard Error: 2_331 - .saturating_add(Weight::from_ref_time(67_348).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(67_348, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -401,7 +401,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 24_475 nanoseconds. Weight::from_parts(27_102_576, 12647) // Standard Error: 1_464 - .saturating_add(Weight::from_ref_time(128_921).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(128_921, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -417,7 +417,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 15_039 nanoseconds. Weight::from_parts(19_252_498, 8946) // Standard Error: 1_798 - .saturating_add(Weight::from_ref_time(131_855).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(131_855, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -433,7 +433,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 14_837 nanoseconds. Weight::from_parts(19_144_929, 8946) // Standard Error: 1_875 - .saturating_add(Weight::from_ref_time(136_819).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(136_819, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -639,7 +639,7 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 2_961 nanoseconds. - Weight::from_ref_time(3_139_000) + Weight::from_parts(3_139_000, 0) .saturating_add(RocksDbWeight::get().writes(1_u64)) } /// Storage: Democracy NextExternal (r:0 w:1) @@ -649,7 +649,7 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 3_040 nanoseconds. - Weight::from_ref_time(3_261_000) + Weight::from_parts(3_261_000, 0) .saturating_add(RocksDbWeight::get().writes(1_u64)) } /// Storage: Democracy NextExternal (r:1 w:1) @@ -728,11 +728,11 @@ impl WeightInfo for () { // Minimum execution time: 7_093 nanoseconds. Weight::from_parts(8_792_955, 998) // Standard Error: 6_630 - .saturating_add(Weight::from_ref_time(3_091_565).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(3_091_565, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(r.into()))) .saturating_add(RocksDbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(2676).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into())) } /// Storage: Democracy LowestUnbaked (r:1 w:1) /// Proof: Democracy LowestUnbaked (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -754,11 +754,11 @@ impl WeightInfo for () { // Minimum execution time: 10_372 nanoseconds. Weight::from_parts(10_961_165, 19318) // Standard Error: 7_284 - .saturating_add(Weight::from_ref_time(3_112_573).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(3_112_573, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(5_u64)) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(r.into()))) .saturating_add(RocksDbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(2676).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into())) } /// Storage: Democracy VotingOf (r:3 w:3) /// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen) @@ -774,12 +774,12 @@ impl WeightInfo for () { // Minimum execution time: 36_618 nanoseconds. Weight::from_parts(42_803_184, 22584) // Standard Error: 7_268 - .saturating_add(Weight::from_ref_time(4_537_902).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(4_537_902, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(4_u64)) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(r.into()))) .saturating_add(RocksDbWeight::get().writes(4_u64)) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(2676).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into())) } /// Storage: Democracy VotingOf (r:2 w:2) /// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen) @@ -793,12 +793,12 @@ impl WeightInfo for () { // Minimum execution time: 19_758 nanoseconds. Weight::from_parts(21_641_793, 12540) // Standard Error: 6_889 - .saturating_add(Weight::from_ref_time(4_478_884).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(4_478_884, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(r.into()))) .saturating_add(RocksDbWeight::get().writes(2_u64)) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(2676).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into())) } /// Storage: Democracy PublicProps (r:0 w:1) /// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen) @@ -807,7 +807,7 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 2_844 nanoseconds. - Weight::from_ref_time(3_017_000) + Weight::from_parts(3_017_000, 0) .saturating_add(RocksDbWeight::get().writes(1_u64)) } /// Storage: Democracy VotingOf (r:1 w:1) @@ -824,7 +824,7 @@ impl WeightInfo for () { // Minimum execution time: 20_380 nanoseconds. Weight::from_parts(28_295_875, 12647) // Standard Error: 2_331 - .saturating_add(Weight::from_ref_time(67_348).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(67_348, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) } @@ -842,7 +842,7 @@ impl WeightInfo for () { // Minimum execution time: 24_475 nanoseconds. Weight::from_parts(27_102_576, 12647) // Standard Error: 1_464 - .saturating_add(Weight::from_ref_time(128_921).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(128_921, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) } @@ -858,7 +858,7 @@ impl WeightInfo for () { // Minimum execution time: 15_039 nanoseconds. Weight::from_parts(19_252_498, 8946) // Standard Error: 1_798 - .saturating_add(Weight::from_ref_time(131_855).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(131_855, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -874,7 +874,7 @@ impl WeightInfo for () { // Minimum execution time: 14_837 nanoseconds. Weight::from_parts(19_144_929, 8946) // Standard Error: 1_875 - .saturating_add(Weight::from_ref_time(136_819).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(136_819, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs index 2ceaa6c23b70f..a46aa861ecf86 100644 --- a/frame/election-provider-multi-phase/src/mock.rs +++ b/frame/election-provider-multi-phase/src/mock.rs @@ -363,11 +363,12 @@ impl MinerConfig for Runtime { fn solution_weight(v: u32, t: u32, a: u32, d: u32) -> Weight { match MockWeightInfo::get() { - MockedWeightInfo::Basic => Weight::from_ref_time( + MockedWeightInfo::Basic => Weight::from_parts( (10 as u64).saturating_add((5 as u64).saturating_mul(a as u64)), + 0, ), MockedWeightInfo::Complex => - Weight::from_ref_time((0 * v + 0 * t + 1000 * a + 0 * d) as u64), + Weight::from_parts((0 * v + 0 * t + 1000 * a + 0 * d) as u64, 0), MockedWeightInfo::Real => <() as multi_phase::weights::WeightInfo>::feasibility_check(v, t, a, d), } diff --git a/frame/election-provider-multi-phase/src/signed.rs b/frame/election-provider-multi-phase/src/signed.rs index d5d17e26b3051..75bbcfcf9e537 100644 --- a/frame/election-provider-multi-phase/src/signed.rs +++ b/frame/election-provider-multi-phase/src/signed.rs @@ -1254,7 +1254,7 @@ mod tests { #[test] fn cannot_consume_too_much_future_weight() { ExtBuilder::default() - .signed_weight(Weight::from_ref_time(40).set_proof_size(u64::MAX)) + .signed_weight(Weight::from_parts(40, u64::MAX)) .mock_weight_info(MockedWeightInfo::Basic) .build_and_execute(|| { roll_to_signed(); @@ -1268,16 +1268,16 @@ mod tests { raw.solution.unique_targets().len() as u32, ); // default solution will have 5 edges (5 * 5 + 10) - assert_eq!(solution_weight, Weight::from_ref_time(35)); + assert_eq!(solution_weight, Weight::from_parts(35, 0)); assert_eq!(raw.solution.voter_count(), 5); assert_eq!( ::SignedMaxWeight::get(), - Weight::from_ref_time(40).set_proof_size(u64::MAX) + Weight::from_parts(40, u64::MAX) ); assert_ok!(MultiPhase::submit(RuntimeOrigin::signed(99), Box::new(raw.clone()))); - ::set(Weight::from_ref_time(30).set_proof_size(u64::MAX)); + ::set(Weight::from_parts(30, u64::MAX)); // note: resubmitting the same solution is technically okay as long as the queue has // space. diff --git a/frame/election-provider-multi-phase/src/unsigned.rs b/frame/election-provider-multi-phase/src/unsigned.rs index cff1e01d9e0be..3d80f8f4d9315 100644 --- a/frame/election-provider-multi-phase/src/unsigned.rs +++ b/frame/election-provider-multi-phase/src/unsigned.rs @@ -701,345 +701,177 @@ mod max_weight { let w = SolutionOrSnapshotSize { voters: 10, targets: 0 }; MockWeightInfo::set(crate::mock::MockedWeightInfo::Complex); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::zero().set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(0, u64::MAX)), 0 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(1).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(1, u64::MAX)), 0 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(999).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(999, u64::MAX)), 0 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(1000).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(1000, u64::MAX)), 1 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(1001).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(1001, u64::MAX)), 1 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(1990).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(1990, u64::MAX)), 1 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(1999).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(1999, u64::MAX)), 1 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(2000).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(2000, u64::MAX)), 2 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(2001).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(2001, u64::MAX)), 2 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(2010).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(2010, u64::MAX)), 2 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(2990).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(2990, u64::MAX)), 2 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(2999).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(2999, u64::MAX)), 2 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(3000).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(3000, u64::MAX)), 3 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(3333).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(3333, u64::MAX)), 3 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(5500).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(5500, u64::MAX)), 5 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(7777).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(7777, u64::MAX)), 7 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(9999).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(9999, u64::MAX)), 9 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(10_000).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(10_000, u64::MAX)), 10 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(10_999).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(10_999, u64::MAX)), 10 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(11_000).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(11_000, u64::MAX)), 10 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(22_000).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(22_000, u64::MAX)), 10 ); let w = SolutionOrSnapshotSize { voters: 1, targets: 0 }; assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(0).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(0, u64::MAX)), 0 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(1).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(1, u64::MAX)), 0 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(999).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(999, u64::MAX)), 0 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(1000).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(1000, u64::MAX)), 1 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(1001).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(1001, u64::MAX)), 1 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(1990).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(1990, u64::MAX)), 1 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(1999).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(1999, u64::MAX)), 1 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(2000).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(2000, u64::MAX)), 1 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(2001).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(2001, u64::MAX)), 1 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(2010).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(2010, u64::MAX)), 1 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(3333).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(3333, u64::MAX)), 1 ); let w = SolutionOrSnapshotSize { voters: 2, targets: 0 }; assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(0).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(0, u64::MAX)), 0 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(1).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(1, u64::MAX)), 0 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(999).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(999, u64::MAX)), 0 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(1000).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(1000, u64::MAX)), 1 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(1001).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(1001, u64::MAX)), 1 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(1999).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(1999, u64::MAX)), 1 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(2000).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(2000, u64::MAX)), 2 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(2001).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(2001, u64::MAX)), 2 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(2010).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(2010, u64::MAX)), 2 ); assert_eq!( - Miner::::maximum_voter_for_weight( - 0, - w, - Weight::from_ref_time(3333).set_proof_size(u64::MAX) - ), + Miner::::maximum_voter_for_weight(0, w, Weight::from_parts(3333, u64::MAX)), 2 ); } @@ -1340,7 +1172,7 @@ mod tests { #[test] fn miner_trims_weight() { ExtBuilder::default() - .miner_weight(Weight::from_ref_time(100).set_proof_size(u64::MAX)) + .miner_weight(Weight::from_parts(100, u64::MAX)) .mock_weight_info(crate::mock::MockedWeightInfo::Basic) .build_and_execute(|| { roll_to_unsigned(); @@ -1354,11 +1186,11 @@ mod tests { raw.solution.unique_targets().len() as u32, ); // default solution will have 5 edges (5 * 5 + 10) - assert_eq!(solution_weight, Weight::from_ref_time(35)); + assert_eq!(solution_weight, Weight::from_parts(35, 0)); assert_eq!(raw.solution.voter_count(), 5); // now reduce the max weight - ::set(Weight::from_ref_time(25).set_proof_size(u64::MAX)); + ::set(Weight::from_parts(25, u64::MAX)); let (raw, witness) = MultiPhase::mine_solution().unwrap(); let solution_weight = ::solution_weight( @@ -1368,7 +1200,7 @@ mod tests { raw.solution.unique_targets().len() as u32, ); // default solution will have 5 edges (5 * 5 + 10) - assert_eq!(solution_weight, Weight::from_ref_time(25)); + assert_eq!(solution_weight, Weight::from_parts(25, 0)); assert_eq!(raw.solution.voter_count(), 3); }) } diff --git a/frame/election-provider-multi-phase/src/weights.rs b/frame/election-provider-multi-phase/src/weights.rs index f3ea218e451c5..90be98ece489a 100644 --- a/frame/election-provider-multi-phase/src/weights.rs +++ b/frame/election-provider-multi-phase/src/weights.rs @@ -150,9 +150,9 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 215_168 nanoseconds. - Weight::from_ref_time(219_887_000) + Weight::from_parts(219_887_000, 0) // Standard Error: 1_444 - .saturating_add(Weight::from_ref_time(146_388).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(146_388, 0).saturating_mul(v.into())) .saturating_add(T::DbWeight::get().writes(3_u64)) } /// Storage: ElectionProviderMultiPhase SignedSubmissionIndices (r:1 w:1) @@ -182,13 +182,13 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 268_021 nanoseconds. Weight::from_parts(72_491_937, 9540) // Standard Error: 2_910 - .saturating_add(Weight::from_ref_time(303_955).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(303_955, 0).saturating_mul(a.into())) // Standard Error: 4_363 - .saturating_add(Weight::from_ref_time(167_369).saturating_mul(d.into())) + .saturating_add(Weight::from_parts(167_369, 0).saturating_mul(d.into())) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) - .saturating_add(Weight::from_proof_size(6912).saturating_mul(a.into())) - .saturating_add(Weight::from_proof_size(441).saturating_mul(d.into())) + .saturating_add(Weight::from_parts(0, 6912).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(0, 441).saturating_mul(d.into())) } /// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0) /// Proof Skipped: ElectionProviderMultiPhase CurrentPhase (max_values: Some(1), max_size: None, mode: Measured) @@ -236,13 +236,13 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 4_425_457 nanoseconds. Weight::from_parts(4_445_889_000, 5222) // Standard Error: 13_250 - .saturating_add(Weight::from_ref_time(48_844).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(48_844, 0).saturating_mul(v.into())) // Standard Error: 39_266 - .saturating_add(Weight::from_ref_time(4_144_034).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(4_144_034, 0).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(3871).saturating_mul(v.into())) - .saturating_add(Weight::from_proof_size(224).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(0, 3871).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(0, 224).saturating_mul(t.into())) } /// Storage: ElectionProviderMultiPhase Round (r:1 w:0) /// Proof Skipped: ElectionProviderMultiPhase Round (max_values: Some(1), max_size: None, mode: Measured) @@ -263,12 +263,12 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 3_812_071 nanoseconds. Weight::from_parts(3_826_375_000, 2884) // Standard Error: 11_601 - .saturating_add(Weight::from_ref_time(145_309).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(145_309, 0).saturating_mul(v.into())) // Standard Error: 34_378 - .saturating_add(Weight::from_ref_time(3_223_977).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(3_223_977, 0).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) - .saturating_add(Weight::from_proof_size(2212).saturating_mul(v.into())) - .saturating_add(Weight::from_proof_size(128).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(0, 2212).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(0, 128).saturating_mul(t.into())) } } @@ -361,9 +361,9 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 215_168 nanoseconds. - Weight::from_ref_time(219_887_000) + Weight::from_parts(219_887_000, 0) // Standard Error: 1_444 - .saturating_add(Weight::from_ref_time(146_388).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(146_388, 0).saturating_mul(v.into())) .saturating_add(RocksDbWeight::get().writes(3_u64)) } /// Storage: ElectionProviderMultiPhase SignedSubmissionIndices (r:1 w:1) @@ -393,13 +393,13 @@ impl WeightInfo for () { // Minimum execution time: 268_021 nanoseconds. Weight::from_parts(72_491_937, 9540) // Standard Error: 2_910 - .saturating_add(Weight::from_ref_time(303_955).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(303_955, 0).saturating_mul(a.into())) // Standard Error: 4_363 - .saturating_add(Weight::from_ref_time(167_369).saturating_mul(d.into())) + .saturating_add(Weight::from_parts(167_369, 0).saturating_mul(d.into())) .saturating_add(RocksDbWeight::get().reads(7_u64)) .saturating_add(RocksDbWeight::get().writes(8_u64)) - .saturating_add(Weight::from_proof_size(6912).saturating_mul(a.into())) - .saturating_add(Weight::from_proof_size(441).saturating_mul(d.into())) + .saturating_add(Weight::from_parts(0, 6912).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(0, 441).saturating_mul(d.into())) } /// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0) /// Proof Skipped: ElectionProviderMultiPhase CurrentPhase (max_values: Some(1), max_size: None, mode: Measured) @@ -447,13 +447,13 @@ impl WeightInfo for () { // Minimum execution time: 4_425_457 nanoseconds. Weight::from_parts(4_445_889_000, 5222) // Standard Error: 13_250 - .saturating_add(Weight::from_ref_time(48_844).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(48_844, 0).saturating_mul(v.into())) // Standard Error: 39_266 - .saturating_add(Weight::from_ref_time(4_144_034).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(4_144_034, 0).saturating_mul(a.into())) .saturating_add(RocksDbWeight::get().reads(7_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(3871).saturating_mul(v.into())) - .saturating_add(Weight::from_proof_size(224).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(0, 3871).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(0, 224).saturating_mul(t.into())) } /// Storage: ElectionProviderMultiPhase Round (r:1 w:0) /// Proof Skipped: ElectionProviderMultiPhase Round (max_values: Some(1), max_size: None, mode: Measured) @@ -474,11 +474,11 @@ impl WeightInfo for () { // Minimum execution time: 3_812_071 nanoseconds. Weight::from_parts(3_826_375_000, 2884) // Standard Error: 11_601 - .saturating_add(Weight::from_ref_time(145_309).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(145_309, 0).saturating_mul(v.into())) // Standard Error: 34_378 - .saturating_add(Weight::from_ref_time(3_223_977).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(3_223_977, 0).saturating_mul(a.into())) .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(Weight::from_proof_size(2212).saturating_mul(v.into())) - .saturating_add(Weight::from_proof_size(128).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(0, 2212).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(0, 128).saturating_mul(t.into())) } } diff --git a/frame/election-provider-support/src/weights.rs b/frame/election-provider-support/src/weights.rs index fd4db1374ac4a..addb6ad8d0306 100644 --- a/frame/election-provider-support/src/weights.rs +++ b/frame/election-provider-support/src/weights.rs @@ -53,43 +53,43 @@ pub trait WeightInfo { pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn phragmen(v: u32, t: u32, d: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_parts(0 as u64, 0) // Standard Error: 667_000 - .saturating_add(Weight::from_ref_time(32_973_000 as u64).saturating_mul(v as u64)) + .saturating_add(Weight::from_parts(32_973_000 as u64, 0).saturating_mul(v as u64)) // Standard Error: 1_334_000 - .saturating_add(Weight::from_ref_time(1_334_000 as u64).saturating_mul(t as u64)) + .saturating_add(Weight::from_parts(1_334_000 as u64, 0).saturating_mul(t as u64)) // Standard Error: 60_644_000 - .saturating_add(Weight::from_ref_time(2_636_364_000 as u64).saturating_mul(d as u64)) + .saturating_add(Weight::from_parts(2_636_364_000 as u64, 0).saturating_mul(d as u64)) } fn phragmms(v: u32, t: u32, d: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_parts(0 as u64, 0) // Standard Error: 73_000 - .saturating_add(Weight::from_ref_time(21_073_000 as u64).saturating_mul(v as u64)) + .saturating_add(Weight::from_parts(21_073_000 as u64, 0).saturating_mul(v as u64)) // Standard Error: 146_000 - .saturating_add(Weight::from_ref_time(65_000 as u64).saturating_mul(t as u64)) + .saturating_add(Weight::from_parts(65_000 as u64, 0).saturating_mul(t as u64)) // Standard Error: 6_649_000 - .saturating_add(Weight::from_ref_time(1_711_424_000 as u64).saturating_mul(d as u64)) + .saturating_add(Weight::from_parts(1_711_424_000 as u64, 0).saturating_mul(d as u64)) } } // For backwards compatibility and tests impl WeightInfo for () { fn phragmen(v: u32, t: u32, d: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_parts(0 as u64, 0) // Standard Error: 667_000 - .saturating_add(Weight::from_ref_time(32_973_000 as u64).saturating_mul(v as u64)) + .saturating_add(Weight::from_parts(32_973_000 as u64, 0).saturating_mul(v as u64)) // Standard Error: 1_334_000 - .saturating_add(Weight::from_ref_time(1_334_000 as u64).saturating_mul(t as u64)) + .saturating_add(Weight::from_parts(1_334_000 as u64, 0).saturating_mul(t as u64)) // Standard Error: 60_644_000 - .saturating_add(Weight::from_ref_time(2_636_364_000 as u64).saturating_mul(d as u64)) + .saturating_add(Weight::from_parts(2_636_364_000 as u64, 0).saturating_mul(d as u64)) } fn phragmms(v: u32, t: u32, d: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_parts(0 as u64, 0) // Standard Error: 73_000 - .saturating_add(Weight::from_ref_time(21_073_000 as u64).saturating_mul(v as u64)) + .saturating_add(Weight::from_parts(21_073_000 as u64, 0).saturating_mul(v as u64)) // Standard Error: 146_000 - .saturating_add(Weight::from_ref_time(65_000 as u64).saturating_mul(t as u64)) + .saturating_add(Weight::from_parts(65_000 as u64, 0).saturating_mul(t as u64)) // Standard Error: 6_649_000 - .saturating_add(Weight::from_ref_time(1_711_424_000 as u64).saturating_mul(d as u64)) + .saturating_add(Weight::from_parts(1_711_424_000 as u64, 0).saturating_mul(d as u64)) } } diff --git a/frame/elections-phragmen/src/weights.rs b/frame/elections-phragmen/src/weights.rs index 24ab3bc15fbcd..bbe66d52981c5 100644 --- a/frame/elections-phragmen/src/weights.rs +++ b/frame/elections-phragmen/src/weights.rs @@ -84,10 +84,10 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 27_362 nanoseconds. Weight::from_parts(28_497_963, 9726) // Standard Error: 3_968 - .saturating_add(Weight::from_ref_time(176_840).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(176_840, 0).saturating_mul(v.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) - .saturating_add(Weight::from_proof_size(320).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(0, 320).saturating_mul(v.into())) } /// Storage: Elections Candidates (r:1 w:0) /// Proof Skipped: Elections Candidates (max_values: Some(1), max_size: None, mode: Measured) @@ -107,10 +107,10 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 37_120 nanoseconds. Weight::from_parts(38_455_302, 9598) // Standard Error: 5_478 - .saturating_add(Weight::from_ref_time(219_678).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(219_678, 0).saturating_mul(v.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) - .saturating_add(Weight::from_proof_size(320).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(0, 320).saturating_mul(v.into())) } /// Storage: Elections Candidates (r:1 w:0) /// Proof Skipped: Elections Candidates (max_values: Some(1), max_size: None, mode: Measured) @@ -130,10 +130,10 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 36_928 nanoseconds. Weight::from_parts(38_334_669, 9726) // Standard Error: 5_271 - .saturating_add(Weight::from_ref_time(232_355).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(232_355, 0).saturating_mul(v.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) - .saturating_add(Weight::from_proof_size(320).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(0, 320).saturating_mul(v.into())) } /// Storage: Elections Voting (r:1 w:1) /// Proof Skipped: Elections Voting (max_values: None, max_size: None, mode: Measured) @@ -162,10 +162,10 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 31_864 nanoseconds. Weight::from_parts(33_490_161, 6576) // Standard Error: 2_643 - .saturating_add(Weight::from_ref_time(158_386).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(158_386, 0).saturating_mul(c.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(144).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(0, 144).saturating_mul(c.into())) } /// Storage: Elections Candidates (r:1 w:1) /// Proof Skipped: Elections Candidates (max_values: Some(1), max_size: None, mode: Measured) @@ -177,10 +177,10 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 27_292 nanoseconds. Weight::from_parts(28_364_955, 844) // Standard Error: 1_335 - .saturating_add(Weight::from_ref_time(78_086).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(78_086, 0).saturating_mul(c.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(48).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(0, 48).saturating_mul(c.into())) } /// Storage: Elections Members (r:1 w:1) /// Proof Skipped: Elections Members (max_values: Some(1), max_size: None, mode: Measured) @@ -219,7 +219,7 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 2_000_000_000 nanoseconds. - Weight::from_ref_time(2_000_000_000_000) + Weight::from_parts(2_000_000_000_000, 0) } /// Storage: Elections Members (r:1 w:1) /// Proof Skipped: Elections Members (max_values: Some(1), max_size: None, mode: Measured) @@ -263,11 +263,11 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 14_934_185 nanoseconds. Weight::from_parts(15_014_057_000, 8448) // Standard Error: 245_588 - .saturating_add(Weight::from_ref_time(35_586_946).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(35_586_946, 0).saturating_mul(v.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(v.into()))) .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(v.into()))) - .saturating_add(Weight::from_proof_size(12352).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(0, 12352).saturating_mul(v.into())) } /// Storage: Elections Candidates (r:1 w:1) /// Proof Skipped: Elections Candidates (max_values: Some(1), max_size: None, mode: Measured) @@ -297,17 +297,17 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 1_273_671 nanoseconds. Weight::from_parts(1_279_716_000, 330033) // Standard Error: 543_277 - .saturating_add(Weight::from_ref_time(20_613_753).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(20_613_753, 0).saturating_mul(v.into())) // Standard Error: 34_857 - .saturating_add(Weight::from_ref_time(688_354).saturating_mul(e.into())) + .saturating_add(Weight::from_parts(688_354, 0).saturating_mul(e.into())) .saturating_add(T::DbWeight::get().reads(21_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into()))) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(v.into()))) .saturating_add(T::DbWeight::get().writes(6_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into()))) - .saturating_add(Weight::from_proof_size(5229).saturating_mul(v.into())) - .saturating_add(Weight::from_proof_size(89).saturating_mul(e.into())) - .saturating_add(Weight::from_proof_size(2135).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(0, 5229).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(0, 89).saturating_mul(e.into())) + .saturating_add(Weight::from_parts(0, 2135).saturating_mul(c.into())) } } @@ -331,10 +331,10 @@ impl WeightInfo for () { // Minimum execution time: 27_362 nanoseconds. Weight::from_parts(28_497_963, 9726) // Standard Error: 3_968 - .saturating_add(Weight::from_ref_time(176_840).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(176_840, 0).saturating_mul(v.into())) .saturating_add(RocksDbWeight::get().reads(5_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) - .saturating_add(Weight::from_proof_size(320).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(0, 320).saturating_mul(v.into())) } /// Storage: Elections Candidates (r:1 w:0) /// Proof Skipped: Elections Candidates (max_values: Some(1), max_size: None, mode: Measured) @@ -354,10 +354,10 @@ impl WeightInfo for () { // Minimum execution time: 37_120 nanoseconds. Weight::from_parts(38_455_302, 9598) // Standard Error: 5_478 - .saturating_add(Weight::from_ref_time(219_678).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(219_678, 0).saturating_mul(v.into())) .saturating_add(RocksDbWeight::get().reads(5_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) - .saturating_add(Weight::from_proof_size(320).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(0, 320).saturating_mul(v.into())) } /// Storage: Elections Candidates (r:1 w:0) /// Proof Skipped: Elections Candidates (max_values: Some(1), max_size: None, mode: Measured) @@ -377,10 +377,10 @@ impl WeightInfo for () { // Minimum execution time: 36_928 nanoseconds. Weight::from_parts(38_334_669, 9726) // Standard Error: 5_271 - .saturating_add(Weight::from_ref_time(232_355).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(232_355, 0).saturating_mul(v.into())) .saturating_add(RocksDbWeight::get().reads(5_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) - .saturating_add(Weight::from_proof_size(320).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(0, 320).saturating_mul(v.into())) } /// Storage: Elections Voting (r:1 w:1) /// Proof Skipped: Elections Voting (max_values: None, max_size: None, mode: Measured) @@ -409,10 +409,10 @@ impl WeightInfo for () { // Minimum execution time: 31_864 nanoseconds. Weight::from_parts(33_490_161, 6576) // Standard Error: 2_643 - .saturating_add(Weight::from_ref_time(158_386).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(158_386, 0).saturating_mul(c.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(144).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(0, 144).saturating_mul(c.into())) } /// Storage: Elections Candidates (r:1 w:1) /// Proof Skipped: Elections Candidates (max_values: Some(1), max_size: None, mode: Measured) @@ -424,10 +424,10 @@ impl WeightInfo for () { // Minimum execution time: 27_292 nanoseconds. Weight::from_parts(28_364_955, 844) // Standard Error: 1_335 - .saturating_add(Weight::from_ref_time(78_086).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(78_086, 0).saturating_mul(c.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(48).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(0, 48).saturating_mul(c.into())) } /// Storage: Elections Members (r:1 w:1) /// Proof Skipped: Elections Members (max_values: Some(1), max_size: None, mode: Measured) @@ -466,7 +466,7 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 2_000_000_000 nanoseconds. - Weight::from_ref_time(2_000_000_000_000) + Weight::from_parts(2_000_000_000_000, 0) } /// Storage: Elections Members (r:1 w:1) /// Proof Skipped: Elections Members (max_values: Some(1), max_size: None, mode: Measured) @@ -510,11 +510,11 @@ impl WeightInfo for () { // Minimum execution time: 14_934_185 nanoseconds. Weight::from_parts(15_014_057_000, 8448) // Standard Error: 245_588 - .saturating_add(Weight::from_ref_time(35_586_946).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(35_586_946, 0).saturating_mul(v.into())) .saturating_add(RocksDbWeight::get().reads(4_u64)) .saturating_add(RocksDbWeight::get().reads((3_u64).saturating_mul(v.into()))) .saturating_add(RocksDbWeight::get().writes((3_u64).saturating_mul(v.into()))) - .saturating_add(Weight::from_proof_size(12352).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(0, 12352).saturating_mul(v.into())) } /// Storage: Elections Candidates (r:1 w:1) /// Proof Skipped: Elections Candidates (max_values: Some(1), max_size: None, mode: Measured) @@ -544,16 +544,16 @@ impl WeightInfo for () { // Minimum execution time: 1_273_671 nanoseconds. Weight::from_parts(1_279_716_000, 330033) // Standard Error: 543_277 - .saturating_add(Weight::from_ref_time(20_613_753).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(20_613_753, 0).saturating_mul(v.into())) // Standard Error: 34_857 - .saturating_add(Weight::from_ref_time(688_354).saturating_mul(e.into())) + .saturating_add(Weight::from_parts(688_354, 0).saturating_mul(e.into())) .saturating_add(RocksDbWeight::get().reads(21_u64)) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(c.into()))) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(v.into()))) .saturating_add(RocksDbWeight::get().writes(6_u64)) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(c.into()))) - .saturating_add(Weight::from_proof_size(5229).saturating_mul(v.into())) - .saturating_add(Weight::from_proof_size(89).saturating_mul(e.into())) - .saturating_add(Weight::from_proof_size(2135).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(0, 5229).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(0, 89).saturating_mul(e.into())) + .saturating_add(Weight::from_parts(0, 2135).saturating_mul(c.into())) } } diff --git a/frame/examples/basic/src/lib.rs b/frame/examples/basic/src/lib.rs index a2b55bff1654e..a75a0e17cceba 100644 --- a/frame/examples/basic/src/lib.rs +++ b/frame/examples/basic/src/lib.rs @@ -329,7 +329,7 @@ impl WeighData<(&BalanceOf,)> for WeightForSetDum let multiplier = self.0; // *target.0 is the amount passed into the extrinsic let cents = *target.0 / >::from(MILLICENTS); - Weight::from_ref_time((cents * multiplier).saturated_into::()) + Weight::from_parts((cents * multiplier).saturated_into::(), 0) } } diff --git a/frame/examples/basic/src/weights.rs b/frame/examples/basic/src/weights.rs index 4ea1e01d74bb0..def944054cce8 100644 --- a/frame/examples/basic/src/weights.rs +++ b/frame/examples/basic/src/weights.rs @@ -56,20 +56,20 @@ pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { // Storage: BasicExample Dummy (r:0 w:1) fn set_dummy_benchmark() -> Weight { - Weight::from_ref_time(19_000_000 as u64) + Weight::from_parts(19_000_000 as u64, 0) .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: BasicExample Dummy (r:1 w:1) fn accumulate_dummy() -> Weight { - Weight::from_ref_time(18_000_000 as u64) + Weight::from_parts(18_000_000 as u64, 0) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } /// The range of component `x` is `[0, 10000]`. fn sort_vector(x: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_parts(0 as u64, 0) // Standard Error: 2 - .saturating_add(Weight::from_ref_time(520 as u64).saturating_mul(x as u64)) + .saturating_add(Weight::from_parts(520 as u64, 0).saturating_mul(x as u64)) } } @@ -77,19 +77,19 @@ impl WeightInfo for SubstrateWeight { impl WeightInfo for () { // Storage: BasicExample Dummy (r:0 w:1) fn set_dummy_benchmark() -> Weight { - Weight::from_ref_time(19_000_000 as u64) + Weight::from_parts(19_000_000 as u64, 0) .saturating_add(RocksDbWeight::get().writes(1 as u64)) } // Storage: BasicExample Dummy (r:1 w:1) fn accumulate_dummy() -> Weight { - Weight::from_ref_time(18_000_000 as u64) + Weight::from_parts(18_000_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(1 as u64)) .saturating_add(RocksDbWeight::get().writes(1 as u64)) } /// The range of component `x` is `[0, 10000]`. fn sort_vector(x: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_parts(0 as u64, 0) // Standard Error: 2 - .saturating_add(Weight::from_ref_time(520 as u64).saturating_mul(x as u64)) + .saturating_add(Weight::from_parts(520 as u64, 0).saturating_mul(x as u64)) } } diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs index 573332294cb7f..05f3ee4f53588 100644 --- a/frame/executive/src/lib.rs +++ b/frame/executive/src/lib.rs @@ -718,12 +718,12 @@ mod tests { // one with block number arg and one without fn on_initialize(n: T::BlockNumber) -> Weight { println!("on_initialize({})", n); - Weight::from_ref_time(175) + Weight::from_parts(175, 0) } fn on_idle(n: T::BlockNumber, remaining_weight: Weight) -> Weight { println!("on_idle{}, {})", n, remaining_weight); - Weight::from_ref_time(175) + Weight::from_parts(175, 0) } fn on_finalize(n: T::BlockNumber) { @@ -732,7 +732,7 @@ mod tests { fn on_runtime_upgrade() -> Weight { sp_io::storage::set(super::TEST_KEY, "module".as_bytes()); - Weight::from_ref_time(200) + Weight::from_parts(200, 0) } fn offchain_worker(n: T::BlockNumber) { @@ -853,9 +853,9 @@ mod tests { parameter_types! { pub BlockWeights: frame_system::limits::BlockWeights = frame_system::limits::BlockWeights::builder() - .base_block(Weight::from_ref_time(10)) - .for_class(DispatchClass::all(), |weights| weights.base_extrinsic = Weight::from_ref_time(5)) - .for_class(DispatchClass::non_mandatory(), |weights| weights.max_total = Weight::from_ref_time(1024).set_proof_size(u64::MAX).into()) + .base_block(Weight::from_parts(10, 0)) + .for_class(DispatchClass::all(), |weights| weights.base_extrinsic = Weight::from_parts(5, 0)) + .for_class(DispatchClass::non_mandatory(), |weights| weights.max_total = Weight::from_parts(1024, u64::MAX).into()) .build_or_panic(); pub const DbWeight: RuntimeDbWeight = RuntimeDbWeight { read: 10, @@ -946,7 +946,7 @@ mod tests { sp_io::storage::set(TEST_KEY, "custom_upgrade".as_bytes()); sp_io::storage::set(CUSTOM_ON_RUNTIME_KEY, &true.encode()); System::deposit_event(frame_system::Event::CodeUpdated); - Weight::from_ref_time(100) + Weight::from_parts(100, 0) } } @@ -1124,7 +1124,7 @@ mod tests { let encoded_len = encoded.len() as u64; // on_initialize weight + base block execution weight let block_weights = ::BlockWeights::get(); - let base_block_weight = Weight::from_ref_time(175) + block_weights.base_block; + let base_block_weight = Weight::from_parts(175, 0) + block_weights.base_block; let limit = block_weights.get(DispatchClass::Normal).max_total.unwrap() - base_block_weight; let num_to_exhaust_block = limit.ref_time() / (encoded_len + 5); t.execute_with(|| { @@ -1149,7 +1149,7 @@ mod tests { assert_eq!( >::block_weight().total(), //--------------------- on_initialize + block_execution + extrinsic_base weight - Weight::from_ref_time((encoded_len + 5) * (nonce + 1)) + base_block_weight, + Weight::from_parts((encoded_len + 5) * (nonce + 1), 0) + base_block_weight, ); assert_eq!( >::extrinsic_index(), @@ -1180,7 +1180,7 @@ mod tests { let mut t = new_test_ext(1); t.execute_with(|| { // Block execution weight + on_initialize weight from custom module - let base_block_weight = Weight::from_ref_time(175) + + let base_block_weight = Weight::from_parts(175, 0) + ::BlockWeights::get().base_block; Executive::initialize_block(&Header::new( @@ -1199,7 +1199,7 @@ mod tests { assert!(Executive::apply_extrinsic(x2.clone()).unwrap().is_ok()); // default weight for `TestXt` == encoded length. - let extrinsic_weight = Weight::from_ref_time(len as u64) + + let extrinsic_weight = Weight::from_parts(len as u64, 0) + ::BlockWeights::get() .get(DispatchClass::Normal) .base_extrinsic; @@ -1315,7 +1315,7 @@ mod tests { // the `on_initialize` weight defined in the custom test module. assert_eq!( >::block_weight().total(), - Weight::from_ref_time(175 + 175 + 10) + Weight::from_parts(175 + 175 + 10, 0) ); }) } diff --git a/frame/fast-unstake/src/lib.rs b/frame/fast-unstake/src/lib.rs index 81eb3087b998e..3e79bf4077d20 100644 --- a/frame/fast-unstake/src/lib.rs +++ b/frame/fast-unstake/src/lib.rs @@ -208,7 +208,7 @@ pub mod pallet { impl Hooks for Pallet { fn on_idle(_: T::BlockNumber, remaining_weight: Weight) -> Weight { if remaining_weight.any_lt(T::DbWeight::get().reads(2)) { - return Weight::from_ref_time(0) + return Weight::from_parts(0, 0) } Self::do_on_idle(remaining_weight) @@ -356,7 +356,7 @@ pub mod pallet { /// checked, we don't finish the process. pub(crate) fn do_on_idle(remaining_weight: Weight) -> Weight { // any weight that is unaccounted for - let mut unaccounted_weight = Weight::from_ref_time(0); + let mut unaccounted_weight = Weight::from_parts(0, 0); let eras_to_check_per_block = ErasToCheckPerBlock::::get(); if eras_to_check_per_block.is_zero() { diff --git a/frame/fast-unstake/src/tests.rs b/frame/fast-unstake/src/tests.rs index 1bb6fc100c94c..b4bf1f1cb994a 100644 --- a/frame/fast-unstake/src/tests.rs +++ b/frame/fast-unstake/src/tests.rs @@ -228,7 +228,7 @@ mod on_idle { assert_eq!(Queue::::get(1), Some(Deposit::get())); // call on_idle with no remaining weight - FastUnstake::on_idle(System::block_number(), Weight::from_ref_time(0)); + FastUnstake::on_idle(System::block_number(), Weight::from_parts(0, 0)); // assert nothing changed in Queue and Head assert_eq!(Head::::get(), None); @@ -1091,8 +1091,9 @@ mod batched { #[test] fn kusama_estimate() { use crate::WeightInfo; - let block_time = frame_support::weights::Weight::from_ref_time( + let block_time = frame_support::weights::Weight::from_parts( frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND * 2, + 0, ) .ref_time() as f32; let on_idle = crate::weights::SubstrateWeight::::on_idle_check(1000, 64).ref_time() as f32; @@ -1102,8 +1103,9 @@ fn kusama_estimate() { #[test] fn polkadot_estimate() { use crate::WeightInfo; - let block_time = frame_support::weights::Weight::from_ref_time( + let block_time = frame_support::weights::Weight::from_parts( frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND * 2, + 0, ) .ref_time() as f32; let on_idle = crate::weights::SubstrateWeight::::on_idle_check(300, 64).ref_time() as f32; diff --git a/frame/fast-unstake/src/weights.rs b/frame/fast-unstake/src/weights.rs index d1c6595964ee0..ced7acb951229 100644 --- a/frame/fast-unstake/src/weights.rs +++ b/frame/fast-unstake/src/weights.rs @@ -75,9 +75,9 @@ impl WeightInfo for SubstrateWeight { /// The range of component `b` is `[1, 64]`. fn on_idle_unstake(b: u32, ) -> Weight { // Minimum execution time: 92_833 nanoseconds. - Weight::from_ref_time(62_136_346) + Weight::from_parts(62_136_346, 0) // Standard Error: 25_541 - .saturating_add(Weight::from_ref_time(42_904_859).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(42_904_859, 0).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().reads((6_u64).saturating_mul(b.into()))) .saturating_add(T::DbWeight::get().writes(1)) @@ -94,11 +94,11 @@ impl WeightInfo for SubstrateWeight { /// The range of component `b` is `[1, 64]`. fn on_idle_check(v: u32, b: u32, ) -> Weight { // Minimum execution time: 1_775_293 nanoseconds. - Weight::from_ref_time(1_787_133_000) + Weight::from_parts(1_787_133_000, 0) // Standard Error: 17_109_142 - .saturating_add(Weight::from_ref_time(546_766_552).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(546_766_552, 0).saturating_mul(v.into())) // Standard Error: 68_455_625 - .saturating_add(Weight::from_ref_time(2_135_980_830).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(2_135_980_830, 0).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads(7)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(v.into()))) .saturating_add(T::DbWeight::get().writes(1)) @@ -119,7 +119,7 @@ impl WeightInfo for SubstrateWeight { // Storage: FastUnstake CounterForQueue (r:1 w:1) fn register_fast_unstake() -> Weight { // Minimum execution time: 124_849 nanoseconds. - Weight::from_ref_time(128_176_000) + Weight::from_parts(128_176_000, 0) .saturating_add(T::DbWeight::get().reads(14)) .saturating_add(T::DbWeight::get().writes(9)) } @@ -130,14 +130,14 @@ impl WeightInfo for SubstrateWeight { // Storage: FastUnstake CounterForQueue (r:1 w:1) fn deregister() -> Weight { // Minimum execution time: 48_246 nanoseconds. - Weight::from_ref_time(49_720_000) + Weight::from_parts(49_720_000, 0) .saturating_add(T::DbWeight::get().reads(5)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: FastUnstake ErasToCheckPerBlock (r:0 w:1) fn control() -> Weight { // Minimum execution time: 4_611 nanoseconds. - Weight::from_ref_time(4_844_000) + Weight::from_parts(4_844_000, 0) .saturating_add(T::DbWeight::get().writes(1)) } } @@ -161,9 +161,9 @@ impl WeightInfo for () { /// The range of component `b` is `[1, 64]`. fn on_idle_unstake(b: u32, ) -> Weight { // Minimum execution time: 92_833 nanoseconds. - Weight::from_ref_time(62_136_346) + Weight::from_parts(62_136_346, 0) // Standard Error: 25_541 - .saturating_add(Weight::from_ref_time(42_904_859).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(42_904_859, 0).saturating_mul(b.into())) .saturating_add(RocksDbWeight::get().reads(6)) .saturating_add(RocksDbWeight::get().reads((6_u64).saturating_mul(b.into()))) .saturating_add(RocksDbWeight::get().writes(1)) @@ -180,11 +180,11 @@ impl WeightInfo for () { /// The range of component `b` is `[1, 64]`. fn on_idle_check(v: u32, b: u32, ) -> Weight { // Minimum execution time: 1_775_293 nanoseconds. - Weight::from_ref_time(1_787_133_000) + Weight::from_parts(1_787_133_000, 0) // Standard Error: 17_109_142 - .saturating_add(Weight::from_ref_time(546_766_552).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(546_766_552, 0).saturating_mul(v.into())) // Standard Error: 68_455_625 - .saturating_add(Weight::from_ref_time(2_135_980_830).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(2_135_980_830, 0).saturating_mul(b.into())) .saturating_add(RocksDbWeight::get().reads(7)) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(v.into()))) .saturating_add(RocksDbWeight::get().writes(1)) @@ -205,7 +205,7 @@ impl WeightInfo for () { // Storage: FastUnstake CounterForQueue (r:1 w:1) fn register_fast_unstake() -> Weight { // Minimum execution time: 124_849 nanoseconds. - Weight::from_ref_time(128_176_000) + Weight::from_parts(128_176_000, 0) .saturating_add(RocksDbWeight::get().reads(14)) .saturating_add(RocksDbWeight::get().writes(9)) } @@ -216,14 +216,14 @@ impl WeightInfo for () { // Storage: FastUnstake CounterForQueue (r:1 w:1) fn deregister() -> Weight { // Minimum execution time: 48_246 nanoseconds. - Weight::from_ref_time(49_720_000) + Weight::from_parts(49_720_000, 0) .saturating_add(RocksDbWeight::get().reads(5)) .saturating_add(RocksDbWeight::get().writes(2)) } // Storage: FastUnstake ErasToCheckPerBlock (r:0 w:1) fn control() -> Weight { // Minimum execution time: 4_611 nanoseconds. - Weight::from_ref_time(4_844_000) + Weight::from_parts(4_844_000, 0) .saturating_add(RocksDbWeight::get().writes(1)) } } diff --git a/frame/glutton/src/tests.rs b/frame/glutton/src/tests.rs index 8d2c86ed45471..d75f2da5cb7ee 100644 --- a/frame/glutton/src/tests.rs +++ b/frame/glutton/src/tests.rs @@ -133,7 +133,7 @@ fn on_idle_works() { assert_ok!(Glutton::set_compute(RuntimeOrigin::root(), Perbill::from_percent(100))); assert_ok!(Glutton::set_storage(RuntimeOrigin::root(), Perbill::from_percent(100))); - Glutton::on_idle(1, Weight::from_ref_time(20_000_000)); + Glutton::on_idle(1, Weight::from_parts(20_000_000, 0)); }); } diff --git a/frame/glutton/src/weights.rs b/frame/glutton/src/weights.rs index 9c8e161c825f2..1a7020c17a9ab 100644 --- a/frame/glutton/src/weights.rs +++ b/frame/glutton/src/weights.rs @@ -73,10 +73,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `4` // Estimated: `1489` // Minimum execution time: 10_218 nanoseconds. - Weight::from_ref_time(10_510_000) - .saturating_add(Weight::from_proof_size(1489)) + Weight::from_parts(10_510_000, 0) + .saturating_add(Weight::from_parts(0, 1489)) // Standard Error: 1_582 - .saturating_add(Weight::from_ref_time(1_577_660).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(1_577_660, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into()))) @@ -91,10 +91,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `65` // Estimated: `1489` // Minimum execution time: 10_993 nanoseconds. - Weight::from_ref_time(11_208_000) - .saturating_add(Weight::from_proof_size(1489)) + Weight::from_parts(11_208_000, 0) + .saturating_add(Weight::from_parts(0, 1489)) // Standard Error: 1_386 - .saturating_add(Weight::from_ref_time(1_072_330).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(1_072_330, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into()))) @@ -105,10 +105,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 740 nanoseconds. - Weight::from_ref_time(770_000) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(770_000, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 24 - .saturating_add(Weight::from_ref_time(96_434).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(96_434, 0).saturating_mul(i.into())) } /// Storage: Glutton TrashData (r:5000 w:0) /// Proof: Glutton TrashData (max_values: Some(65000), max_size: Some(1036), added: 3016, mode: MaxEncodedLen) @@ -118,12 +118,12 @@ impl WeightInfo for SubstrateWeight { // Measured: `119036 + i * (1053 ±0)` // Estimated: `990 + i * (3016 ±0)` // Minimum execution time: 630 nanoseconds. - Weight::from_ref_time(712_000) - .saturating_add(Weight::from_proof_size(990)) + Weight::from_parts(712_000, 0) + .saturating_add(Weight::from_parts(0, 990)) // Standard Error: 4_326 - .saturating_add(Weight::from_ref_time(5_500_880).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(5_500_880, 0).saturating_mul(i.into())) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(i.into()))) - .saturating_add(Weight::from_proof_size(3016).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(0, 3016).saturating_mul(i.into())) } /// Storage: Glutton Storage (r:1 w:0) /// Proof: Glutton Storage (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -136,8 +136,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `1954313` // Estimated: `5242760` // Minimum execution time: 56_743_236 nanoseconds. - Weight::from_ref_time(57_088_040_000) - .saturating_add(Weight::from_proof_size(5242760)) + Weight::from_parts(57_088_040_000, 0) + .saturating_add(Weight::from_parts(0, 5242760)) .saturating_add(T::DbWeight::get().reads(1739_u64)) } /// Storage: Glutton Storage (r:1 w:0) @@ -151,8 +151,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `9671` // Estimated: `19048` // Minimum execution time: 100_387_042 nanoseconds. - Weight::from_ref_time(100_987_577_000) - .saturating_add(Weight::from_proof_size(19048)) + Weight::from_parts(100_987_577_000, 0) + .saturating_add(Weight::from_parts(0, 19048)) .saturating_add(T::DbWeight::get().reads(7_u64)) } /// Storage: Glutton Storage (r:1 w:0) @@ -164,8 +164,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `4` // Estimated: `2978` // Minimum execution time: 4_256 nanoseconds. - Weight::from_ref_time(4_447_000) - .saturating_add(Weight::from_proof_size(2978)) + Weight::from_parts(4_447_000, 0) + .saturating_add(Weight::from_parts(0, 2978)) .saturating_add(T::DbWeight::get().reads(2_u64)) } /// Storage: Glutton Compute (r:0 w:1) @@ -175,8 +175,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 8_663 nanoseconds. - Weight::from_ref_time(8_864_000) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(8_864_000, 0) + .saturating_add(Weight::from_parts(0, 0)) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Glutton Storage (r:0 w:1) @@ -186,8 +186,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 8_653 nanoseconds. - Weight::from_ref_time(8_998_000) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(8_998_000, 0) + .saturating_add(Weight::from_parts(0, 0)) .saturating_add(T::DbWeight::get().writes(1_u64)) } } @@ -204,10 +204,10 @@ impl WeightInfo for () { // Measured: `4` // Estimated: `1489` // Minimum execution time: 10_218 nanoseconds. - Weight::from_ref_time(10_510_000) - .saturating_add(Weight::from_proof_size(1489)) + Weight::from_parts(10_510_000, 0) + .saturating_add(Weight::from_parts(0, 1489)) // Standard Error: 1_582 - .saturating_add(Weight::from_ref_time(1_577_660).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(1_577_660, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(n.into()))) @@ -222,10 +222,10 @@ impl WeightInfo for () { // Measured: `65` // Estimated: `1489` // Minimum execution time: 10_993 nanoseconds. - Weight::from_ref_time(11_208_000) - .saturating_add(Weight::from_proof_size(1489)) + Weight::from_parts(11_208_000, 0) + .saturating_add(Weight::from_parts(0, 1489)) // Standard Error: 1_386 - .saturating_add(Weight::from_ref_time(1_072_330).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(1_072_330, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(n.into()))) @@ -236,10 +236,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 740 nanoseconds. - Weight::from_ref_time(770_000) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(770_000, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 24 - .saturating_add(Weight::from_ref_time(96_434).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(96_434, 0).saturating_mul(i.into())) } /// Storage: Glutton TrashData (r:5000 w:0) /// Proof: Glutton TrashData (max_values: Some(65000), max_size: Some(1036), added: 3016, mode: MaxEncodedLen) @@ -249,12 +249,12 @@ impl WeightInfo for () { // Measured: `119036 + i * (1053 ±0)` // Estimated: `990 + i * (3016 ±0)` // Minimum execution time: 630 nanoseconds. - Weight::from_ref_time(712_000) - .saturating_add(Weight::from_proof_size(990)) + Weight::from_parts(712_000, 0) + .saturating_add(Weight::from_parts(0, 990)) // Standard Error: 4_326 - .saturating_add(Weight::from_ref_time(5_500_880).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(5_500_880, 0).saturating_mul(i.into())) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(i.into()))) - .saturating_add(Weight::from_proof_size(3016).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(0, 3016).saturating_mul(i.into())) } /// Storage: Glutton Storage (r:1 w:0) /// Proof: Glutton Storage (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -267,8 +267,8 @@ impl WeightInfo for () { // Measured: `1954313` // Estimated: `5242760` // Minimum execution time: 56_743_236 nanoseconds. - Weight::from_ref_time(57_088_040_000) - .saturating_add(Weight::from_proof_size(5242760)) + Weight::from_parts(57_088_040_000, 0) + .saturating_add(Weight::from_parts(0, 5242760)) .saturating_add(RocksDbWeight::get().reads(1739_u64)) } /// Storage: Glutton Storage (r:1 w:0) @@ -282,8 +282,8 @@ impl WeightInfo for () { // Measured: `9671` // Estimated: `19048` // Minimum execution time: 100_387_042 nanoseconds. - Weight::from_ref_time(100_987_577_000) - .saturating_add(Weight::from_proof_size(19048)) + Weight::from_parts(100_987_577_000, 0) + .saturating_add(Weight::from_parts(0, 19048)) .saturating_add(RocksDbWeight::get().reads(7_u64)) } /// Storage: Glutton Storage (r:1 w:0) @@ -295,8 +295,8 @@ impl WeightInfo for () { // Measured: `4` // Estimated: `2978` // Minimum execution time: 4_256 nanoseconds. - Weight::from_ref_time(4_447_000) - .saturating_add(Weight::from_proof_size(2978)) + Weight::from_parts(4_447_000, 0) + .saturating_add(Weight::from_parts(0, 2978)) .saturating_add(RocksDbWeight::get().reads(2_u64)) } /// Storage: Glutton Compute (r:0 w:1) @@ -306,8 +306,8 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 8_663 nanoseconds. - Weight::from_ref_time(8_864_000) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(8_864_000, 0) + .saturating_add(Weight::from_parts(0, 0)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } /// Storage: Glutton Storage (r:0 w:1) @@ -317,8 +317,8 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 8_653 nanoseconds. - Weight::from_ref_time(8_998_000) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(8_998_000, 0) + .saturating_add(Weight::from_parts(0, 0)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } } diff --git a/frame/grandpa/src/default_weights.rs b/frame/grandpa/src/default_weights.rs index 6b203783e2fd9..3afd714f47e57 100644 --- a/frame/grandpa/src/default_weights.rs +++ b/frame/grandpa/src/default_weights.rs @@ -34,18 +34,19 @@ impl crate::WeightInfo for () { const MAX_NOMINATORS: u64 = 200; // checking membership proof - Weight::from_ref_time(35u64 * WEIGHT_REF_TIME_PER_MICROS) + Weight::from_parts(35u64 * WEIGHT_REF_TIME_PER_MICROS, 0) .saturating_add( - Weight::from_ref_time(175u64 * WEIGHT_REF_TIME_PER_NANOS) + Weight::from_parts(175u64 * WEIGHT_REF_TIME_PER_NANOS, 0) .saturating_mul(validator_count), ) .saturating_add(DbWeight::get().reads(5)) // check equivocation proof - .saturating_add(Weight::from_ref_time(95u64 * WEIGHT_REF_TIME_PER_MICROS)) + .saturating_add(Weight::from_parts(95u64 * WEIGHT_REF_TIME_PER_MICROS, 0)) // report offence - .saturating_add(Weight::from_ref_time(110u64 * WEIGHT_REF_TIME_PER_MICROS)) - .saturating_add(Weight::from_ref_time( + .saturating_add(Weight::from_parts(110u64 * WEIGHT_REF_TIME_PER_MICROS, 0)) + .saturating_add(Weight::from_parts( 25u64 * WEIGHT_REF_TIME_PER_MICROS * MAX_NOMINATORS, + 0, )) .saturating_add(DbWeight::get().reads(14 + 3 * MAX_NOMINATORS)) .saturating_add(DbWeight::get().writes(10 + 3 * MAX_NOMINATORS)) @@ -54,7 +55,7 @@ impl crate::WeightInfo for () { } fn note_stalled() -> Weight { - Weight::from_ref_time(3u64 * WEIGHT_REF_TIME_PER_MICROS) + Weight::from_parts(3u64 * WEIGHT_REF_TIME_PER_MICROS, 0) .saturating_add(DbWeight::get().writes(1)) } } diff --git a/frame/identity/src/weights.rs b/frame/identity/src/weights.rs index 6475880528534..65fe2b17ba527 100644 --- a/frame/identity/src/weights.rs +++ b/frame/identity/src/weights.rs @@ -79,7 +79,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 10_964 nanoseconds. Weight::from_parts(11_800_935, 1636) // Standard Error: 1_334 - .saturating_add(Weight::from_ref_time(96_038).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(96_038, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -94,9 +94,9 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 26_400 nanoseconds. Weight::from_parts(26_060_549, 10013) // Standard Error: 1_561 - .saturating_add(Weight::from_ref_time(72_083).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(72_083, 0).saturating_mul(r.into())) // Standard Error: 304 - .saturating_add(Weight::from_ref_time(306_994).saturating_mul(x.into())) + .saturating_add(Weight::from_parts(306_994, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -114,12 +114,12 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 8_492 nanoseconds. Weight::from_parts(21_645_924, 15746) // Standard Error: 3_452 - .saturating_add(Weight::from_ref_time(2_442_604).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(2_442_604, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s.into()))) .saturating_add(T::DbWeight::get().writes(1_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into()))) - .saturating_add(Weight::from_proof_size(2589).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(0, 2589).saturating_mul(s.into())) } /// Storage: Identity IdentityOf (r:1 w:0) /// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen) @@ -135,7 +135,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 8_488 nanoseconds. Weight::from_parts(20_202_601, 15746) // Standard Error: 2_834 - .saturating_add(Weight::from_ref_time(1_082_941).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(1_082_941, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into()))) @@ -156,11 +156,11 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 41_319 nanoseconds. Weight::from_parts(25_850_055, 15746) // Standard Error: 4_144 - .saturating_add(Weight::from_ref_time(59_619).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(59_619, 0).saturating_mul(r.into())) // Standard Error: 809 - .saturating_add(Weight::from_ref_time(1_076_550).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(1_076_550, 0).saturating_mul(s.into())) // Standard Error: 809 - .saturating_add(Weight::from_ref_time(163_191).saturating_mul(x.into())) + .saturating_add(Weight::from_parts(163_191, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into()))) @@ -178,9 +178,9 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 28_118 nanoseconds. Weight::from_parts(27_359_471, 11649) // Standard Error: 2_707 - .saturating_add(Weight::from_ref_time(107_279).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(107_279, 0).saturating_mul(r.into())) // Standard Error: 528 - .saturating_add(Weight::from_ref_time(325_165).saturating_mul(x.into())) + .saturating_add(Weight::from_parts(325_165, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -195,9 +195,9 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 24_817 nanoseconds. Weight::from_parts(24_749_808, 10013) // Standard Error: 1_938 - .saturating_add(Weight::from_ref_time(63_396).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(63_396, 0).saturating_mul(r.into())) // Standard Error: 378 - .saturating_add(Weight::from_ref_time(327_083).saturating_mul(x.into())) + .saturating_add(Weight::from_parts(327_083, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -211,7 +211,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 6_664 nanoseconds. Weight::from_parts(7_286_307, 1636) // Standard Error: 1_560 - .saturating_add(Weight::from_ref_time(96_416).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(96_416, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -225,7 +225,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 7_054 nanoseconds. Weight::from_parts(7_382_954, 1636) // Standard Error: 1_621 - .saturating_add(Weight::from_ref_time(101_595).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(101_595, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -239,7 +239,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 6_659 nanoseconds. Weight::from_parts(7_188_883, 1636) // Standard Error: 1_377 - .saturating_add(Weight::from_ref_time(98_965).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(98_965, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -256,9 +256,9 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 21_567 nanoseconds. Weight::from_parts(21_015_310, 11649) // Standard Error: 2_516 - .saturating_add(Weight::from_ref_time(123_992).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(123_992, 0).saturating_mul(r.into())) // Standard Error: 465 - .saturating_add(Weight::from_ref_time(552_116).saturating_mul(x.into())) + .saturating_add(Weight::from_parts(552_116, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -280,11 +280,11 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 52_881 nanoseconds. Weight::from_parts(38_504_388, 18349) // Standard Error: 3_909 - .saturating_add(Weight::from_ref_time(51_452).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(51_452, 0).saturating_mul(r.into())) // Standard Error: 763 - .saturating_add(Weight::from_ref_time(1_069_924).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(1_069_924, 0).saturating_mul(s.into())) // Standard Error: 763 - .saturating_add(Weight::from_ref_time(164_906).saturating_mul(x.into())) + .saturating_add(Weight::from_parts(164_906, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into()))) @@ -303,7 +303,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 24_556 nanoseconds. Weight::from_parts(28_641_160, 18335) // Standard Error: 1_327 - .saturating_add(Weight::from_ref_time(66_150).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(66_150, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -319,7 +319,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 11_347 nanoseconds. Weight::from_parts(13_299_367, 12602) // Standard Error: 525 - .saturating_add(Weight::from_ref_time(16_472).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(16_472, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -337,7 +337,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 27_810 nanoseconds. Weight::from_parts(30_347_763, 18335) // Standard Error: 928 - .saturating_add(Weight::from_ref_time(55_342).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(55_342, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -353,7 +353,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 17_601 nanoseconds. Weight::from_parts(19_794_971, 8322) // Standard Error: 934 - .saturating_add(Weight::from_ref_time(59_289).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(59_289, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -371,7 +371,7 @@ impl WeightInfo for () { // Minimum execution time: 10_964 nanoseconds. Weight::from_parts(11_800_935, 1636) // Standard Error: 1_334 - .saturating_add(Weight::from_ref_time(96_038).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(96_038, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -386,9 +386,9 @@ impl WeightInfo for () { // Minimum execution time: 26_400 nanoseconds. Weight::from_parts(26_060_549, 10013) // Standard Error: 1_561 - .saturating_add(Weight::from_ref_time(72_083).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(72_083, 0).saturating_mul(r.into())) // Standard Error: 304 - .saturating_add(Weight::from_ref_time(306_994).saturating_mul(x.into())) + .saturating_add(Weight::from_parts(306_994, 0).saturating_mul(x.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -406,12 +406,12 @@ impl WeightInfo for () { // Minimum execution time: 8_492 nanoseconds. Weight::from_parts(21_645_924, 15746) // Standard Error: 3_452 - .saturating_add(Weight::from_ref_time(2_442_604).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(2_442_604, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(s.into()))) .saturating_add(RocksDbWeight::get().writes(1_u64)) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(s.into()))) - .saturating_add(Weight::from_proof_size(2589).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(0, 2589).saturating_mul(s.into())) } /// Storage: Identity IdentityOf (r:1 w:0) /// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen) @@ -427,7 +427,7 @@ impl WeightInfo for () { // Minimum execution time: 8_488 nanoseconds. Weight::from_parts(20_202_601, 15746) // Standard Error: 2_834 - .saturating_add(Weight::from_ref_time(1_082_941).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(1_082_941, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(p.into()))) @@ -448,11 +448,11 @@ impl WeightInfo for () { // Minimum execution time: 41_319 nanoseconds. Weight::from_parts(25_850_055, 15746) // Standard Error: 4_144 - .saturating_add(Weight::from_ref_time(59_619).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(59_619, 0).saturating_mul(r.into())) // Standard Error: 809 - .saturating_add(Weight::from_ref_time(1_076_550).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(1_076_550, 0).saturating_mul(s.into())) // Standard Error: 809 - .saturating_add(Weight::from_ref_time(163_191).saturating_mul(x.into())) + .saturating_add(Weight::from_parts(163_191, 0).saturating_mul(x.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(s.into()))) @@ -470,9 +470,9 @@ impl WeightInfo for () { // Minimum execution time: 28_118 nanoseconds. Weight::from_parts(27_359_471, 11649) // Standard Error: 2_707 - .saturating_add(Weight::from_ref_time(107_279).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(107_279, 0).saturating_mul(r.into())) // Standard Error: 528 - .saturating_add(Weight::from_ref_time(325_165).saturating_mul(x.into())) + .saturating_add(Weight::from_parts(325_165, 0).saturating_mul(x.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -487,9 +487,9 @@ impl WeightInfo for () { // Minimum execution time: 24_817 nanoseconds. Weight::from_parts(24_749_808, 10013) // Standard Error: 1_938 - .saturating_add(Weight::from_ref_time(63_396).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(63_396, 0).saturating_mul(r.into())) // Standard Error: 378 - .saturating_add(Weight::from_ref_time(327_083).saturating_mul(x.into())) + .saturating_add(Weight::from_parts(327_083, 0).saturating_mul(x.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -503,7 +503,7 @@ impl WeightInfo for () { // Minimum execution time: 6_664 nanoseconds. Weight::from_parts(7_286_307, 1636) // Standard Error: 1_560 - .saturating_add(Weight::from_ref_time(96_416).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(96_416, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -517,7 +517,7 @@ impl WeightInfo for () { // Minimum execution time: 7_054 nanoseconds. Weight::from_parts(7_382_954, 1636) // Standard Error: 1_621 - .saturating_add(Weight::from_ref_time(101_595).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(101_595, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -531,7 +531,7 @@ impl WeightInfo for () { // Minimum execution time: 6_659 nanoseconds. Weight::from_parts(7_188_883, 1636) // Standard Error: 1_377 - .saturating_add(Weight::from_ref_time(98_965).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(98_965, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -548,9 +548,9 @@ impl WeightInfo for () { // Minimum execution time: 21_567 nanoseconds. Weight::from_parts(21_015_310, 11649) // Standard Error: 2_516 - .saturating_add(Weight::from_ref_time(123_992).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(123_992, 0).saturating_mul(r.into())) // Standard Error: 465 - .saturating_add(Weight::from_ref_time(552_116).saturating_mul(x.into())) + .saturating_add(Weight::from_parts(552_116, 0).saturating_mul(x.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -572,11 +572,11 @@ impl WeightInfo for () { // Minimum execution time: 52_881 nanoseconds. Weight::from_parts(38_504_388, 18349) // Standard Error: 3_909 - .saturating_add(Weight::from_ref_time(51_452).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(51_452, 0).saturating_mul(r.into())) // Standard Error: 763 - .saturating_add(Weight::from_ref_time(1_069_924).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(1_069_924, 0).saturating_mul(s.into())) // Standard Error: 763 - .saturating_add(Weight::from_ref_time(164_906).saturating_mul(x.into())) + .saturating_add(Weight::from_parts(164_906, 0).saturating_mul(x.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(s.into()))) @@ -595,7 +595,7 @@ impl WeightInfo for () { // Minimum execution time: 24_556 nanoseconds. Weight::from_parts(28_641_160, 18335) // Standard Error: 1_327 - .saturating_add(Weight::from_ref_time(66_150).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(66_150, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -611,7 +611,7 @@ impl WeightInfo for () { // Minimum execution time: 11_347 nanoseconds. Weight::from_parts(13_299_367, 12602) // Standard Error: 525 - .saturating_add(Weight::from_ref_time(16_472).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(16_472, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -629,7 +629,7 @@ impl WeightInfo for () { // Minimum execution time: 27_810 nanoseconds. Weight::from_parts(30_347_763, 18335) // Standard Error: 928 - .saturating_add(Weight::from_ref_time(55_342).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(55_342, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -645,7 +645,7 @@ impl WeightInfo for () { // Minimum execution time: 17_601 nanoseconds. Weight::from_parts(19_794_971, 8322) // Standard Error: 934 - .saturating_add(Weight::from_ref_time(59_289).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(59_289, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } diff --git a/frame/im-online/src/weights.rs b/frame/im-online/src/weights.rs index ee7cabf8ae2ee..675feb075473f 100644 --- a/frame/im-online/src/weights.rs +++ b/frame/im-online/src/weights.rs @@ -73,13 +73,13 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 91_116 nanoseconds. Weight::from_parts(72_526_877, 10345712) // Standard Error: 95 - .saturating_add(Weight::from_ref_time(20_461).saturating_mul(k.into())) + .saturating_add(Weight::from_parts(20_461, 0).saturating_mul(k.into())) // Standard Error: 967 - .saturating_add(Weight::from_ref_time(307_869).saturating_mul(e.into())) + .saturating_add(Weight::from_parts(307_869, 0).saturating_mul(e.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(25).saturating_mul(e.into())) - .saturating_add(Weight::from_proof_size(64).saturating_mul(k.into())) + .saturating_add(Weight::from_parts(0, 25).saturating_mul(e.into())) + .saturating_add(Weight::from_parts(0, 64).saturating_mul(k.into())) } } @@ -104,12 +104,12 @@ impl WeightInfo for () { // Minimum execution time: 91_116 nanoseconds. Weight::from_parts(72_526_877, 10345712) // Standard Error: 95 - .saturating_add(Weight::from_ref_time(20_461).saturating_mul(k.into())) + .saturating_add(Weight::from_parts(20_461, 0).saturating_mul(k.into())) // Standard Error: 967 - .saturating_add(Weight::from_ref_time(307_869).saturating_mul(e.into())) + .saturating_add(Weight::from_parts(307_869, 0).saturating_mul(e.into())) .saturating_add(RocksDbWeight::get().reads(4_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(25).saturating_mul(e.into())) - .saturating_add(Weight::from_proof_size(64).saturating_mul(k.into())) + .saturating_add(Weight::from_parts(0, 25).saturating_mul(e.into())) + .saturating_add(Weight::from_parts(0, 64).saturating_mul(k.into())) } } diff --git a/frame/lottery/src/weights.rs b/frame/lottery/src/weights.rs index e7857b230cd44..0038db6210d2b 100644 --- a/frame/lottery/src/weights.rs +++ b/frame/lottery/src/weights.rs @@ -90,9 +90,9 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 7_650 nanoseconds. - Weight::from_ref_time(8_344_960) + Weight::from_parts(8_344_960, 0) // Standard Error: 2_629 - .saturating_add(Weight::from_ref_time(268_557).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(268_557, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Lottery Lottery (r:1 w:1) @@ -196,9 +196,9 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 7_650 nanoseconds. - Weight::from_ref_time(8_344_960) + Weight::from_parts(8_344_960, 0) // Standard Error: 2_629 - .saturating_add(Weight::from_ref_time(268_557).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(268_557, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().writes(1_u64)) } /// Storage: Lottery Lottery (r:1 w:1) diff --git a/frame/membership/src/weights.rs b/frame/membership/src/weights.rs index 17f4b2f84ec6d..f080f842c54b4 100644 --- a/frame/membership/src/weights.rs +++ b/frame/membership/src/weights.rs @@ -76,10 +76,10 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 15_673 nanoseconds. Weight::from_parts(16_830_288, 4903) // Standard Error: 570 - .saturating_add(Weight::from_ref_time(41_959).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(41_959, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(192).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 192).saturating_mul(m.into())) } /// Storage: TechnicalMembership Members (r:1 w:1) /// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen) @@ -99,10 +99,10 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 18_231 nanoseconds. Weight::from_parts(19_081_297, 5742) // Standard Error: 571 - .saturating_add(Weight::from_ref_time(41_331).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(41_331, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(192).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 192).saturating_mul(m.into())) } /// Storage: TechnicalMembership Members (r:1 w:1) /// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen) @@ -122,10 +122,10 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 18_517 nanoseconds. Weight::from_parts(19_388_310, 5742) // Standard Error: 625 - .saturating_add(Weight::from_ref_time(51_422).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(51_422, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(192).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 192).saturating_mul(m.into())) } /// Storage: TechnicalMembership Members (r:1 w:1) /// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen) @@ -145,10 +145,10 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 17_628 nanoseconds. Weight::from_parts(19_258_882, 5742) // Standard Error: 820 - .saturating_add(Weight::from_ref_time(153_956).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(153_956, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(192).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 192).saturating_mul(m.into())) } /// Storage: TechnicalMembership Members (r:1 w:1) /// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen) @@ -168,10 +168,10 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 19_031 nanoseconds. Weight::from_parts(20_264_948, 5742) // Standard Error: 707 - .saturating_add(Weight::from_ref_time(51_060).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(51_060, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) - .saturating_add(Weight::from_proof_size(192).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 192).saturating_mul(m.into())) } /// Storage: TechnicalMembership Members (r:1 w:0) /// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen) @@ -187,10 +187,10 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 6_897 nanoseconds. Weight::from_parts(7_455_387, 3761) // Standard Error: 326 - .saturating_add(Weight::from_ref_time(16_653).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(16_653, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) - .saturating_add(Weight::from_proof_size(32).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into())) } /// Storage: TechnicalMembership Prime (r:0 w:1) /// Proof: TechnicalMembership Prime (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen) @@ -202,9 +202,9 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 3_400 nanoseconds. - Weight::from_ref_time(3_703_421) + Weight::from_parts(3_703_421, 0) // Standard Error: 119 - .saturating_add(Weight::from_ref_time(915).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(915, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().writes(2_u64)) } } @@ -227,10 +227,10 @@ impl WeightInfo for () { // Minimum execution time: 15_673 nanoseconds. Weight::from_parts(16_830_288, 4903) // Standard Error: 570 - .saturating_add(Weight::from_ref_time(41_959).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(41_959, 0).saturating_mul(m.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(192).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 192).saturating_mul(m.into())) } /// Storage: TechnicalMembership Members (r:1 w:1) /// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen) @@ -250,10 +250,10 @@ impl WeightInfo for () { // Minimum execution time: 18_231 nanoseconds. Weight::from_parts(19_081_297, 5742) // Standard Error: 571 - .saturating_add(Weight::from_ref_time(41_331).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(41_331, 0).saturating_mul(m.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(192).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 192).saturating_mul(m.into())) } /// Storage: TechnicalMembership Members (r:1 w:1) /// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen) @@ -273,10 +273,10 @@ impl WeightInfo for () { // Minimum execution time: 18_517 nanoseconds. Weight::from_parts(19_388_310, 5742) // Standard Error: 625 - .saturating_add(Weight::from_ref_time(51_422).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(51_422, 0).saturating_mul(m.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(192).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 192).saturating_mul(m.into())) } /// Storage: TechnicalMembership Members (r:1 w:1) /// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen) @@ -296,10 +296,10 @@ impl WeightInfo for () { // Minimum execution time: 17_628 nanoseconds. Weight::from_parts(19_258_882, 5742) // Standard Error: 820 - .saturating_add(Weight::from_ref_time(153_956).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(153_956, 0).saturating_mul(m.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(192).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 192).saturating_mul(m.into())) } /// Storage: TechnicalMembership Members (r:1 w:1) /// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen) @@ -319,10 +319,10 @@ impl WeightInfo for () { // Minimum execution time: 19_031 nanoseconds. Weight::from_parts(20_264_948, 5742) // Standard Error: 707 - .saturating_add(Weight::from_ref_time(51_060).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(51_060, 0).saturating_mul(m.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) - .saturating_add(Weight::from_proof_size(192).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 192).saturating_mul(m.into())) } /// Storage: TechnicalMembership Members (r:1 w:0) /// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen) @@ -338,10 +338,10 @@ impl WeightInfo for () { // Minimum execution time: 6_897 nanoseconds. Weight::from_parts(7_455_387, 3761) // Standard Error: 326 - .saturating_add(Weight::from_ref_time(16_653).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(16_653, 0).saturating_mul(m.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) - .saturating_add(Weight::from_proof_size(32).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into())) } /// Storage: TechnicalMembership Prime (r:0 w:1) /// Proof: TechnicalMembership Prime (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen) @@ -353,9 +353,9 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 3_400 nanoseconds. - Weight::from_ref_time(3_703_421) + Weight::from_parts(3_703_421, 0) // Standard Error: 119 - .saturating_add(Weight::from_ref_time(915).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(915, 0).saturating_mul(m.into())) .saturating_add(RocksDbWeight::get().writes(2_u64)) } } diff --git a/frame/merkle-mountain-range/src/default_weights.rs b/frame/merkle-mountain-range/src/default_weights.rs index 5d2e37cddce8b..52e3f130383fd 100644 --- a/frame/merkle-mountain-range/src/default_weights.rs +++ b/frame/merkle-mountain-range/src/default_weights.rs @@ -28,7 +28,7 @@ impl crate::WeightInfo for () { // Reading the parent hash. let leaf_weight = DbWeight::get().reads(1); // Blake2 hash cost. - let hash_weight = Weight::from_ref_time(2u64 * WEIGHT_REF_TIME_PER_NANOS); + let hash_weight = Weight::from_parts(2u64 * WEIGHT_REF_TIME_PER_NANOS, 0); // No-op hook. let hook_weight = Weight::zero(); diff --git a/frame/message-queue/src/weights.rs b/frame/message-queue/src/weights.rs index 3421c2f2f59af..d1ccb338e66c3 100644 --- a/frame/message-queue/src/weights.rs +++ b/frame/message-queue/src/weights.rs @@ -73,8 +73,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `295` // Estimated: `7527` // Minimum execution time: 12_538 nanoseconds. - Weight::from_ref_time(12_799_000) - .saturating_add(Weight::from_proof_size(7527)) + Weight::from_parts(12_799_000, 0) + .saturating_add(Weight::from_parts(0, 7527)) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -87,8 +87,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `295` // Estimated: `7527` // Minimum execution time: 11_727 nanoseconds. - Weight::from_ref_time(12_177_000) - .saturating_add(Weight::from_proof_size(7527)) + Weight::from_parts(12_177_000, 0) + .saturating_add(Weight::from_parts(0, 7527)) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -99,8 +99,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `42` // Estimated: `3514` // Minimum execution time: 4_983 nanoseconds. - Weight::from_ref_time(5_174_000) - .saturating_add(Weight::from_proof_size(3514)) + Weight::from_parts(5_174_000, 0) + .saturating_add(Weight::from_parts(0, 3514)) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -111,8 +111,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `113` // Estimated: `69049` // Minimum execution time: 6_299 nanoseconds. - Weight::from_ref_time(6_670_000) - .saturating_add(Weight::from_proof_size(69049)) + Weight::from_parts(6_670_000, 0) + .saturating_add(Weight::from_parts(0, 69049)) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -123,8 +123,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `113` // Estimated: `69049` // Minimum execution time: 6_762 nanoseconds. - Weight::from_ref_time(7_059_000) - .saturating_add(Weight::from_proof_size(69049)) + Weight::from_parts(7_059_000, 0) + .saturating_add(Weight::from_parts(0, 69049)) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -133,8 +133,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 72_681 nanoseconds. - Weight::from_ref_time(73_147_000) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(73_147_000, 0) + .saturating_add(Weight::from_parts(0, 0)) } /// Storage: MessageQueue ServiceHead (r:1 w:1) /// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -145,8 +145,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `172` // Estimated: `5003` // Minimum execution time: 7_066 nanoseconds. - Weight::from_ref_time(7_214_000) - .saturating_add(Weight::from_proof_size(5003)) + Weight::from_parts(7_214_000, 0) + .saturating_add(Weight::from_parts(0, 5003)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -159,8 +159,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `65742` // Estimated: `72563` // Minimum execution time: 57_778 nanoseconds. - Weight::from_ref_time(58_778_000) - .saturating_add(Weight::from_proof_size(72563)) + Weight::from_parts(58_778_000, 0) + .saturating_add(Weight::from_parts(0, 72563)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -173,8 +173,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `65742` // Estimated: `72563` // Minimum execution time: 72_144 nanoseconds. - Weight::from_ref_time(72_942_000) - .saturating_add(Weight::from_proof_size(72563)) + Weight::from_parts(72_942_000, 0) + .saturating_add(Weight::from_parts(0, 72563)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -187,8 +187,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `65742` // Estimated: `72563` // Minimum execution time: 84_890 nanoseconds. - Weight::from_ref_time(86_073_000) - .saturating_add(Weight::from_proof_size(72563)) + Weight::from_parts(86_073_000, 0) + .saturating_add(Weight::from_parts(0, 72563)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -205,8 +205,8 @@ impl WeightInfo for () { // Measured: `295` // Estimated: `7527` // Minimum execution time: 12_538 nanoseconds. - Weight::from_ref_time(12_799_000) - .saturating_add(Weight::from_proof_size(7527)) + Weight::from_parts(12_799_000, 0) + .saturating_add(Weight::from_parts(0, 7527)) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -219,8 +219,8 @@ impl WeightInfo for () { // Measured: `295` // Estimated: `7527` // Minimum execution time: 11_727 nanoseconds. - Weight::from_ref_time(12_177_000) - .saturating_add(Weight::from_proof_size(7527)) + Weight::from_parts(12_177_000, 0) + .saturating_add(Weight::from_parts(0, 7527)) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) } @@ -231,8 +231,8 @@ impl WeightInfo for () { // Measured: `42` // Estimated: `3514` // Minimum execution time: 4_983 nanoseconds. - Weight::from_ref_time(5_174_000) - .saturating_add(Weight::from_proof_size(3514)) + Weight::from_parts(5_174_000, 0) + .saturating_add(Weight::from_parts(0, 3514)) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -243,8 +243,8 @@ impl WeightInfo for () { // Measured: `113` // Estimated: `69049` // Minimum execution time: 6_299 nanoseconds. - Weight::from_ref_time(6_670_000) - .saturating_add(Weight::from_proof_size(69049)) + Weight::from_parts(6_670_000, 0) + .saturating_add(Weight::from_parts(0, 69049)) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -255,8 +255,8 @@ impl WeightInfo for () { // Measured: `113` // Estimated: `69049` // Minimum execution time: 6_762 nanoseconds. - Weight::from_ref_time(7_059_000) - .saturating_add(Weight::from_proof_size(69049)) + Weight::from_parts(7_059_000, 0) + .saturating_add(Weight::from_parts(0, 69049)) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -265,8 +265,8 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 72_681 nanoseconds. - Weight::from_ref_time(73_147_000) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(73_147_000, 0) + .saturating_add(Weight::from_parts(0, 0)) } /// Storage: MessageQueue ServiceHead (r:1 w:1) /// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -277,8 +277,8 @@ impl WeightInfo for () { // Measured: `172` // Estimated: `5003` // Minimum execution time: 7_066 nanoseconds. - Weight::from_ref_time(7_214_000) - .saturating_add(Weight::from_proof_size(5003)) + Weight::from_parts(7_214_000, 0) + .saturating_add(Weight::from_parts(0, 5003)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -291,8 +291,8 @@ impl WeightInfo for () { // Measured: `65742` // Estimated: `72563` // Minimum execution time: 57_778 nanoseconds. - Weight::from_ref_time(58_778_000) - .saturating_add(Weight::from_proof_size(72563)) + Weight::from_parts(58_778_000, 0) + .saturating_add(Weight::from_parts(0, 72563)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -305,8 +305,8 @@ impl WeightInfo for () { // Measured: `65742` // Estimated: `72563` // Minimum execution time: 72_144 nanoseconds. - Weight::from_ref_time(72_942_000) - .saturating_add(Weight::from_proof_size(72563)) + Weight::from_parts(72_942_000, 0) + .saturating_add(Weight::from_parts(0, 72563)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -319,8 +319,8 @@ impl WeightInfo for () { // Measured: `65742` // Estimated: `72563` // Minimum execution time: 84_890 nanoseconds. - Weight::from_ref_time(86_073_000) - .saturating_add(Weight::from_proof_size(72563)) + Weight::from_parts(86_073_000, 0) + .saturating_add(Weight::from_parts(0, 72563)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } diff --git a/frame/multisig/src/weights.rs b/frame/multisig/src/weights.rs index eff6a29803e04..fb155c97f2def 100644 --- a/frame/multisig/src/weights.rs +++ b/frame/multisig/src/weights.rs @@ -66,9 +66,9 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 12_086 nanoseconds. - Weight::from_ref_time(12_464_828) + Weight::from_parts(12_464_828, 0) // Standard Error: 1 - .saturating_add(Weight::from_ref_time(494).saturating_mul(z.into())) + .saturating_add(Weight::from_parts(494, 0).saturating_mul(z.into())) } /// Storage: Multisig Multisigs (r:1 w:1) /// Proof: Multisig Multisigs (max_values: None, max_size: Some(3346), added: 5821, mode: MaxEncodedLen) @@ -81,9 +81,9 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 35_377 nanoseconds. Weight::from_parts(29_088_956, 5821) // Standard Error: 335 - .saturating_add(Weight::from_ref_time(67_846).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(67_846, 0).saturating_mul(s.into())) // Standard Error: 3 - .saturating_add(Weight::from_ref_time(1_523).saturating_mul(z.into())) + .saturating_add(Weight::from_parts(1_523, 0).saturating_mul(z.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -98,9 +98,9 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 26_138 nanoseconds. Weight::from_parts(20_479_380, 5821) // Standard Error: 259 - .saturating_add(Weight::from_ref_time(64_116).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(64_116, 0).saturating_mul(s.into())) // Standard Error: 2 - .saturating_add(Weight::from_ref_time(1_520).saturating_mul(z.into())) + .saturating_add(Weight::from_parts(1_520, 0).saturating_mul(z.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -117,9 +117,9 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 40_323 nanoseconds. Weight::from_parts(32_311_615, 8424) // Standard Error: 401 - .saturating_add(Weight::from_ref_time(85_999).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(85_999, 0).saturating_mul(s.into())) // Standard Error: 3 - .saturating_add(Weight::from_ref_time(1_534).saturating_mul(z.into())) + .saturating_add(Weight::from_parts(1_534, 0).saturating_mul(z.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -133,7 +133,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 26_938 nanoseconds. Weight::from_parts(27_802_216, 5821) // Standard Error: 342 - .saturating_add(Weight::from_ref_time(69_282).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(69_282, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -147,7 +147,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 18_050 nanoseconds. Weight::from_parts(19_095_404, 5821) // Standard Error: 419 - .saturating_add(Weight::from_ref_time(66_914).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(66_914, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -161,7 +161,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 27_508 nanoseconds. Weight::from_parts(28_702_686, 5821) // Standard Error: 466 - .saturating_add(Weight::from_ref_time(69_419).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(69_419, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -175,9 +175,9 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 12_086 nanoseconds. - Weight::from_ref_time(12_464_828) + Weight::from_parts(12_464_828, 0) // Standard Error: 1 - .saturating_add(Weight::from_ref_time(494).saturating_mul(z.into())) + .saturating_add(Weight::from_parts(494, 0).saturating_mul(z.into())) } /// Storage: Multisig Multisigs (r:1 w:1) /// Proof: Multisig Multisigs (max_values: None, max_size: Some(3346), added: 5821, mode: MaxEncodedLen) @@ -190,9 +190,9 @@ impl WeightInfo for () { // Minimum execution time: 35_377 nanoseconds. Weight::from_parts(29_088_956, 5821) // Standard Error: 335 - .saturating_add(Weight::from_ref_time(67_846).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(67_846, 0).saturating_mul(s.into())) // Standard Error: 3 - .saturating_add(Weight::from_ref_time(1_523).saturating_mul(z.into())) + .saturating_add(Weight::from_parts(1_523, 0).saturating_mul(z.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -207,9 +207,9 @@ impl WeightInfo for () { // Minimum execution time: 26_138 nanoseconds. Weight::from_parts(20_479_380, 5821) // Standard Error: 259 - .saturating_add(Weight::from_ref_time(64_116).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(64_116, 0).saturating_mul(s.into())) // Standard Error: 2 - .saturating_add(Weight::from_ref_time(1_520).saturating_mul(z.into())) + .saturating_add(Weight::from_parts(1_520, 0).saturating_mul(z.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -226,9 +226,9 @@ impl WeightInfo for () { // Minimum execution time: 40_323 nanoseconds. Weight::from_parts(32_311_615, 8424) // Standard Error: 401 - .saturating_add(Weight::from_ref_time(85_999).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(85_999, 0).saturating_mul(s.into())) // Standard Error: 3 - .saturating_add(Weight::from_ref_time(1_534).saturating_mul(z.into())) + .saturating_add(Weight::from_parts(1_534, 0).saturating_mul(z.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -242,7 +242,7 @@ impl WeightInfo for () { // Minimum execution time: 26_938 nanoseconds. Weight::from_parts(27_802_216, 5821) // Standard Error: 342 - .saturating_add(Weight::from_ref_time(69_282).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(69_282, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -256,7 +256,7 @@ impl WeightInfo for () { // Minimum execution time: 18_050 nanoseconds. Weight::from_parts(19_095_404, 5821) // Standard Error: 419 - .saturating_add(Weight::from_ref_time(66_914).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(66_914, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -270,7 +270,7 @@ impl WeightInfo for () { // Minimum execution time: 27_508 nanoseconds. Weight::from_parts(28_702_686, 5821) // Standard Error: 466 - .saturating_add(Weight::from_ref_time(69_419).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(69_419, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } diff --git a/frame/nfts/src/weights.rs b/frame/nfts/src/weights.rs index 9eedea958ae83..858ae2fec9226 100644 --- a/frame/nfts/src/weights.rs +++ b/frame/nfts/src/weights.rs @@ -108,8 +108,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `214` // Estimated: `3054` // Minimum execution time: 33_769 nanoseconds. - Weight::from_ref_time(36_031_000) - .saturating_add(Weight::from_proof_size(3054)) + Weight::from_parts(36_031_000, 0) + .saturating_add(Weight::from_parts(0, 3054)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -128,8 +128,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `42` // Estimated: `3054` // Minimum execution time: 21_767 nanoseconds. - Weight::from_ref_time(22_565_000) - .saturating_add(Weight::from_proof_size(3054)) + Weight::from_parts(22_565_000, 0) + .saturating_add(Weight::from_parts(0, 3054)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -161,20 +161,20 @@ impl WeightInfo for SubstrateWeight { // Measured: `172781 + m * (127 ±0) + a * (402 ±0)` // Estimated: `3347427 + m * (2615 ±0) + a * (2921 ±0)` // Minimum execution time: 26_973_627 nanoseconds. - Weight::from_ref_time(19_692_361_714) - .saturating_add(Weight::from_proof_size(3347427)) + Weight::from_parts(19_692_361_714, 0) + .saturating_add(Weight::from_parts(0, 3347427)) // Standard Error: 17_036 - .saturating_add(Weight::from_ref_time(7_797_219).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(7_797_219, 0).saturating_mul(m.into())) // Standard Error: 17_036 - .saturating_add(Weight::from_ref_time(9_504_128).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(9_504_128, 0).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(1004_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(m.into()))) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().writes(3005_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(m.into()))) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(a.into()))) - .saturating_add(Weight::from_proof_size(2615).saturating_mul(m.into())) - .saturating_add(Weight::from_proof_size(2921).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(0, 2615).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 2921).saturating_mul(a.into())) } /// Storage: Nfts CollectionConfigOf (r:1 w:0) /// Proof: Nfts CollectionConfigOf (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen) @@ -193,8 +193,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `448` // Estimated: `13506` // Minimum execution time: 44_837 nanoseconds. - Weight::from_ref_time(46_794_000) - .saturating_add(Weight::from_proof_size(13506)) + Weight::from_parts(46_794_000, 0) + .saturating_add(Weight::from_parts(0, 13506)) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -215,8 +215,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `448` // Estimated: `13506` // Minimum execution time: 43_976 nanoseconds. - Weight::from_ref_time(44_831_000) - .saturating_add(Weight::from_proof_size(13506)) + Weight::from_parts(44_831_000, 0) + .saturating_add(Weight::from_parts(0, 13506)) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -243,8 +243,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `647` // Estimated: `13573` // Minimum execution time: 48_233 nanoseconds. - Weight::from_ref_time(50_113_000) - .saturating_add(Weight::from_proof_size(13573)) + Weight::from_parts(50_113_000, 0) + .saturating_add(Weight::from_parts(0, 13573)) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(7_u64)) } @@ -271,8 +271,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `882` // Estimated: `16109` // Minimum execution time: 55_452 nanoseconds. - Weight::from_ref_time(57_642_000) - .saturating_add(Weight::from_proof_size(16109)) + Weight::from_parts(57_642_000, 0) + .saturating_add(Weight::from_parts(0, 16109)) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(6_u64)) } @@ -288,14 +288,14 @@ impl WeightInfo for SubstrateWeight { // Measured: `756 + i * (140 ±0)` // Estimated: `5103 + i * (3336 ±0)` // Minimum execution time: 15_598 nanoseconds. - Weight::from_ref_time(15_926_000) - .saturating_add(Weight::from_proof_size(5103)) + Weight::from_parts(15_926_000, 0) + .saturating_add(Weight::from_parts(0, 5103)) // Standard Error: 13_692 - .saturating_add(Weight::from_ref_time(14_040_741).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(14_040_741, 0).saturating_mul(i.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(i.into()))) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into()))) - .saturating_add(Weight::from_proof_size(3336).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(0, 3336).saturating_mul(i.into())) } /// Storage: Nfts CollectionRoleOf (r:1 w:0) /// Proof: Nfts CollectionRoleOf (max_values: None, max_size: Some(69), added: 2544, mode: MaxEncodedLen) @@ -306,8 +306,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `401` // Estimated: `5067` // Minimum execution time: 19_686 nanoseconds. - Weight::from_ref_time(20_404_000) - .saturating_add(Weight::from_proof_size(5067)) + Weight::from_parts(20_404_000, 0) + .saturating_add(Weight::from_parts(0, 5067)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -320,8 +320,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `401` // Estimated: `5067` // Minimum execution time: 19_172 nanoseconds. - Weight::from_ref_time(20_151_000) - .saturating_add(Weight::from_proof_size(5067)) + Weight::from_parts(20_151_000, 0) + .saturating_add(Weight::from_parts(0, 5067)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -334,8 +334,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `289` // Estimated: `5092` // Minimum execution time: 17_063 nanoseconds. - Weight::from_ref_time(17_482_000) - .saturating_add(Weight::from_proof_size(5092)) + Weight::from_parts(17_482_000, 0) + .saturating_add(Weight::from_parts(0, 5092)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -350,8 +350,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `381` // Estimated: `5082` // Minimum execution time: 21_974 nanoseconds. - Weight::from_ref_time(22_770_000) - .saturating_add(Weight::from_proof_size(5082)) + Weight::from_parts(22_770_000, 0) + .saturating_add(Weight::from_parts(0, 5082)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -364,8 +364,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `362` // Estimated: `2555` // Minimum execution time: 24_341 nanoseconds. - Weight::from_ref_time(25_059_000) - .saturating_add(Weight::from_proof_size(2555)) + Weight::from_parts(25_059_000, 0) + .saturating_add(Weight::from_parts(0, 2555)) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -378,8 +378,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `304` // Estimated: `2555` // Minimum execution time: 16_897 nanoseconds. - Weight::from_ref_time(17_560_000) - .saturating_add(Weight::from_proof_size(2555)) + Weight::from_parts(17_560_000, 0) + .saturating_add(Weight::from_parts(0, 2555)) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -392,8 +392,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `242` // Estimated: `2555` // Minimum execution time: 13_239 nanoseconds. - Weight::from_ref_time(13_963_000) - .saturating_add(Weight::from_proof_size(2555)) + Weight::from_parts(13_963_000, 0) + .saturating_add(Weight::from_parts(0, 2555)) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -406,8 +406,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `445` // Estimated: `5078` // Minimum execution time: 17_187 nanoseconds. - Weight::from_ref_time(17_942_000) - .saturating_add(Weight::from_proof_size(5078)) + Weight::from_parts(17_942_000, 0) + .saturating_add(Weight::from_parts(0, 5078)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -424,8 +424,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `474` // Estimated: `10547` // Minimum execution time: 40_925 nanoseconds. - Weight::from_ref_time(42_733_000) - .saturating_add(Weight::from_proof_size(10547)) + Weight::from_parts(42_733_000, 0) + .saturating_add(Weight::from_parts(0, 10547)) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -438,8 +438,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `337` // Estimated: `5476` // Minimum execution time: 24_486 nanoseconds. - Weight::from_ref_time(25_409_000) - .saturating_add(Weight::from_proof_size(5476)) + Weight::from_parts(25_409_000, 0) + .saturating_add(Weight::from_parts(0, 5476)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -454,8 +454,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `916` // Estimated: `7999` // Minimum execution time: 36_643 nanoseconds. - Weight::from_ref_time(37_805_000) - .saturating_add(Weight::from_proof_size(7999)) + Weight::from_parts(37_805_000, 0) + .saturating_add(Weight::from_parts(0, 7999)) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -468,8 +468,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `379` // Estimated: `6492` // Minimum execution time: 16_798 nanoseconds. - Weight::from_ref_time(17_326_000) - .saturating_add(Weight::from_proof_size(6492)) + Weight::from_parts(17_326_000, 0) + .saturating_add(Weight::from_parts(0, 6492)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -487,15 +487,15 @@ impl WeightInfo for SubstrateWeight { // Measured: `899 + n * (396 ±0)` // Estimated: `12016 + n * (2921 ±0)` // Minimum execution time: 25_524 nanoseconds. - Weight::from_ref_time(26_107_000) - .saturating_add(Weight::from_proof_size(12016)) + Weight::from_parts(26_107_000, 0) + .saturating_add(Weight::from_parts(0, 12016)) // Standard Error: 5_460 - .saturating_add(Weight::from_ref_time(9_030_830).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(9_030_830, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into()))) .saturating_add(T::DbWeight::get().writes(2_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into()))) - .saturating_add(Weight::from_proof_size(2921).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 2921).saturating_mul(n.into())) } /// Storage: Nfts Collection (r:1 w:1) /// Proof: Nfts Collection (max_values: None, max_size: Some(80), added: 2555, mode: MaxEncodedLen) @@ -510,8 +510,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `474` // Estimated: `10241` // Minimum execution time: 34_400 nanoseconds. - Weight::from_ref_time(35_469_000) - .saturating_add(Weight::from_proof_size(10241)) + Weight::from_parts(35_469_000, 0) + .saturating_add(Weight::from_parts(0, 10241)) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -526,8 +526,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `609` // Estimated: `7693` // Minimum execution time: 31_560 nanoseconds. - Weight::from_ref_time(33_081_000) - .saturating_add(Weight::from_proof_size(7693)) + Weight::from_parts(33_081_000, 0) + .saturating_add(Weight::from_parts(0, 7693)) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -542,8 +542,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `333` // Estimated: `7665` // Minimum execution time: 28_821 nanoseconds. - Weight::from_ref_time(30_010_000) - .saturating_add(Weight::from_proof_size(7665)) + Weight::from_parts(30_010_000, 0) + .saturating_add(Weight::from_parts(0, 7665)) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -558,8 +558,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `476` // Estimated: `7665` // Minimum execution time: 27_608 nanoseconds. - Weight::from_ref_time(28_766_000) - .saturating_add(Weight::from_proof_size(7665)) + Weight::from_parts(28_766_000, 0) + .saturating_add(Weight::from_parts(0, 7665)) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -574,8 +574,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `466` // Estimated: `8428` // Minimum execution time: 23_987 nanoseconds. - Weight::from_ref_time(24_819_000) - .saturating_add(Weight::from_proof_size(8428)) + Weight::from_parts(24_819_000, 0) + .saturating_add(Weight::from_parts(0, 8428)) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -588,8 +588,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `474` // Estimated: `5880` // Minimum execution time: 21_254 nanoseconds. - Weight::from_ref_time(21_826_000) - .saturating_add(Weight::from_proof_size(5880)) + Weight::from_parts(21_826_000, 0) + .saturating_add(Weight::from_parts(0, 5880)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -602,8 +602,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `474` // Estimated: `5880` // Minimum execution time: 20_272 nanoseconds. - Weight::from_ref_time(20_922_000) - .saturating_add(Weight::from_proof_size(5880)) + Weight::from_parts(20_922_000, 0) + .saturating_add(Weight::from_parts(0, 5880)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -614,8 +614,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `42` // Estimated: `2527` // Minimum execution time: 14_287 nanoseconds. - Weight::from_ref_time(14_960_000) - .saturating_add(Weight::from_proof_size(2527)) + Weight::from_parts(14_960_000, 0) + .saturating_add(Weight::from_parts(0, 2527)) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -628,8 +628,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `333` // Estimated: `5103` // Minimum execution time: 17_948 nanoseconds. - Weight::from_ref_time(18_780_000) - .saturating_add(Weight::from_proof_size(5103)) + Weight::from_parts(18_780_000, 0) + .saturating_add(Weight::from_parts(0, 5103)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -642,8 +642,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `333` // Estimated: `5103` // Minimum execution time: 16_616 nanoseconds. - Weight::from_ref_time(17_155_000) - .saturating_add(Weight::from_proof_size(5103)) + Weight::from_parts(17_155_000, 0) + .saturating_add(Weight::from_parts(0, 5103)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -660,8 +660,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `516` // Estimated: `8407` // Minimum execution time: 22_777 nanoseconds. - Weight::from_ref_time(23_955_000) - .saturating_add(Weight::from_proof_size(8407)) + Weight::from_parts(23_955_000, 0) + .saturating_add(Weight::from_parts(0, 8407)) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -686,8 +686,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `934` // Estimated: `16129` // Minimum execution time: 61_131 nanoseconds. - Weight::from_ref_time(62_791_000) - .saturating_add(Weight::from_proof_size(16129)) + Weight::from_parts(62_791_000, 0) + .saturating_add(Weight::from_parts(0, 16129)) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(6_u64)) } @@ -697,10 +697,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 1_952 nanoseconds. - Weight::from_ref_time(3_975_700) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(3_975_700, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 11_254 - .saturating_add(Weight::from_ref_time(3_501_698).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(3_501_698, 0).saturating_mul(n.into())) } /// Storage: Nfts Item (r:2 w:0) /// Proof: Nfts Item (max_values: None, max_size: Some(861), added: 3336, mode: MaxEncodedLen) @@ -711,8 +711,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `524` // Estimated: `6672` // Minimum execution time: 20_327 nanoseconds. - Weight::from_ref_time(21_714_000) - .saturating_add(Weight::from_proof_size(6672)) + Weight::from_parts(21_714_000, 0) + .saturating_add(Weight::from_parts(0, 6672)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -725,8 +725,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `511` // Estimated: `5882` // Minimum execution time: 20_668 nanoseconds. - Weight::from_ref_time(21_416_000) - .saturating_add(Weight::from_proof_size(5882)) + Weight::from_parts(21_416_000, 0) + .saturating_add(Weight::from_parts(0, 5882)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -751,8 +751,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `1097` // Estimated: `21970` // Minimum execution time: 88_006 nanoseconds. - Weight::from_ref_time(90_390_000) - .saturating_add(Weight::from_proof_size(21970)) + Weight::from_parts(90_390_000, 0) + .saturating_add(Weight::from_parts(0, 21970)) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().writes(11_u64)) } @@ -778,15 +778,15 @@ impl WeightInfo for SubstrateWeight { // Measured: `596` // Estimated: `16180 + n * (2921 ±0)` // Minimum execution time: 124_967 nanoseconds. - Weight::from_ref_time(131_602_642) - .saturating_add(Weight::from_proof_size(16180)) + Weight::from_parts(131_602_642, 0) + .saturating_add(Weight::from_parts(0, 16180)) // Standard Error: 36_480 - .saturating_add(Weight::from_ref_time(25_811_394).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(25_811_394, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into()))) .saturating_add(T::DbWeight::get().writes(6_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into()))) - .saturating_add(Weight::from_proof_size(2921).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 2921).saturating_mul(n.into())) } /// Storage: Nfts Item (r:1 w:0) /// Proof: Nfts Item (max_values: None, max_size: Some(861), added: 3336, mode: MaxEncodedLen) @@ -806,15 +806,15 @@ impl WeightInfo for SubstrateWeight { // Measured: `716` // Estimated: `14198 + n * (2921 ±0)` // Minimum execution time: 84_153 nanoseconds. - Weight::from_ref_time(96_401_623) - .saturating_add(Weight::from_proof_size(14198)) + Weight::from_parts(96_401_623, 0) + .saturating_add(Weight::from_parts(0, 14198)) // Standard Error: 70_244 - .saturating_add(Weight::from_ref_time(26_866_222).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(26_866_222, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into()))) .saturating_add(T::DbWeight::get().writes(2_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into()))) - .saturating_add(Weight::from_proof_size(2921).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 2921).saturating_mul(n.into())) } } @@ -835,8 +835,8 @@ impl WeightInfo for () { // Measured: `214` // Estimated: `3054` // Minimum execution time: 33_769 nanoseconds. - Weight::from_ref_time(36_031_000) - .saturating_add(Weight::from_proof_size(3054)) + Weight::from_parts(36_031_000, 0) + .saturating_add(Weight::from_parts(0, 3054)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(5_u64)) } @@ -855,8 +855,8 @@ impl WeightInfo for () { // Measured: `42` // Estimated: `3054` // Minimum execution time: 21_767 nanoseconds. - Weight::from_ref_time(22_565_000) - .saturating_add(Weight::from_proof_size(3054)) + Weight::from_parts(22_565_000, 0) + .saturating_add(Weight::from_parts(0, 3054)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(5_u64)) } @@ -888,20 +888,20 @@ impl WeightInfo for () { // Measured: `172781 + m * (127 ±0) + a * (402 ±0)` // Estimated: `3347427 + m * (2615 ±0) + a * (2921 ±0)` // Minimum execution time: 26_973_627 nanoseconds. - Weight::from_ref_time(19_692_361_714) - .saturating_add(Weight::from_proof_size(3347427)) + Weight::from_parts(19_692_361_714, 0) + .saturating_add(Weight::from_parts(0, 3347427)) // Standard Error: 17_036 - .saturating_add(Weight::from_ref_time(7_797_219).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(7_797_219, 0).saturating_mul(m.into())) // Standard Error: 17_036 - .saturating_add(Weight::from_ref_time(9_504_128).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(9_504_128, 0).saturating_mul(a.into())) .saturating_add(RocksDbWeight::get().reads(1004_u64)) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(m.into()))) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(a.into()))) .saturating_add(RocksDbWeight::get().writes(3005_u64)) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(m.into()))) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(a.into()))) - .saturating_add(Weight::from_proof_size(2615).saturating_mul(m.into())) - .saturating_add(Weight::from_proof_size(2921).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(0, 2615).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 2921).saturating_mul(a.into())) } /// Storage: Nfts CollectionConfigOf (r:1 w:0) /// Proof: Nfts CollectionConfigOf (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen) @@ -920,8 +920,8 @@ impl WeightInfo for () { // Measured: `448` // Estimated: `13506` // Minimum execution time: 44_837 nanoseconds. - Weight::from_ref_time(46_794_000) - .saturating_add(Weight::from_proof_size(13506)) + Weight::from_parts(46_794_000, 0) + .saturating_add(Weight::from_parts(0, 13506)) .saturating_add(RocksDbWeight::get().reads(5_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) } @@ -942,8 +942,8 @@ impl WeightInfo for () { // Measured: `448` // Estimated: `13506` // Minimum execution time: 43_976 nanoseconds. - Weight::from_ref_time(44_831_000) - .saturating_add(Weight::from_proof_size(13506)) + Weight::from_parts(44_831_000, 0) + .saturating_add(Weight::from_parts(0, 13506)) .saturating_add(RocksDbWeight::get().reads(5_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) } @@ -970,8 +970,8 @@ impl WeightInfo for () { // Measured: `647` // Estimated: `13573` // Minimum execution time: 48_233 nanoseconds. - Weight::from_ref_time(50_113_000) - .saturating_add(Weight::from_proof_size(13573)) + Weight::from_parts(50_113_000, 0) + .saturating_add(Weight::from_parts(0, 13573)) .saturating_add(RocksDbWeight::get().reads(5_u64)) .saturating_add(RocksDbWeight::get().writes(7_u64)) } @@ -998,8 +998,8 @@ impl WeightInfo for () { // Measured: `882` // Estimated: `16109` // Minimum execution time: 55_452 nanoseconds. - Weight::from_ref_time(57_642_000) - .saturating_add(Weight::from_proof_size(16109)) + Weight::from_parts(57_642_000, 0) + .saturating_add(Weight::from_parts(0, 16109)) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(6_u64)) } @@ -1015,14 +1015,14 @@ impl WeightInfo for () { // Measured: `756 + i * (140 ±0)` // Estimated: `5103 + i * (3336 ±0)` // Minimum execution time: 15_598 nanoseconds. - Weight::from_ref_time(15_926_000) - .saturating_add(Weight::from_proof_size(5103)) + Weight::from_parts(15_926_000, 0) + .saturating_add(Weight::from_parts(0, 5103)) // Standard Error: 13_692 - .saturating_add(Weight::from_ref_time(14_040_741).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(14_040_741, 0).saturating_mul(i.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(i.into()))) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(i.into()))) - .saturating_add(Weight::from_proof_size(3336).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(0, 3336).saturating_mul(i.into())) } /// Storage: Nfts CollectionRoleOf (r:1 w:0) /// Proof: Nfts CollectionRoleOf (max_values: None, max_size: Some(69), added: 2544, mode: MaxEncodedLen) @@ -1033,8 +1033,8 @@ impl WeightInfo for () { // Measured: `401` // Estimated: `5067` // Minimum execution time: 19_686 nanoseconds. - Weight::from_ref_time(20_404_000) - .saturating_add(Weight::from_proof_size(5067)) + Weight::from_parts(20_404_000, 0) + .saturating_add(Weight::from_parts(0, 5067)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -1047,8 +1047,8 @@ impl WeightInfo for () { // Measured: `401` // Estimated: `5067` // Minimum execution time: 19_172 nanoseconds. - Weight::from_ref_time(20_151_000) - .saturating_add(Weight::from_proof_size(5067)) + Weight::from_parts(20_151_000, 0) + .saturating_add(Weight::from_parts(0, 5067)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -1061,8 +1061,8 @@ impl WeightInfo for () { // Measured: `289` // Estimated: `5092` // Minimum execution time: 17_063 nanoseconds. - Weight::from_ref_time(17_482_000) - .saturating_add(Weight::from_proof_size(5092)) + Weight::from_parts(17_482_000, 0) + .saturating_add(Weight::from_parts(0, 5092)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -1077,8 +1077,8 @@ impl WeightInfo for () { // Measured: `381` // Estimated: `5082` // Minimum execution time: 21_974 nanoseconds. - Weight::from_ref_time(22_770_000) - .saturating_add(Weight::from_proof_size(5082)) + Weight::from_parts(22_770_000, 0) + .saturating_add(Weight::from_parts(0, 5082)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) } @@ -1091,8 +1091,8 @@ impl WeightInfo for () { // Measured: `362` // Estimated: `2555` // Minimum execution time: 24_341 nanoseconds. - Weight::from_ref_time(25_059_000) - .saturating_add(Weight::from_proof_size(2555)) + Weight::from_parts(25_059_000, 0) + .saturating_add(Weight::from_parts(0, 2555)) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(5_u64)) } @@ -1105,8 +1105,8 @@ impl WeightInfo for () { // Measured: `304` // Estimated: `2555` // Minimum execution time: 16_897 nanoseconds. - Weight::from_ref_time(17_560_000) - .saturating_add(Weight::from_proof_size(2555)) + Weight::from_parts(17_560_000, 0) + .saturating_add(Weight::from_parts(0, 2555)) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) } @@ -1119,8 +1119,8 @@ impl WeightInfo for () { // Measured: `242` // Estimated: `2555` // Minimum execution time: 13_239 nanoseconds. - Weight::from_ref_time(13_963_000) - .saturating_add(Weight::from_proof_size(2555)) + Weight::from_parts(13_963_000, 0) + .saturating_add(Weight::from_parts(0, 2555)) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -1133,8 +1133,8 @@ impl WeightInfo for () { // Measured: `445` // Estimated: `5078` // Minimum execution time: 17_187 nanoseconds. - Weight::from_ref_time(17_942_000) - .saturating_add(Weight::from_proof_size(5078)) + Weight::from_parts(17_942_000, 0) + .saturating_add(Weight::from_parts(0, 5078)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -1151,8 +1151,8 @@ impl WeightInfo for () { // Measured: `474` // Estimated: `10547` // Minimum execution time: 40_925 nanoseconds. - Weight::from_ref_time(42_733_000) - .saturating_add(Weight::from_proof_size(10547)) + Weight::from_parts(42_733_000, 0) + .saturating_add(Weight::from_parts(0, 10547)) .saturating_add(RocksDbWeight::get().reads(4_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -1165,8 +1165,8 @@ impl WeightInfo for () { // Measured: `337` // Estimated: `5476` // Minimum execution time: 24_486 nanoseconds. - Weight::from_ref_time(25_409_000) - .saturating_add(Weight::from_proof_size(5476)) + Weight::from_parts(25_409_000, 0) + .saturating_add(Weight::from_parts(0, 5476)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -1181,8 +1181,8 @@ impl WeightInfo for () { // Measured: `916` // Estimated: `7999` // Minimum execution time: 36_643 nanoseconds. - Weight::from_ref_time(37_805_000) - .saturating_add(Weight::from_proof_size(7999)) + Weight::from_parts(37_805_000, 0) + .saturating_add(Weight::from_parts(0, 7999)) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -1195,8 +1195,8 @@ impl WeightInfo for () { // Measured: `379` // Estimated: `6492` // Minimum execution time: 16_798 nanoseconds. - Weight::from_ref_time(17_326_000) - .saturating_add(Weight::from_proof_size(6492)) + Weight::from_parts(17_326_000, 0) + .saturating_add(Weight::from_parts(0, 6492)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -1214,15 +1214,15 @@ impl WeightInfo for () { // Measured: `899 + n * (396 ±0)` // Estimated: `12016 + n * (2921 ±0)` // Minimum execution time: 25_524 nanoseconds. - Weight::from_ref_time(26_107_000) - .saturating_add(Weight::from_proof_size(12016)) + Weight::from_parts(26_107_000, 0) + .saturating_add(Weight::from_parts(0, 12016)) // Standard Error: 5_460 - .saturating_add(Weight::from_ref_time(9_030_830).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(9_030_830, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(4_u64)) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(n.into()))) .saturating_add(RocksDbWeight::get().writes(2_u64)) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(n.into()))) - .saturating_add(Weight::from_proof_size(2921).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 2921).saturating_mul(n.into())) } /// Storage: Nfts Collection (r:1 w:1) /// Proof: Nfts Collection (max_values: None, max_size: Some(80), added: 2555, mode: MaxEncodedLen) @@ -1237,8 +1237,8 @@ impl WeightInfo for () { // Measured: `474` // Estimated: `10241` // Minimum execution time: 34_400 nanoseconds. - Weight::from_ref_time(35_469_000) - .saturating_add(Weight::from_proof_size(10241)) + Weight::from_parts(35_469_000, 0) + .saturating_add(Weight::from_parts(0, 10241)) .saturating_add(RocksDbWeight::get().reads(4_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -1253,8 +1253,8 @@ impl WeightInfo for () { // Measured: `609` // Estimated: `7693` // Minimum execution time: 31_560 nanoseconds. - Weight::from_ref_time(33_081_000) - .saturating_add(Weight::from_proof_size(7693)) + Weight::from_parts(33_081_000, 0) + .saturating_add(Weight::from_parts(0, 7693)) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -1269,8 +1269,8 @@ impl WeightInfo for () { // Measured: `333` // Estimated: `7665` // Minimum execution time: 28_821 nanoseconds. - Weight::from_ref_time(30_010_000) - .saturating_add(Weight::from_proof_size(7665)) + Weight::from_parts(30_010_000, 0) + .saturating_add(Weight::from_parts(0, 7665)) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -1285,8 +1285,8 @@ impl WeightInfo for () { // Measured: `476` // Estimated: `7665` // Minimum execution time: 27_608 nanoseconds. - Weight::from_ref_time(28_766_000) - .saturating_add(Weight::from_proof_size(7665)) + Weight::from_parts(28_766_000, 0) + .saturating_add(Weight::from_parts(0, 7665)) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -1301,8 +1301,8 @@ impl WeightInfo for () { // Measured: `466` // Estimated: `8428` // Minimum execution time: 23_987 nanoseconds. - Weight::from_ref_time(24_819_000) - .saturating_add(Weight::from_proof_size(8428)) + Weight::from_parts(24_819_000, 0) + .saturating_add(Weight::from_parts(0, 8428)) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -1315,8 +1315,8 @@ impl WeightInfo for () { // Measured: `474` // Estimated: `5880` // Minimum execution time: 21_254 nanoseconds. - Weight::from_ref_time(21_826_000) - .saturating_add(Weight::from_proof_size(5880)) + Weight::from_parts(21_826_000, 0) + .saturating_add(Weight::from_parts(0, 5880)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -1329,8 +1329,8 @@ impl WeightInfo for () { // Measured: `474` // Estimated: `5880` // Minimum execution time: 20_272 nanoseconds. - Weight::from_ref_time(20_922_000) - .saturating_add(Weight::from_proof_size(5880)) + Weight::from_parts(20_922_000, 0) + .saturating_add(Weight::from_parts(0, 5880)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -1341,8 +1341,8 @@ impl WeightInfo for () { // Measured: `42` // Estimated: `2527` // Minimum execution time: 14_287 nanoseconds. - Weight::from_ref_time(14_960_000) - .saturating_add(Weight::from_proof_size(2527)) + Weight::from_parts(14_960_000, 0) + .saturating_add(Weight::from_parts(0, 2527)) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -1355,8 +1355,8 @@ impl WeightInfo for () { // Measured: `333` // Estimated: `5103` // Minimum execution time: 17_948 nanoseconds. - Weight::from_ref_time(18_780_000) - .saturating_add(Weight::from_proof_size(5103)) + Weight::from_parts(18_780_000, 0) + .saturating_add(Weight::from_parts(0, 5103)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -1369,8 +1369,8 @@ impl WeightInfo for () { // Measured: `333` // Estimated: `5103` // Minimum execution time: 16_616 nanoseconds. - Weight::from_ref_time(17_155_000) - .saturating_add(Weight::from_proof_size(5103)) + Weight::from_parts(17_155_000, 0) + .saturating_add(Weight::from_parts(0, 5103)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -1387,8 +1387,8 @@ impl WeightInfo for () { // Measured: `516` // Estimated: `8407` // Minimum execution time: 22_777 nanoseconds. - Weight::from_ref_time(23_955_000) - .saturating_add(Weight::from_proof_size(8407)) + Weight::from_parts(23_955_000, 0) + .saturating_add(Weight::from_parts(0, 8407)) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -1413,8 +1413,8 @@ impl WeightInfo for () { // Measured: `934` // Estimated: `16129` // Minimum execution time: 61_131 nanoseconds. - Weight::from_ref_time(62_791_000) - .saturating_add(Weight::from_proof_size(16129)) + Weight::from_parts(62_791_000, 0) + .saturating_add(Weight::from_parts(0, 16129)) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(6_u64)) } @@ -1424,10 +1424,10 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 1_952 nanoseconds. - Weight::from_ref_time(3_975_700) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(3_975_700, 0) + .saturating_add(Weight::from_parts(0, 0)) // Standard Error: 11_254 - .saturating_add(Weight::from_ref_time(3_501_698).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(3_501_698, 0).saturating_mul(n.into())) } /// Storage: Nfts Item (r:2 w:0) /// Proof: Nfts Item (max_values: None, max_size: Some(861), added: 3336, mode: MaxEncodedLen) @@ -1438,8 +1438,8 @@ impl WeightInfo for () { // Measured: `524` // Estimated: `6672` // Minimum execution time: 20_327 nanoseconds. - Weight::from_ref_time(21_714_000) - .saturating_add(Weight::from_proof_size(6672)) + Weight::from_parts(21_714_000, 0) + .saturating_add(Weight::from_parts(0, 6672)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -1452,8 +1452,8 @@ impl WeightInfo for () { // Measured: `511` // Estimated: `5882` // Minimum execution time: 20_668 nanoseconds. - Weight::from_ref_time(21_416_000) - .saturating_add(Weight::from_proof_size(5882)) + Weight::from_parts(21_416_000, 0) + .saturating_add(Weight::from_parts(0, 5882)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -1478,8 +1478,8 @@ impl WeightInfo for () { // Measured: `1097` // Estimated: `21970` // Minimum execution time: 88_006 nanoseconds. - Weight::from_ref_time(90_390_000) - .saturating_add(Weight::from_proof_size(21970)) + Weight::from_parts(90_390_000, 0) + .saturating_add(Weight::from_parts(0, 21970)) .saturating_add(RocksDbWeight::get().reads(8_u64)) .saturating_add(RocksDbWeight::get().writes(11_u64)) } @@ -1505,15 +1505,15 @@ impl WeightInfo for () { // Measured: `596` // Estimated: `16180 + n * (2921 ±0)` // Minimum execution time: 124_967 nanoseconds. - Weight::from_ref_time(131_602_642) - .saturating_add(Weight::from_proof_size(16180)) + Weight::from_parts(131_602_642, 0) + .saturating_add(Weight::from_parts(0, 16180)) // Standard Error: 36_480 - .saturating_add(Weight::from_ref_time(25_811_394).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(25_811_394, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(n.into()))) .saturating_add(RocksDbWeight::get().writes(6_u64)) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(n.into()))) - .saturating_add(Weight::from_proof_size(2921).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 2921).saturating_mul(n.into())) } /// Storage: Nfts Item (r:1 w:0) /// Proof: Nfts Item (max_values: None, max_size: Some(861), added: 3336, mode: MaxEncodedLen) @@ -1533,14 +1533,14 @@ impl WeightInfo for () { // Measured: `716` // Estimated: `14198 + n * (2921 ±0)` // Minimum execution time: 84_153 nanoseconds. - Weight::from_ref_time(96_401_623) - .saturating_add(Weight::from_proof_size(14198)) + Weight::from_parts(96_401_623, 0) + .saturating_add(Weight::from_parts(0, 14198)) // Standard Error: 70_244 - .saturating_add(Weight::from_ref_time(26_866_222).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(26_866_222, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(4_u64)) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(n.into()))) .saturating_add(RocksDbWeight::get().writes(2_u64)) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(n.into()))) - .saturating_add(Weight::from_proof_size(2921).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 2921).saturating_mul(n.into())) } } diff --git a/frame/nis/src/mock.rs b/frame/nis/src/mock.rs index 8df9f89c16926..8594c88a5927d 100644 --- a/frame/nis/src/mock.rs +++ b/frame/nis/src/mock.rs @@ -111,7 +111,7 @@ parameter_types! { pub static Target: Perquintill = Perquintill::zero(); pub const MinReceipt: Perquintill = Perquintill::from_percent(1); pub const ThawThrottle: (Perquintill, u64) = (Perquintill::from_percent(25), 5); - pub static MaxIntakeWeight: Weight = Weight::from_ref_time(2_000_000_000_000); + pub static MaxIntakeWeight: Weight = Weight::from_parts(2_000_000_000_000, 0); pub const ReserveId: [u8; 8] = *b"py/nis "; } diff --git a/frame/nis/src/weights.rs b/frame/nis/src/weights.rs index 36a169f16c52e..27c2f23e0e9ec 100644 --- a/frame/nis/src/weights.rs +++ b/frame/nis/src/weights.rs @@ -78,7 +78,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 28_814 nanoseconds. Weight::from_parts(35_245_917, 60718) // Standard Error: 189 - .saturating_add(Weight::from_ref_time(45_322).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(45_322, 0).saturating_mul(l.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -111,7 +111,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 34_426 nanoseconds. Weight::from_parts(36_434_166, 60718) // Standard Error: 135 - .saturating_add(Weight::from_ref_time(33_923).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(33_923, 0).saturating_mul(l.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -239,7 +239,7 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 6_758 nanoseconds. - Weight::from_ref_time(6_911_000) + Weight::from_parts(6_911_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } } @@ -260,7 +260,7 @@ impl WeightInfo for () { // Minimum execution time: 28_814 nanoseconds. Weight::from_parts(35_245_917, 60718) // Standard Error: 189 - .saturating_add(Weight::from_ref_time(45_322).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(45_322, 0).saturating_mul(l.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) } @@ -293,7 +293,7 @@ impl WeightInfo for () { // Minimum execution time: 34_426 nanoseconds. Weight::from_parts(36_434_166, 60718) // Standard Error: 135 - .saturating_add(Weight::from_ref_time(33_923).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(33_923, 0).saturating_mul(l.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) } @@ -421,7 +421,7 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 6_758 nanoseconds. - Weight::from_ref_time(6_911_000) + Weight::from_parts(6_911_000, 0) .saturating_add(RocksDbWeight::get().writes(1_u64)) } } diff --git a/frame/node-authorization/src/weights.rs b/frame/node-authorization/src/weights.rs index f1ff9580d5a43..a4529c845c7c0 100644 --- a/frame/node-authorization/src/weights.rs +++ b/frame/node-authorization/src/weights.rs @@ -37,13 +37,13 @@ pub trait WeightInfo { } impl WeightInfo for () { - fn add_well_known_node() -> Weight { Weight::from_ref_time(50_000_000) } - fn remove_well_known_node() -> Weight { Weight::from_ref_time(50_000_000) } - fn swap_well_known_node() -> Weight { Weight::from_ref_time(50_000_000) } - fn reset_well_known_nodes() -> Weight { Weight::from_ref_time(50_000_000) } - fn claim_node() -> Weight { Weight::from_ref_time(50_000_000) } - fn remove_claim() -> Weight { Weight::from_ref_time(50_000_000) } - fn transfer_node() -> Weight { Weight::from_ref_time(50_000_000) } - fn add_connections() -> Weight { Weight::from_ref_time(50_000_000) } - fn remove_connections() -> Weight { Weight::from_ref_time(50_000_000) } + fn add_well_known_node() -> Weight { Weight::from_parts(50_000_000, 0) } + fn remove_well_known_node() -> Weight { Weight::from_parts(50_000_000, 0) } + fn swap_well_known_node() -> Weight { Weight::from_parts(50_000_000, 0) } + fn reset_well_known_nodes() -> Weight { Weight::from_parts(50_000_000, 0) } + fn claim_node() -> Weight { Weight::from_parts(50_000_000, 0) } + fn remove_claim() -> Weight { Weight::from_parts(50_000_000, 0) } + fn transfer_node() -> Weight { Weight::from_parts(50_000_000, 0) } + fn add_connections() -> Weight { Weight::from_parts(50_000_000, 0) } + fn remove_connections() -> Weight { Weight::from_parts(50_000_000, 0) } } diff --git a/frame/nomination-pools/src/weights.rs b/frame/nomination-pools/src/weights.rs index 1c3d1c6339e8d..ca7de7be6e7c6 100644 --- a/frame/nomination-pools/src/weights.rs +++ b/frame/nomination-pools/src/weights.rs @@ -101,8 +101,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `3573` // Estimated: `37988` // Minimum execution time: 169_857 nanoseconds. - Weight::from_ref_time(173_895_000) - .saturating_add(Weight::from_proof_size(37988)) + Weight::from_parts(173_895_000, 0) + .saturating_add(Weight::from_parts(0, 37988)) .saturating_add(T::DbWeight::get().reads(17_u64)) .saturating_add(T::DbWeight::get().writes(12_u64)) } @@ -129,8 +129,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `3615` // Estimated: `38583` // Minimum execution time: 167_372 nanoseconds. - Weight::from_ref_time(168_776_000) - .saturating_add(Weight::from_proof_size(38583)) + Weight::from_parts(168_776_000, 0) + .saturating_add(Weight::from_parts(0, 38583)) .saturating_add(T::DbWeight::get().reads(14_u64)) .saturating_add(T::DbWeight::get().writes(12_u64)) } @@ -159,8 +159,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `3680` // Estimated: `41099` // Minimum execution time: 186_346 nanoseconds. - Weight::from_ref_time(191_308_000) - .saturating_add(Weight::from_proof_size(41099)) + Weight::from_parts(191_308_000, 0) + .saturating_add(Weight::from_parts(0, 41099)) .saturating_add(T::DbWeight::get().reads(15_u64)) .saturating_add(T::DbWeight::get().writes(13_u64)) } @@ -179,8 +179,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `1254` // Estimated: `13005` // Minimum execution time: 61_423 nanoseconds. - Weight::from_ref_time(63_219_000) - .saturating_add(Weight::from_proof_size(13005)) + Weight::from_parts(63_219_000, 0) + .saturating_add(Weight::from_parts(0, 13005)) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -219,8 +219,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `3858` // Estimated: `67379` // Minimum execution time: 174_532 nanoseconds. - Weight::from_ref_time(180_032_000) - .saturating_add(Weight::from_proof_size(67379)) + Weight::from_parts(180_032_000, 0) + .saturating_add(Weight::from_parts(0, 67379)) .saturating_add(T::DbWeight::get().reads(18_u64)) .saturating_add(T::DbWeight::get().writes(14_u64)) } @@ -240,10 +240,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `1779` // Estimated: `13025` // Minimum execution time: 55_327 nanoseconds. - Weight::from_ref_time(58_947_746) - .saturating_add(Weight::from_proof_size(13025)) + Weight::from_parts(58_947_746, 0) + .saturating_add(Weight::from_parts(0, 13025)) // Standard Error: 1_589 - .saturating_add(Weight::from_ref_time(40_696).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(40_696, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -271,10 +271,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `2303` // Estimated: `45696` // Minimum execution time: 105_923 nanoseconds. - Weight::from_ref_time(110_572_476) - .saturating_add(Weight::from_proof_size(45696)) + Weight::from_parts(110_572_476, 0) + .saturating_add(Weight::from_parts(0, 45696)) // Standard Error: 2_438 - .saturating_add(Weight::from_ref_time(69_045).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(69_045, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(9_u64)) .saturating_add(T::DbWeight::get().writes(7_u64)) } @@ -324,8 +324,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `2690` // Estimated: `68812` // Minimum execution time: 169_700 nanoseconds. - Weight::from_ref_time(178_693_541) - .saturating_add(Weight::from_proof_size(68812)) + Weight::from_parts(178_693_541, 0) + .saturating_add(Weight::from_parts(0, 68812)) .saturating_add(T::DbWeight::get().reads(20_u64)) .saturating_add(T::DbWeight::get().writes(17_u64)) } @@ -376,8 +376,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `1321` // Estimated: `31522` // Minimum execution time: 145_976 nanoseconds. - Weight::from_ref_time(150_664_000) - .saturating_add(Weight::from_proof_size(31522)) + Weight::from_parts(150_664_000, 0) + .saturating_add(Weight::from_parts(0, 31522)) .saturating_add(T::DbWeight::get().reads(21_u64)) .saturating_add(T::DbWeight::get().writes(15_u64)) } @@ -411,14 +411,14 @@ impl WeightInfo for SubstrateWeight { // Measured: `1909` // Estimated: `21998 + n * (2520 ±0)` // Minimum execution time: 69_288 nanoseconds. - Weight::from_ref_time(71_075_293) - .saturating_add(Weight::from_proof_size(21998)) + Weight::from_parts(71_075_293, 0) + .saturating_add(Weight::from_parts(0, 21998)) // Standard Error: 10_508 - .saturating_add(Weight::from_ref_time(1_384_674).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(1_384_674, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(12_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into()))) .saturating_add(T::DbWeight::get().writes(5_u64)) - .saturating_add(Weight::from_proof_size(2520).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 2520).saturating_mul(n.into())) } /// Storage: NominationPools BondedPools (r:1 w:1) /// Proof: NominationPools BondedPools (max_values: None, max_size: Some(164), added: 2639, mode: MaxEncodedLen) @@ -431,8 +431,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `1498` // Estimated: `8752` // Minimum execution time: 36_410 nanoseconds. - Weight::from_ref_time(37_585_000) - .saturating_add(Weight::from_proof_size(8752)) + Weight::from_parts(37_585_000, 0) + .saturating_add(Weight::from_parts(0, 8752)) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -448,10 +448,10 @@ impl WeightInfo for SubstrateWeight { // Measured: `559` // Estimated: `5883` // Minimum execution time: 14_322 nanoseconds. - Weight::from_ref_time(15_328_204) - .saturating_add(Weight::from_proof_size(5883)) + Weight::from_parts(15_328_204, 0) + .saturating_add(Weight::from_parts(0, 5883)) // Standard Error: 161 - .saturating_add(Weight::from_ref_time(1_406).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(1_406, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -470,8 +470,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 5_968 nanoseconds. - Weight::from_ref_time(6_245_000) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(6_245_000, 0) + .saturating_add(Weight::from_parts(0, 0)) .saturating_add(T::DbWeight::get().writes(5_u64)) } /// Storage: NominationPools BondedPools (r:1 w:1) @@ -481,8 +481,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `559` // Estimated: `2639` // Minimum execution time: 18_979 nanoseconds. - Weight::from_ref_time(19_795_000) - .saturating_add(Weight::from_proof_size(2639)) + Weight::from_parts(19_795_000, 0) + .saturating_add(Weight::from_parts(0, 2639)) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -509,8 +509,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `2136` // Estimated: `20489` // Minimum execution time: 68_145 nanoseconds. - Weight::from_ref_time(70_444_000) - .saturating_add(Weight::from_proof_size(20489)) + Weight::from_parts(70_444_000, 0) + .saturating_add(Weight::from_parts(0, 20489)) .saturating_add(T::DbWeight::get().reads(9_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -523,8 +523,8 @@ impl WeightInfo for SubstrateWeight { // Measured: `542` // Estimated: `5228` // Minimum execution time: 15_112 nanoseconds. - Weight::from_ref_time(15_897_000) - .saturating_add(Weight::from_proof_size(5228)) + Weight::from_parts(15_897_000, 0) + .saturating_add(Weight::from_parts(0, 5228)) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -563,8 +563,8 @@ impl WeightInfo for () { // Measured: `3573` // Estimated: `37988` // Minimum execution time: 169_857 nanoseconds. - Weight::from_ref_time(173_895_000) - .saturating_add(Weight::from_proof_size(37988)) + Weight::from_parts(173_895_000, 0) + .saturating_add(Weight::from_parts(0, 37988)) .saturating_add(RocksDbWeight::get().reads(17_u64)) .saturating_add(RocksDbWeight::get().writes(12_u64)) } @@ -591,8 +591,8 @@ impl WeightInfo for () { // Measured: `3615` // Estimated: `38583` // Minimum execution time: 167_372 nanoseconds. - Weight::from_ref_time(168_776_000) - .saturating_add(Weight::from_proof_size(38583)) + Weight::from_parts(168_776_000, 0) + .saturating_add(Weight::from_parts(0, 38583)) .saturating_add(RocksDbWeight::get().reads(14_u64)) .saturating_add(RocksDbWeight::get().writes(12_u64)) } @@ -621,8 +621,8 @@ impl WeightInfo for () { // Measured: `3680` // Estimated: `41099` // Minimum execution time: 186_346 nanoseconds. - Weight::from_ref_time(191_308_000) - .saturating_add(Weight::from_proof_size(41099)) + Weight::from_parts(191_308_000, 0) + .saturating_add(Weight::from_parts(0, 41099)) .saturating_add(RocksDbWeight::get().reads(15_u64)) .saturating_add(RocksDbWeight::get().writes(13_u64)) } @@ -641,8 +641,8 @@ impl WeightInfo for () { // Measured: `1254` // Estimated: `13005` // Minimum execution time: 61_423 nanoseconds. - Weight::from_ref_time(63_219_000) - .saturating_add(Weight::from_proof_size(13005)) + Weight::from_parts(63_219_000, 0) + .saturating_add(Weight::from_parts(0, 13005)) .saturating_add(RocksDbWeight::get().reads(5_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) } @@ -681,8 +681,8 @@ impl WeightInfo for () { // Measured: `3858` // Estimated: `67379` // Minimum execution time: 174_532 nanoseconds. - Weight::from_ref_time(180_032_000) - .saturating_add(Weight::from_proof_size(67379)) + Weight::from_parts(180_032_000, 0) + .saturating_add(Weight::from_parts(0, 67379)) .saturating_add(RocksDbWeight::get().reads(18_u64)) .saturating_add(RocksDbWeight::get().writes(14_u64)) } @@ -702,10 +702,10 @@ impl WeightInfo for () { // Measured: `1779` // Estimated: `13025` // Minimum execution time: 55_327 nanoseconds. - Weight::from_ref_time(58_947_746) - .saturating_add(Weight::from_proof_size(13025)) + Weight::from_parts(58_947_746, 0) + .saturating_add(Weight::from_parts(0, 13025)) // Standard Error: 1_589 - .saturating_add(Weight::from_ref_time(40_696).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(40_696, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(5_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -733,10 +733,10 @@ impl WeightInfo for () { // Measured: `2303` // Estimated: `45696` // Minimum execution time: 105_923 nanoseconds. - Weight::from_ref_time(110_572_476) - .saturating_add(Weight::from_proof_size(45696)) + Weight::from_parts(110_572_476, 0) + .saturating_add(Weight::from_parts(0, 45696)) // Standard Error: 2_438 - .saturating_add(Weight::from_ref_time(69_045).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(69_045, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(9_u64)) .saturating_add(RocksDbWeight::get().writes(7_u64)) } @@ -786,8 +786,8 @@ impl WeightInfo for () { // Measured: `2690` // Estimated: `68812` // Minimum execution time: 169_700 nanoseconds. - Weight::from_ref_time(178_693_541) - .saturating_add(Weight::from_proof_size(68812)) + Weight::from_parts(178_693_541, 0) + .saturating_add(Weight::from_parts(0, 68812)) .saturating_add(RocksDbWeight::get().reads(20_u64)) .saturating_add(RocksDbWeight::get().writes(17_u64)) } @@ -838,8 +838,8 @@ impl WeightInfo for () { // Measured: `1321` // Estimated: `31522` // Minimum execution time: 145_976 nanoseconds. - Weight::from_ref_time(150_664_000) - .saturating_add(Weight::from_proof_size(31522)) + Weight::from_parts(150_664_000, 0) + .saturating_add(Weight::from_parts(0, 31522)) .saturating_add(RocksDbWeight::get().reads(21_u64)) .saturating_add(RocksDbWeight::get().writes(15_u64)) } @@ -873,14 +873,14 @@ impl WeightInfo for () { // Measured: `1909` // Estimated: `21998 + n * (2520 ±0)` // Minimum execution time: 69_288 nanoseconds. - Weight::from_ref_time(71_075_293) - .saturating_add(Weight::from_proof_size(21998)) + Weight::from_parts(71_075_293, 0) + .saturating_add(Weight::from_parts(0, 21998)) // Standard Error: 10_508 - .saturating_add(Weight::from_ref_time(1_384_674).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(1_384_674, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(12_u64)) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(n.into()))) .saturating_add(RocksDbWeight::get().writes(5_u64)) - .saturating_add(Weight::from_proof_size(2520).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 2520).saturating_mul(n.into())) } /// Storage: NominationPools BondedPools (r:1 w:1) /// Proof: NominationPools BondedPools (max_values: None, max_size: Some(164), added: 2639, mode: MaxEncodedLen) @@ -893,8 +893,8 @@ impl WeightInfo for () { // Measured: `1498` // Estimated: `8752` // Minimum execution time: 36_410 nanoseconds. - Weight::from_ref_time(37_585_000) - .saturating_add(Weight::from_proof_size(8752)) + Weight::from_parts(37_585_000, 0) + .saturating_add(Weight::from_parts(0, 8752)) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -910,10 +910,10 @@ impl WeightInfo for () { // Measured: `559` // Estimated: `5883` // Minimum execution time: 14_322 nanoseconds. - Weight::from_ref_time(15_328_204) - .saturating_add(Weight::from_proof_size(5883)) + Weight::from_parts(15_328_204, 0) + .saturating_add(Weight::from_parts(0, 5883)) // Standard Error: 161 - .saturating_add(Weight::from_ref_time(1_406).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(1_406, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -932,8 +932,8 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 5_968 nanoseconds. - Weight::from_ref_time(6_245_000) - .saturating_add(Weight::from_proof_size(0)) + Weight::from_parts(6_245_000, 0) + .saturating_add(Weight::from_parts(0, 0)) .saturating_add(RocksDbWeight::get().writes(5_u64)) } /// Storage: NominationPools BondedPools (r:1 w:1) @@ -943,8 +943,8 @@ impl WeightInfo for () { // Measured: `559` // Estimated: `2639` // Minimum execution time: 18_979 nanoseconds. - Weight::from_ref_time(19_795_000) - .saturating_add(Weight::from_proof_size(2639)) + Weight::from_parts(19_795_000, 0) + .saturating_add(Weight::from_parts(0, 2639)) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -971,8 +971,8 @@ impl WeightInfo for () { // Measured: `2136` // Estimated: `20489` // Minimum execution time: 68_145 nanoseconds. - Weight::from_ref_time(70_444_000) - .saturating_add(Weight::from_proof_size(20489)) + Weight::from_parts(70_444_000, 0) + .saturating_add(Weight::from_parts(0, 20489)) .saturating_add(RocksDbWeight::get().reads(9_u64)) .saturating_add(RocksDbWeight::get().writes(5_u64)) } @@ -985,8 +985,8 @@ impl WeightInfo for () { // Measured: `542` // Estimated: `5228` // Minimum execution time: 15_112 nanoseconds. - Weight::from_ref_time(15_897_000) - .saturating_add(Weight::from_proof_size(5228)) + Weight::from_parts(15_897_000, 0) + .saturating_add(Weight::from_parts(0, 5228)) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } diff --git a/frame/preimage/src/weights.rs b/frame/preimage/src/weights.rs index 7d181be01b742..fa6bdc972fa47 100644 --- a/frame/preimage/src/weights.rs +++ b/frame/preimage/src/weights.rs @@ -77,7 +77,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 23_484 nanoseconds. Weight::from_parts(23_828_000, 2566) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_705).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(1_705, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -93,7 +93,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 14_812 nanoseconds. Weight::from_parts(14_949_000, 2566) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_707).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(1_707, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -109,7 +109,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 14_185 nanoseconds. Weight::from_parts(14_398_000, 2566) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_709).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(1_709, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -234,7 +234,7 @@ impl WeightInfo for () { // Minimum execution time: 23_484 nanoseconds. Weight::from_parts(23_828_000, 2566) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_705).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(1_705, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -250,7 +250,7 @@ impl WeightInfo for () { // Minimum execution time: 14_812 nanoseconds. Weight::from_parts(14_949_000, 2566) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_707).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(1_707, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -266,7 +266,7 @@ impl WeightInfo for () { // Minimum execution time: 14_185 nanoseconds. Weight::from_parts(14_398_000, 2566) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_709).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(1_709, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } diff --git a/frame/proxy/src/weights.rs b/frame/proxy/src/weights.rs index 5e85e148a0397..5b70b61e569b4 100644 --- a/frame/proxy/src/weights.rs +++ b/frame/proxy/src/weights.rs @@ -73,7 +73,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 14_461 nanoseconds. Weight::from_parts(14_913_927, 3716) // Standard Error: 1_174 - .saturating_add(Weight::from_ref_time(36_087).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(36_087, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) } /// Storage: Proxy Proxies (r:1 w:0) @@ -91,9 +91,9 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 31_523 nanoseconds. Weight::from_parts(31_116_270, 11027) // Standard Error: 1_789 - .saturating_add(Weight::from_ref_time(135_656).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(135_656, 0).saturating_mul(a.into())) // Standard Error: 1_849 - .saturating_add(Weight::from_ref_time(53_893).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(53_893, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -110,9 +110,9 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 19_363 nanoseconds. Weight::from_parts(20_282_191, 7311) // Standard Error: 1_084 - .saturating_add(Weight::from_ref_time(133_825).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(133_825, 0).saturating_mul(a.into())) // Standard Error: 1_120 - .saturating_add(Weight::from_ref_time(3_434).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(3_434, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -129,9 +129,9 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 19_363 nanoseconds. Weight::from_parts(20_211_584, 7311) // Standard Error: 1_171 - .saturating_add(Weight::from_ref_time(136_984).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(136_984, 0).saturating_mul(a.into())) // Standard Error: 1_210 - .saturating_add(Weight::from_ref_time(3_686).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(3_686, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -150,9 +150,9 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 27_811 nanoseconds. Weight::from_parts(27_965_813, 11027) // Standard Error: 1_987 - .saturating_add(Weight::from_ref_time(124_133).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(124_133, 0).saturating_mul(a.into())) // Standard Error: 2_053 - .saturating_add(Weight::from_ref_time(54_692).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(54_692, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -166,7 +166,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 20_922 nanoseconds. Weight::from_parts(21_551_797, 3716) // Standard Error: 1_425 - .saturating_add(Weight::from_ref_time(58_434).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(58_434, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -180,7 +180,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 20_812 nanoseconds. Weight::from_parts(21_660_732, 3716) // Standard Error: 1_438 - .saturating_add(Weight::from_ref_time(68_740).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(68_740, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -194,7 +194,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 16_786 nanoseconds. Weight::from_parts(17_249_958, 3716) // Standard Error: 1_007 - .saturating_add(Weight::from_ref_time(37_546).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(37_546, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -208,7 +208,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 22_764 nanoseconds. Weight::from_parts(23_539_039, 3716) // Standard Error: 814 - .saturating_add(Weight::from_ref_time(144).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(144, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -222,7 +222,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 17_720 nanoseconds. Weight::from_parts(18_428_849, 3716) // Standard Error: 1_093 - .saturating_add(Weight::from_ref_time(34_600).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(34_600, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -240,7 +240,7 @@ impl WeightInfo for () { // Minimum execution time: 14_461 nanoseconds. Weight::from_parts(14_913_927, 3716) // Standard Error: 1_174 - .saturating_add(Weight::from_ref_time(36_087).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(36_087, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) } /// Storage: Proxy Proxies (r:1 w:0) @@ -258,9 +258,9 @@ impl WeightInfo for () { // Minimum execution time: 31_523 nanoseconds. Weight::from_parts(31_116_270, 11027) // Standard Error: 1_789 - .saturating_add(Weight::from_ref_time(135_656).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(135_656, 0).saturating_mul(a.into())) // Standard Error: 1_849 - .saturating_add(Weight::from_ref_time(53_893).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(53_893, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -277,9 +277,9 @@ impl WeightInfo for () { // Minimum execution time: 19_363 nanoseconds. Weight::from_parts(20_282_191, 7311) // Standard Error: 1_084 - .saturating_add(Weight::from_ref_time(133_825).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(133_825, 0).saturating_mul(a.into())) // Standard Error: 1_120 - .saturating_add(Weight::from_ref_time(3_434).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(3_434, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -296,9 +296,9 @@ impl WeightInfo for () { // Minimum execution time: 19_363 nanoseconds. Weight::from_parts(20_211_584, 7311) // Standard Error: 1_171 - .saturating_add(Weight::from_ref_time(136_984).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(136_984, 0).saturating_mul(a.into())) // Standard Error: 1_210 - .saturating_add(Weight::from_ref_time(3_686).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(3_686, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -317,9 +317,9 @@ impl WeightInfo for () { // Minimum execution time: 27_811 nanoseconds. Weight::from_parts(27_965_813, 11027) // Standard Error: 1_987 - .saturating_add(Weight::from_ref_time(124_133).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(124_133, 0).saturating_mul(a.into())) // Standard Error: 2_053 - .saturating_add(Weight::from_ref_time(54_692).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(54_692, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -333,7 +333,7 @@ impl WeightInfo for () { // Minimum execution time: 20_922 nanoseconds. Weight::from_parts(21_551_797, 3716) // Standard Error: 1_425 - .saturating_add(Weight::from_ref_time(58_434).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(58_434, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -347,7 +347,7 @@ impl WeightInfo for () { // Minimum execution time: 20_812 nanoseconds. Weight::from_parts(21_660_732, 3716) // Standard Error: 1_438 - .saturating_add(Weight::from_ref_time(68_740).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(68_740, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -361,7 +361,7 @@ impl WeightInfo for () { // Minimum execution time: 16_786 nanoseconds. Weight::from_parts(17_249_958, 3716) // Standard Error: 1_007 - .saturating_add(Weight::from_ref_time(37_546).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(37_546, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -375,7 +375,7 @@ impl WeightInfo for () { // Minimum execution time: 22_764 nanoseconds. Weight::from_parts(23_539_039, 3716) // Standard Error: 814 - .saturating_add(Weight::from_ref_time(144).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(144, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -389,7 +389,7 @@ impl WeightInfo for () { // Minimum execution time: 17_720 nanoseconds. Weight::from_parts(18_428_849, 3716) // Standard Error: 1_093 - .saturating_add(Weight::from_ref_time(34_600).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(34_600, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } diff --git a/frame/ranked-collective/src/weights.rs b/frame/ranked-collective/src/weights.rs index 1f50441aabe36..8d6c1620d81f8 100644 --- a/frame/ranked-collective/src/weights.rs +++ b/frame/ranked-collective/src/weights.rs @@ -92,12 +92,12 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 26_177 nanoseconds. Weight::from_parts(29_245_248, 10064) // Standard Error: 18_611 - .saturating_add(Weight::from_ref_time(10_916_516).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(10_916_516, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(4_u64)) .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(7547).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 7547).saturating_mul(r.into())) } /// Storage: RankedCollective Members (r:1 w:1) /// Proof: RankedCollective Members (max_values: None, max_size: Some(42), added: 2517, mode: MaxEncodedLen) @@ -115,7 +115,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 18_953 nanoseconds. Weight::from_parts(19_570_567, 5006) // Standard Error: 4_156 - .saturating_add(Weight::from_ref_time(263_843).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(263_843, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -135,7 +135,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 26_243 nanoseconds. Weight::from_parts(28_532_816, 10064) // Standard Error: 22_689 - .saturating_add(Weight::from_ref_time(614_464).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(614_464, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -170,7 +170,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 13_245 nanoseconds. Weight::from_parts(17_420_271, 5394) // Standard Error: 1_503 - .saturating_add(Weight::from_ref_time(952_500).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(952_500, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into()))) } @@ -211,12 +211,12 @@ impl WeightInfo for () { // Minimum execution time: 26_177 nanoseconds. Weight::from_parts(29_245_248, 10064) // Standard Error: 18_611 - .saturating_add(Weight::from_ref_time(10_916_516).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(10_916_516, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(4_u64)) .saturating_add(RocksDbWeight::get().reads((3_u64).saturating_mul(r.into()))) .saturating_add(RocksDbWeight::get().writes(4_u64)) .saturating_add(RocksDbWeight::get().writes((3_u64).saturating_mul(r.into()))) - .saturating_add(Weight::from_proof_size(7547).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 7547).saturating_mul(r.into())) } /// Storage: RankedCollective Members (r:1 w:1) /// Proof: RankedCollective Members (max_values: None, max_size: Some(42), added: 2517, mode: MaxEncodedLen) @@ -234,7 +234,7 @@ impl WeightInfo for () { // Minimum execution time: 18_953 nanoseconds. Weight::from_parts(19_570_567, 5006) // Standard Error: 4_156 - .saturating_add(Weight::from_ref_time(263_843).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(263_843, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) } @@ -254,7 +254,7 @@ impl WeightInfo for () { // Minimum execution time: 26_243 nanoseconds. Weight::from_parts(28_532_816, 10064) // Standard Error: 22_689 - .saturating_add(Weight::from_ref_time(614_464).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(614_464, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(4_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) } @@ -289,7 +289,7 @@ impl WeightInfo for () { // Minimum execution time: 13_245 nanoseconds. Weight::from_parts(17_420_271, 5394) // Standard Error: 1_503 - .saturating_add(Weight::from_ref_time(952_500).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(952_500, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(n.into()))) } diff --git a/frame/recovery/src/weights.rs b/frame/recovery/src/weights.rs index 7a67c716fafc6..6f8818f819bad 100644 --- a/frame/recovery/src/weights.rs +++ b/frame/recovery/src/weights.rs @@ -79,7 +79,7 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 8_893 nanoseconds. - Weight::from_ref_time(9_177_000) + Weight::from_parts(9_177_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Recovery Recoverable (r:1 w:1) @@ -92,7 +92,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 20_662 nanoseconds. Weight::from_parts(21_378_064, 2826) // Standard Error: 3_350 - .saturating_add(Weight::from_ref_time(83_738).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(83_738, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -121,7 +121,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 17_837 nanoseconds. Weight::from_parts(18_429_664, 5690) // Standard Error: 3_187 - .saturating_add(Weight::from_ref_time(143_648).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(143_648, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -139,7 +139,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 21_960 nanoseconds. Weight::from_parts(22_529_644, 8245) // Standard Error: 2_945 - .saturating_add(Weight::from_ref_time(85_604).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(85_604, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -155,7 +155,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 26_054 nanoseconds. Weight::from_parts(26_724_866, 5467) // Standard Error: 2_645 - .saturating_add(Weight::from_ref_time(104_301).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(104_301, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -171,7 +171,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 25_110 nanoseconds. Weight::from_parts(25_805_837, 5690) // Standard Error: 2_732 - .saturating_add(Weight::from_ref_time(73_458).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(73_458, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -207,7 +207,7 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 8_893 nanoseconds. - Weight::from_ref_time(9_177_000) + Weight::from_parts(9_177_000, 0) .saturating_add(RocksDbWeight::get().writes(1_u64)) } /// Storage: Recovery Recoverable (r:1 w:1) @@ -220,7 +220,7 @@ impl WeightInfo for () { // Minimum execution time: 20_662 nanoseconds. Weight::from_parts(21_378_064, 2826) // Standard Error: 3_350 - .saturating_add(Weight::from_ref_time(83_738).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(83_738, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -249,7 +249,7 @@ impl WeightInfo for () { // Minimum execution time: 17_837 nanoseconds. Weight::from_parts(18_429_664, 5690) // Standard Error: 3_187 - .saturating_add(Weight::from_ref_time(143_648).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(143_648, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -267,7 +267,7 @@ impl WeightInfo for () { // Minimum execution time: 21_960 nanoseconds. Weight::from_parts(22_529_644, 8245) // Standard Error: 2_945 - .saturating_add(Weight::from_ref_time(85_604).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(85_604, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -283,7 +283,7 @@ impl WeightInfo for () { // Minimum execution time: 26_054 nanoseconds. Weight::from_parts(26_724_866, 5467) // Standard Error: 2_645 - .saturating_add(Weight::from_ref_time(104_301).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(104_301, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -299,7 +299,7 @@ impl WeightInfo for () { // Minimum execution time: 25_110 nanoseconds. Weight::from_parts(25_805_837, 5690) // Standard Error: 2_732 - .saturating_add(Weight::from_ref_time(73_458).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(73_458, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } diff --git a/frame/remark/src/weights.rs b/frame/remark/src/weights.rs index 0e18e10c69561..f9fcb73803716 100644 --- a/frame/remark/src/weights.rs +++ b/frame/remark/src/weights.rs @@ -60,9 +60,9 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 8_404 nanoseconds. - Weight::from_ref_time(343_031) + Weight::from_parts(343_031, 0) // Standard Error: 1 - .saturating_add(Weight::from_ref_time(1_404).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(1_404, 0).saturating_mul(l.into())) } } @@ -74,8 +74,8 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 8_404 nanoseconds. - Weight::from_ref_time(343_031) + Weight::from_parts(343_031, 0) // Standard Error: 1 - .saturating_add(Weight::from_ref_time(1_404).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(1_404, 0).saturating_mul(l.into())) } } diff --git a/frame/scheduler/src/mock.rs b/frame/scheduler/src/mock.rs index 5a2328971964f..914a97ab9d5d7 100644 --- a/frame/scheduler/src/mock.rs +++ b/frame/scheduler/src/mock.rs @@ -121,7 +121,7 @@ impl Contains for BaseFilter { parameter_types! { pub BlockWeights: frame_system::limits::BlockWeights = frame_system::limits::BlockWeights::simple_max( - Weight::from_ref_time(2_000_000_000_000).set_proof_size(u64::MAX), + Weight::from_parts(2_000_000_000_000, u64::MAX), ); } impl system::Config for Test { @@ -169,40 +169,40 @@ impl pallet_preimage::Config for Test { pub struct TestWeightInfo; impl WeightInfo for TestWeightInfo { fn service_agendas_base() -> Weight { - Weight::from_ref_time(0b0000_0001) + Weight::from_parts(0b0000_0001, 0) } fn service_agenda_base(i: u32) -> Weight { - Weight::from_ref_time((i << 8) as u64 + 0b0000_0010) + Weight::from_parts((i << 8) as u64 + 0b0000_0010, 0) } fn service_task_base() -> Weight { - Weight::from_ref_time(0b0000_0100) + Weight::from_parts(0b0000_0100, 0) } fn service_task_periodic() -> Weight { - Weight::from_ref_time(0b0000_1100) + Weight::from_parts(0b0000_1100, 0) } fn service_task_named() -> Weight { - Weight::from_ref_time(0b0001_0100) + Weight::from_parts(0b0001_0100, 0) } fn service_task_fetched(s: u32) -> Weight { - Weight::from_ref_time((s << 8) as u64 + 0b0010_0100) + Weight::from_parts((s << 8) as u64 + 0b0010_0100, 0) } fn execute_dispatch_signed() -> Weight { - Weight::from_ref_time(0b0100_0000) + Weight::from_parts(0b0100_0000, 0) } fn execute_dispatch_unsigned() -> Weight { - Weight::from_ref_time(0b1000_0000) + Weight::from_parts(0b1000_0000, 0) } fn schedule(_s: u32) -> Weight { - Weight::from_ref_time(50) + Weight::from_parts(50, 0) } fn cancel(_s: u32) -> Weight { - Weight::from_ref_time(50) + Weight::from_parts(50, 0) } fn schedule_named(_s: u32) -> Weight { - Weight::from_ref_time(50) + Weight::from_parts(50, 0) } fn cancel_named(_s: u32) -> Weight { - Weight::from_ref_time(50) + Weight::from_parts(50, 0) } } parameter_types! { diff --git a/frame/scheduler/src/tests.rs b/frame/scheduler/src/tests.rs index 258e6a281dfa9..a0cac897d43df 100644 --- a/frame/scheduler/src/tests.rs +++ b/frame/scheduler/src/tests.rs @@ -33,7 +33,7 @@ use substrate_test_utils::assert_eq_uvec; fn basic_scheduling_works() { new_test_ext().execute_with(|| { let call = - RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) }); + RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(10, 0) }); assert!(!::BaseCallFilter::contains(&call)); assert_ok!(Scheduler::do_schedule( DispatchTime::At(4), @@ -55,7 +55,7 @@ fn basic_scheduling_works() { fn scheduling_with_preimages_works() { new_test_ext().execute_with(|| { let call = - RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) }); + RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(10, 0) }); let hash = ::Hashing::hash_of(&call); let len = call.using_encoded(|x| x.len()) as u32; // Important to use here `Bounded::Lookup` to ensure that we request the hash. @@ -79,7 +79,7 @@ fn schedule_after_works() { new_test_ext().execute_with(|| { run_to_block(2); let call = - RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) }); + RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(10, 0) }); assert!(!::BaseCallFilter::contains(&call)); // This will schedule the call 3 blocks after the next block... so block 3 + 3 = 6 assert_ok!(Scheduler::do_schedule( @@ -103,7 +103,7 @@ fn schedule_after_zero_works() { new_test_ext().execute_with(|| { run_to_block(2); let call = - RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) }); + RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(10, 0) }); assert!(!::BaseCallFilter::contains(&call)); assert_ok!(Scheduler::do_schedule( DispatchTime::After(0), @@ -131,7 +131,7 @@ fn periodic_scheduling_works() { root(), Preimage::bound(RuntimeCall::Logger(logger::Call::log { i: 42, - weight: Weight::from_ref_time(10) + weight: Weight::from_parts(10, 0) })) .unwrap() )); @@ -156,7 +156,7 @@ fn periodic_scheduling_works() { fn reschedule_works() { new_test_ext().execute_with(|| { let call = - RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) }); + RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(10, 0) }); assert!(!::BaseCallFilter::contains(&call)); assert_eq!( Scheduler::do_schedule( @@ -195,7 +195,7 @@ fn reschedule_works() { fn reschedule_named_works() { new_test_ext().execute_with(|| { let call = - RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) }); + RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(10, 0) }); assert!(!::BaseCallFilter::contains(&call)); assert_eq!( Scheduler::do_schedule_named( @@ -235,7 +235,7 @@ fn reschedule_named_works() { fn reschedule_named_perodic_works() { new_test_ext().execute_with(|| { let call = - RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) }); + RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(10, 0) }); assert!(!::BaseCallFilter::contains(&call)); assert_eq!( Scheduler::do_schedule_named( @@ -293,7 +293,7 @@ fn cancel_named_scheduling_works_with_normal_cancel() { root(), Preimage::bound(RuntimeCall::Logger(LoggerCall::log { i: 69, - weight: Weight::from_ref_time(10), + weight: Weight::from_parts(10, 0), })) .unwrap(), ) @@ -305,7 +305,7 @@ fn cancel_named_scheduling_works_with_normal_cancel() { root(), Preimage::bound(RuntimeCall::Logger(LoggerCall::log { i: 42, - weight: Weight::from_ref_time(10), + weight: Weight::from_parts(10, 0), })) .unwrap(), ) @@ -331,7 +331,7 @@ fn cancel_named_periodic_scheduling_works() { root(), Preimage::bound(RuntimeCall::Logger(LoggerCall::log { i: 42, - weight: Weight::from_ref_time(10), + weight: Weight::from_parts(10, 0), })) .unwrap(), ) @@ -345,7 +345,7 @@ fn cancel_named_periodic_scheduling_works() { root(), Preimage::bound(RuntimeCall::Logger(LoggerCall::log { i: 69, - weight: Weight::from_ref_time(10) + weight: Weight::from_parts(10, 0) })) .unwrap(), ) @@ -359,7 +359,7 @@ fn cancel_named_periodic_scheduling_works() { root(), Preimage::bound(RuntimeCall::Logger(LoggerCall::log { i: 69, - weight: Weight::from_ref_time(10), + weight: Weight::from_parts(10, 0), })) .unwrap(), ) @@ -581,12 +581,12 @@ fn scheduler_respects_priority_ordering_with_soft_deadlines() { #[test] fn on_initialize_weight_is_correct() { new_test_ext().execute_with(|| { - let call_weight = Weight::from_ref_time(25); + let call_weight = Weight::from_parts(25, 0); // Named let call = RuntimeCall::Logger(LoggerCall::log { i: 3, - weight: call_weight + Weight::from_ref_time(1), + weight: call_weight + Weight::from_parts(1, 0), }); assert_ok!(Scheduler::do_schedule_named( [1u8; 32], @@ -598,7 +598,7 @@ fn on_initialize_weight_is_correct() { )); let call = RuntimeCall::Logger(LoggerCall::log { i: 42, - weight: call_weight + Weight::from_ref_time(2), + weight: call_weight + Weight::from_parts(2, 0), }); // Anon Periodic assert_ok!(Scheduler::do_schedule( @@ -610,7 +610,7 @@ fn on_initialize_weight_is_correct() { )); let call = RuntimeCall::Logger(LoggerCall::log { i: 69, - weight: call_weight + Weight::from_ref_time(3), + weight: call_weight + Weight::from_parts(3, 0), }); // Anon assert_ok!(Scheduler::do_schedule( @@ -623,7 +623,7 @@ fn on_initialize_weight_is_correct() { // Named Periodic let call = RuntimeCall::Logger(LoggerCall::log { i: 2600, - weight: call_weight + Weight::from_ref_time(4), + weight: call_weight + Weight::from_parts(4, 0), }); assert_ok!(Scheduler::do_schedule_named( [2u8; 32], @@ -641,7 +641,7 @@ fn on_initialize_weight_is_correct() { TestWeightInfo::service_agenda_base(1) + ::service_task(None, true, true) + TestWeightInfo::execute_dispatch_unsigned() + - call_weight + Weight::from_ref_time(4) + call_weight + Weight::from_parts(4, 0) ); assert_eq!(IncompleteSince::::get(), None); assert_eq!(logger::log(), vec![(root(), 2600u32)]); @@ -653,10 +653,10 @@ fn on_initialize_weight_is_correct() { TestWeightInfo::service_agenda_base(2) + ::service_task(None, false, true) + TestWeightInfo::execute_dispatch_unsigned() + - call_weight + Weight::from_ref_time(3) + + call_weight + Weight::from_parts(3, 0) + ::service_task(None, false, false) + TestWeightInfo::execute_dispatch_unsigned() + - call_weight + Weight::from_ref_time(2) + call_weight + Weight::from_parts(2, 0) ); assert_eq!(IncompleteSince::::get(), None); assert_eq!(logger::log(), vec![(root(), 2600u32), (root(), 69u32), (root(), 42u32)]); @@ -668,7 +668,7 @@ fn on_initialize_weight_is_correct() { TestWeightInfo::service_agenda_base(1) + ::service_task(None, true, false) + TestWeightInfo::execute_dispatch_unsigned() + - call_weight + Weight::from_ref_time(1) + call_weight + Weight::from_parts(1, 0) ); assert_eq!(IncompleteSince::::get(), None); assert_eq!( @@ -690,11 +690,11 @@ fn root_calls_works() { new_test_ext().execute_with(|| { let call = Box::new(RuntimeCall::Logger(LoggerCall::log { i: 69, - weight: Weight::from_ref_time(10), + weight: Weight::from_parts(10, 0), })); let call2 = Box::new(RuntimeCall::Logger(LoggerCall::log { i: 42, - weight: Weight::from_ref_time(10), + weight: Weight::from_parts(10, 0), })); assert_ok!( Scheduler::schedule_named(RuntimeOrigin::root(), [1u8; 32], 4, None, 127, call,) @@ -719,15 +719,15 @@ fn fails_to_schedule_task_in_the_past() { let call1 = Box::new(RuntimeCall::Logger(LoggerCall::log { i: 69, - weight: Weight::from_ref_time(10), + weight: Weight::from_parts(10, 0), })); let call2 = Box::new(RuntimeCall::Logger(LoggerCall::log { i: 42, - weight: Weight::from_ref_time(10), + weight: Weight::from_parts(10, 0), })); let call3 = Box::new(RuntimeCall::Logger(LoggerCall::log { i: 42, - weight: Weight::from_ref_time(10), + weight: Weight::from_parts(10, 0), })); assert_noop!( @@ -752,11 +752,11 @@ fn should_use_origin() { new_test_ext().execute_with(|| { let call = Box::new(RuntimeCall::Logger(LoggerCall::log { i: 69, - weight: Weight::from_ref_time(10), + weight: Weight::from_parts(10, 0), })); let call2 = Box::new(RuntimeCall::Logger(LoggerCall::log { i: 42, - weight: Weight::from_ref_time(10), + weight: Weight::from_parts(10, 0), })); assert_ok!(Scheduler::schedule_named( system::RawOrigin::Signed(1).into(), @@ -784,11 +784,11 @@ fn should_check_origin() { new_test_ext().execute_with(|| { let call = Box::new(RuntimeCall::Logger(LoggerCall::log { i: 69, - weight: Weight::from_ref_time(10), + weight: Weight::from_parts(10, 0), })); let call2 = Box::new(RuntimeCall::Logger(LoggerCall::log { i: 42, - weight: Weight::from_ref_time(10), + weight: Weight::from_parts(10, 0), })); assert_noop!( Scheduler::schedule_named( @@ -813,11 +813,11 @@ fn should_check_origin_for_cancel() { new_test_ext().execute_with(|| { let call = Box::new(RuntimeCall::Logger(LoggerCall::log_without_filter { i: 69, - weight: Weight::from_ref_time(10), + weight: Weight::from_parts(10, 0), })); let call2 = Box::new(RuntimeCall::Logger(LoggerCall::log_without_filter { i: 42, - weight: Weight::from_ref_time(10), + weight: Weight::from_parts(10, 0), })); assert_ok!(Scheduler::schedule_named( system::RawOrigin::Signed(1).into(), @@ -861,7 +861,7 @@ fn migration_to_v4_works() { priority: i as u8 + 10, call: RuntimeCall::Logger(LoggerCall::log { i: 96, - weight: Weight::from_ref_time(100), + weight: Weight::from_parts(100, 0), }), maybe_periodic: None, }), @@ -871,7 +871,7 @@ fn migration_to_v4_works() { priority: 123, call: RuntimeCall::Logger(LoggerCall::log { i: 69, - weight: Weight::from_ref_time(10), + weight: Weight::from_parts(10, 0), }), maybe_periodic: Some((456u64, 10)), }), @@ -892,7 +892,7 @@ fn migration_to_v4_works() { priority: 10, call: Preimage::bound(RuntimeCall::Logger(LoggerCall::log { i: 96, - weight: Weight::from_ref_time(100), + weight: Weight::from_parts(100, 0), })) .unwrap(), maybe_periodic: None, @@ -905,7 +905,7 @@ fn migration_to_v4_works() { priority: 123, call: Preimage::bound(RuntimeCall::Logger(LoggerCall::log { i: 69, - weight: Weight::from_ref_time(10), + weight: Weight::from_parts(10, 0), })) .unwrap(), maybe_periodic: Some((456u64, 10)), @@ -922,7 +922,7 @@ fn migration_to_v4_works() { priority: 11, call: Preimage::bound(RuntimeCall::Logger(LoggerCall::log { i: 96, - weight: Weight::from_ref_time(100), + weight: Weight::from_parts(100, 0), })) .unwrap(), maybe_periodic: None, @@ -935,7 +935,7 @@ fn migration_to_v4_works() { priority: 123, call: Preimage::bound(RuntimeCall::Logger(LoggerCall::log { i: 69, - weight: Weight::from_ref_time(10), + weight: Weight::from_parts(10, 0), })) .unwrap(), maybe_periodic: Some((456u64, 10)), @@ -952,7 +952,7 @@ fn migration_to_v4_works() { priority: 12, call: Preimage::bound(RuntimeCall::Logger(LoggerCall::log { i: 96, - weight: Weight::from_ref_time(100), + weight: Weight::from_parts(100, 0), })) .unwrap(), maybe_periodic: None, @@ -965,7 +965,7 @@ fn migration_to_v4_works() { priority: 123, call: Preimage::bound(RuntimeCall::Logger(LoggerCall::log { i: 69, - weight: Weight::from_ref_time(10), + weight: Weight::from_parts(10, 0), })) .unwrap(), maybe_periodic: Some((456u64, 10)), @@ -998,7 +998,7 @@ fn test_migrate_origin() { priority: i as u8 + 10, call: Preimage::bound(RuntimeCall::Logger(LoggerCall::log { i: 96, - weight: Weight::from_ref_time(100), + weight: Weight::from_parts(100, 0), })) .unwrap(), origin: 3u32, @@ -1012,7 +1012,7 @@ fn test_migrate_origin() { origin: 2u32, call: Preimage::bound(RuntimeCall::Logger(LoggerCall::log { i: 69, - weight: Weight::from_ref_time(10), + weight: Weight::from_parts(10, 0), })) .unwrap(), maybe_periodic: Some((456u64, 10)), @@ -1045,7 +1045,7 @@ fn test_migrate_origin() { priority: 10, call: Preimage::bound(RuntimeCall::Logger(LoggerCall::log { i: 96, - weight: Weight::from_ref_time(100) + weight: Weight::from_parts(100, 0) })) .unwrap(), maybe_periodic: None, @@ -1058,7 +1058,7 @@ fn test_migrate_origin() { priority: 123, call: Preimage::bound(RuntimeCall::Logger(LoggerCall::log { i: 69, - weight: Weight::from_ref_time(10) + weight: Weight::from_parts(10, 0) })) .unwrap(), maybe_periodic: Some((456u64, 10)), @@ -1075,7 +1075,7 @@ fn test_migrate_origin() { priority: 11, call: Preimage::bound(RuntimeCall::Logger(LoggerCall::log { i: 96, - weight: Weight::from_ref_time(100) + weight: Weight::from_parts(100, 0) })) .unwrap(), maybe_periodic: None, @@ -1088,7 +1088,7 @@ fn test_migrate_origin() { priority: 123, call: Preimage::bound(RuntimeCall::Logger(LoggerCall::log { i: 69, - weight: Weight::from_ref_time(10) + weight: Weight::from_parts(10, 0) })) .unwrap(), maybe_periodic: Some((456u64, 10)), @@ -1105,7 +1105,7 @@ fn test_migrate_origin() { priority: 12, call: Preimage::bound(RuntimeCall::Logger(LoggerCall::log { i: 96, - weight: Weight::from_ref_time(100) + weight: Weight::from_parts(100, 0) })) .unwrap(), maybe_periodic: None, @@ -1118,7 +1118,7 @@ fn test_migrate_origin() { priority: 123, call: Preimage::bound(RuntimeCall::Logger(LoggerCall::log { i: 69, - weight: Weight::from_ref_time(10) + weight: Weight::from_parts(10, 0) })) .unwrap(), maybe_periodic: Some((456u64, 10)), @@ -1136,7 +1136,7 @@ fn test_migrate_origin() { fn postponed_named_task_cannot_be_rescheduled() { new_test_ext().execute_with(|| { let call = - RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(1000) }); + RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(1000, 0) }); let hash = ::Hashing::hash_of(&call); let len = call.using_encoded(|x| x.len()) as u32; // Important to use here `Bounded::Lookup` to ensure that we request the hash. @@ -1204,7 +1204,7 @@ fn scheduler_v3_anon_basic_works() { use frame_support::traits::schedule::v3::Anon; new_test_ext().execute_with(|| { let call = - RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) }); + RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(10, 0) }); // Schedule a call. let _address = >::schedule( @@ -1233,7 +1233,7 @@ fn scheduler_v3_anon_cancel_works() { use frame_support::traits::schedule::v3::Anon; new_test_ext().execute_with(|| { let call = - RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) }); + RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(10, 0) }); let bound = Preimage::bound(call).unwrap(); // Schedule a call. @@ -1260,7 +1260,7 @@ fn scheduler_v3_anon_reschedule_works() { use frame_support::traits::schedule::v3::Anon; new_test_ext().execute_with(|| { let call = - RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) }); + RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(10, 0) }); // Schedule a call. let address = >::schedule( @@ -1307,7 +1307,7 @@ fn scheduler_v3_anon_next_schedule_time_works() { use frame_support::traits::schedule::v3::Anon; new_test_ext().execute_with(|| { let call = - RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) }); + RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(10, 0) }); let bound = Preimage::bound(call).unwrap(); // Schedule a call. @@ -1344,7 +1344,7 @@ fn scheduler_v3_anon_reschedule_and_next_schedule_time_work() { use frame_support::traits::schedule::v3::Anon; new_test_ext().execute_with(|| { let call = - RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) }); + RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(10, 0) }); let bound = Preimage::bound(call).unwrap(); // Schedule a call. @@ -1386,7 +1386,7 @@ fn scheduler_v3_anon_schedule_agenda_overflows() { new_test_ext().execute_with(|| { let call = - RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) }); + RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(10, 0) }); let bound = Preimage::bound(call).unwrap(); // Schedule the maximal number allowed per block. @@ -1422,7 +1422,7 @@ fn scheduler_v3_anon_cancel_and_schedule_fills_holes() { new_test_ext().execute_with(|| { let call = - RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) }); + RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(10, 0) }); let bound = Preimage::bound(call).unwrap(); let mut addrs = Vec::<_>::default(); @@ -1471,7 +1471,7 @@ fn scheduler_v3_anon_reschedule_fills_holes() { new_test_ext().execute_with(|| { let call = - RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) }); + RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(10, 0) }); let bound = Preimage::bound(call).unwrap(); let mut addrs = Vec::<_>::default(); @@ -1515,7 +1515,7 @@ fn scheduler_v3_named_basic_works() { new_test_ext().execute_with(|| { let call = - RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) }); + RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(10, 0) }); let name = [1u8; 32]; // Schedule a call. @@ -1547,7 +1547,7 @@ fn scheduler_v3_named_cancel_named_works() { use frame_support::traits::schedule::v3::Named; new_test_ext().execute_with(|| { let call = - RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) }); + RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(10, 0) }); let bound = Preimage::bound(call).unwrap(); let name = [1u8; 32]; @@ -1577,7 +1577,7 @@ fn scheduler_v3_named_cancel_without_name_works() { use frame_support::traits::schedule::v3::{Anon, Named}; new_test_ext().execute_with(|| { let call = - RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) }); + RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(10, 0) }); let bound = Preimage::bound(call).unwrap(); let name = [1u8; 32]; @@ -1607,7 +1607,7 @@ fn scheduler_v3_named_reschedule_named_works() { use frame_support::traits::schedule::v3::{Anon, Named}; new_test_ext().execute_with(|| { let call = - RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) }); + RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(10, 0) }); let name = [1u8; 32]; // Schedule a call. @@ -1666,7 +1666,7 @@ fn scheduler_v3_named_next_schedule_time_works() { use frame_support::traits::schedule::v3::{Anon, Named}; new_test_ext().execute_with(|| { let call = - RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) }); + RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(10, 0) }); let bound = Preimage::bound(call).unwrap(); let name = [1u8; 32]; @@ -1711,7 +1711,7 @@ fn cancel_last_task_removes_agenda() { new_test_ext().execute_with(|| { let when = 4; let call = - RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) }); + RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(10, 0) }); let address = Scheduler::do_schedule( DispatchTime::At(when), None, @@ -1745,7 +1745,7 @@ fn cancel_named_last_task_removes_agenda() { new_test_ext().execute_with(|| { let when = 4; let call = - RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) }); + RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(10, 0) }); Scheduler::do_schedule_named( [1u8; 32], DispatchTime::At(when), @@ -1781,7 +1781,7 @@ fn reschedule_last_task_removes_agenda() { new_test_ext().execute_with(|| { let when = 4; let call = - RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) }); + RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(10, 0) }); let address = Scheduler::do_schedule( DispatchTime::At(when), None, @@ -1818,7 +1818,7 @@ fn reschedule_named_last_task_removes_agenda() { new_test_ext().execute_with(|| { let when = 4; let call = - RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) }); + RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(10, 0) }); Scheduler::do_schedule_named( [1u8; 32], DispatchTime::At(when), diff --git a/frame/scheduler/src/weights.rs b/frame/scheduler/src/weights.rs index 6b786ef8b24dd..577e5b0bc4b2d 100644 --- a/frame/scheduler/src/weights.rs +++ b/frame/scheduler/src/weights.rs @@ -86,7 +86,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 3_079 nanoseconds. Weight::from_parts(7_087_647, 109497) // Standard Error: 658 - .saturating_add(Weight::from_ref_time(279_320).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(279_320, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -95,7 +95,7 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 5_192 nanoseconds. - Weight::from_ref_time(5_528_000) + Weight::from_parts(5_528_000, 0) } /// Storage: Preimage PreimageFor (r:1 w:1) /// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: Measured) @@ -109,10 +109,10 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 17_284 nanoseconds. Weight::from_parts(17_574_000, 5252) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_126).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(1_126, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) - .saturating_add(Weight::from_proof_size(1).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(0, 1).saturating_mul(s.into())) } /// Storage: Scheduler Lookup (r:0 w:1) /// Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen) @@ -121,7 +121,7 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 7_020 nanoseconds. - Weight::from_ref_time(7_262_000) + Weight::from_parts(7_262_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } fn service_task_periodic() -> Weight { @@ -129,21 +129,21 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 5_187 nanoseconds. - Weight::from_ref_time(5_368_000) + Weight::from_parts(5_368_000, 0) } fn execute_dispatch_signed() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` // Minimum execution time: 2_313 nanoseconds. - Weight::from_ref_time(2_404_000) + Weight::from_parts(2_404_000, 0) } fn execute_dispatch_unsigned() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` // Minimum execution time: 2_187 nanoseconds. - Weight::from_ref_time(2_362_000) + Weight::from_parts(2_362_000, 0) } /// Storage: Scheduler Agenda (r:1 w:1) /// Proof: Scheduler Agenda (max_values: None, max_size: Some(107022), added: 109497, mode: MaxEncodedLen) @@ -155,7 +155,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 11_971 nanoseconds. Weight::from_parts(16_060_361, 109497) // Standard Error: 665 - .saturating_add(Weight::from_ref_time(286_324).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(286_324, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -171,7 +171,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 15_594 nanoseconds. Weight::from_parts(17_191_501, 109497) // Standard Error: 626 - .saturating_add(Weight::from_ref_time(425_572).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(425_572, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -187,7 +187,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 15_127 nanoseconds. Weight::from_parts(20_932_642, 112020) // Standard Error: 692 - .saturating_add(Weight::from_ref_time(288_344).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(288_344, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -203,7 +203,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 16_859 nanoseconds. Weight::from_parts(19_736_937, 112020) // Standard Error: 676 - .saturating_add(Weight::from_ref_time(429_770).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(429_770, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -232,7 +232,7 @@ impl WeightInfo for () { // Minimum execution time: 3_079 nanoseconds. Weight::from_parts(7_087_647, 109497) // Standard Error: 658 - .saturating_add(Weight::from_ref_time(279_320).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(279_320, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -241,7 +241,7 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 5_192 nanoseconds. - Weight::from_ref_time(5_528_000) + Weight::from_parts(5_528_000, 0) } /// Storage: Preimage PreimageFor (r:1 w:1) /// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: Measured) @@ -255,10 +255,10 @@ impl WeightInfo for () { // Minimum execution time: 17_284 nanoseconds. Weight::from_parts(17_574_000, 5252) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_126).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(1_126, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) - .saturating_add(Weight::from_proof_size(1).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(0, 1).saturating_mul(s.into())) } /// Storage: Scheduler Lookup (r:0 w:1) /// Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen) @@ -267,7 +267,7 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 7_020 nanoseconds. - Weight::from_ref_time(7_262_000) + Weight::from_parts(7_262_000, 0) .saturating_add(RocksDbWeight::get().writes(1_u64)) } fn service_task_periodic() -> Weight { @@ -275,21 +275,21 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 5_187 nanoseconds. - Weight::from_ref_time(5_368_000) + Weight::from_parts(5_368_000, 0) } fn execute_dispatch_signed() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` // Minimum execution time: 2_313 nanoseconds. - Weight::from_ref_time(2_404_000) + Weight::from_parts(2_404_000, 0) } fn execute_dispatch_unsigned() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` // Minimum execution time: 2_187 nanoseconds. - Weight::from_ref_time(2_362_000) + Weight::from_parts(2_362_000, 0) } /// Storage: Scheduler Agenda (r:1 w:1) /// Proof: Scheduler Agenda (max_values: None, max_size: Some(107022), added: 109497, mode: MaxEncodedLen) @@ -301,7 +301,7 @@ impl WeightInfo for () { // Minimum execution time: 11_971 nanoseconds. Weight::from_parts(16_060_361, 109497) // Standard Error: 665 - .saturating_add(Weight::from_ref_time(286_324).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(286_324, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -317,7 +317,7 @@ impl WeightInfo for () { // Minimum execution time: 15_594 nanoseconds. Weight::from_parts(17_191_501, 109497) // Standard Error: 626 - .saturating_add(Weight::from_ref_time(425_572).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(425_572, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -333,7 +333,7 @@ impl WeightInfo for () { // Minimum execution time: 15_127 nanoseconds. Weight::from_parts(20_932_642, 112020) // Standard Error: 692 - .saturating_add(Weight::from_ref_time(288_344).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(288_344, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -349,7 +349,7 @@ impl WeightInfo for () { // Minimum execution time: 16_859 nanoseconds. Weight::from_parts(19_736_937, 112020) // Standard Error: 676 - .saturating_add(Weight::from_ref_time(429_770).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(429_770, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } diff --git a/frame/staking/src/pallet/impls.rs b/frame/staking/src/pallet/impls.rs index 99c2f6043ee2c..78c9a51bc829c 100644 --- a/frame/staking/src/pallet/impls.rs +++ b/frame/staking/src/pallet/impls.rs @@ -1267,7 +1267,7 @@ where disable_strategy: DisableStrategy, ) -> Weight { let reward_proportion = SlashRewardFraction::::get(); - let mut consumed_weight = Weight::from_ref_time(0); + let mut consumed_weight = Weight::from_parts(0, 0); let mut add_db_reads_writes = |reads, writes| { consumed_weight += T::DbWeight::get().reads_writes(reads, writes); }; diff --git a/frame/staking/src/weights.rs b/frame/staking/src/weights.rs index 2c9e1b2669c8b..d1814d89d4d89 100644 --- a/frame/staking/src/weights.rs +++ b/frame/staking/src/weights.rs @@ -164,7 +164,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 31_479 nanoseconds. Weight::from_parts(32_410_035, 10442) // Standard Error: 313 - .saturating_add(Weight::from_ref_time(9_090).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(9_090, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -204,11 +204,11 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 71_968 nanoseconds. Weight::from_parts(76_631_804, 32303) // Standard Error: 1_613 - .saturating_add(Weight::from_ref_time(1_058_968).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(1_058_968, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(13_u64)) .saturating_add(T::DbWeight::get().writes(12_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into()))) - .saturating_add(Weight::from_proof_size(4).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(0, 4).saturating_mul(s.into())) } /// Storage: Staking Ledger (r:1 w:0) /// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen) @@ -253,11 +253,11 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 25_685 nanoseconds. Weight::from_parts(25_290_286, 3566) // Standard Error: 5_164 - .saturating_add(Weight::from_ref_time(6_445_608).saturating_mul(k.into())) + .saturating_add(Weight::from_parts(6_445_608, 0).saturating_mul(k.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(k.into()))) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(k.into()))) - .saturating_add(Weight::from_proof_size(3033).saturating_mul(k.into())) + .saturating_add(Weight::from_parts(0, 3033).saturating_mul(k.into())) } /// Storage: Staking Ledger (r:1 w:0) /// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen) @@ -289,11 +289,11 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 59_542 nanoseconds. Weight::from_parts(57_558_678, 21988) // Standard Error: 10_364 - .saturating_add(Weight::from_ref_time(2_759_713).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(2_759_713, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(12_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into()))) .saturating_add(T::DbWeight::get().writes(6_u64)) - .saturating_add(Weight::from_proof_size(2520).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 2520).saturating_mul(n.into())) } /// Storage: Staking Ledger (r:1 w:0) /// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen) @@ -351,7 +351,7 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 3_069 nanoseconds. - Weight::from_ref_time(3_176_000) + Weight::from_parts(3_176_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Staking ForceEra (r:0 w:1) @@ -361,7 +361,7 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 11_386 nanoseconds. - Weight::from_ref_time(11_672_000) + Weight::from_parts(11_672_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Staking ForceEra (r:0 w:1) @@ -371,7 +371,7 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 11_591 nanoseconds. - Weight::from_ref_time(11_799_000) + Weight::from_parts(11_799_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Staking ForceEra (r:0 w:1) @@ -381,7 +381,7 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 11_553 nanoseconds. - Weight::from_ref_time(11_871_000) + Weight::from_parts(11_871_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Staking Invulnerables (r:0 w:1) @@ -392,9 +392,9 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 3_292 nanoseconds. - Weight::from_ref_time(3_754_352) + Weight::from_parts(3_754_352, 0) // Standard Error: 40 - .saturating_add(Weight::from_ref_time(9_838).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(9_838, 0).saturating_mul(v.into())) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Staking Bonded (r:1 w:1) @@ -431,11 +431,11 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 65_307 nanoseconds. Weight::from_parts(70_227_980, 27930) // Standard Error: 2_113 - .saturating_add(Weight::from_ref_time(1_059_856).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(1_059_856, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(12_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into()))) - .saturating_add(Weight::from_proof_size(4).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(0, 4).saturating_mul(s.into())) } /// Storage: Staking UnappliedSlashes (r:1 w:1) /// Proof Skipped: Staking UnappliedSlashes (max_values: None, max_size: None, mode: Measured) @@ -447,7 +447,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 89_123 nanoseconds. Weight::from_parts(890_989_741, 69146) // Standard Error: 58_282 - .saturating_add(Weight::from_ref_time(4_920_413).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(4_920_413, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -477,12 +477,12 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 73_652 nanoseconds. Weight::from_parts(127_839_483, 54756) // Standard Error: 14_195 - .saturating_add(Weight::from_ref_time(21_932_079).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(21_932_079, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(9_u64)) .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(n.into()))) .saturating_add(T::DbWeight::get().writes(2_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into()))) - .saturating_add(Weight::from_proof_size(8024).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 8024).saturating_mul(n.into())) } /// Storage: Staking CurrentEra (r:1 w:0) /// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -512,12 +512,12 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 94_560 nanoseconds. Weight::from_parts(154_033_219, 83594) // Standard Error: 26_663 - .saturating_add(Weight::from_ref_time(31_269_223).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(31_269_223, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(10_u64)) .saturating_add(T::DbWeight::get().reads((5_u64).saturating_mul(n.into()))) .saturating_add(T::DbWeight::get().writes(3_u64)) .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(n.into()))) - .saturating_add(Weight::from_proof_size(16026).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 16026).saturating_mul(n.into())) } /// Storage: Staking Ledger (r:1 w:1) /// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen) @@ -539,7 +539,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 74_764 nanoseconds. Weight::from_parts(75_814_067, 25491) // Standard Error: 1_217 - .saturating_add(Weight::from_ref_time(64_725).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(64_725, 0).saturating_mul(l.into())) .saturating_add(T::DbWeight::get().reads(9_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -577,11 +577,11 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 77_611 nanoseconds. Weight::from_parts(79_760_034, 31810) // Standard Error: 1_597 - .saturating_add(Weight::from_ref_time(1_039_268).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(1_039_268, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(12_u64)) .saturating_add(T::DbWeight::get().writes(12_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into()))) - .saturating_add(Weight::from_proof_size(4).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(0, 4).saturating_mul(s.into())) } /// Storage: VoterList CounterForListNodes (r:1 w:0) /// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -626,16 +626,16 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 489_824 nanoseconds. Weight::from_parts(491_687_000, 528203) // Standard Error: 1_787_577 - .saturating_add(Weight::from_ref_time(58_719_498).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(58_719_498, 0).saturating_mul(v.into())) // Standard Error: 178_122 - .saturating_add(Weight::from_ref_time(13_273_555).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(13_273_555, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(206_u64)) .saturating_add(T::DbWeight::get().reads((5_u64).saturating_mul(v.into()))) .saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(n.into()))) .saturating_add(T::DbWeight::get().writes(4_u64)) .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(v.into()))) - .saturating_add(Weight::from_proof_size(16743).saturating_mul(v.into())) - .saturating_add(Weight::from_proof_size(12947).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 16743).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(0, 12947).saturating_mul(n.into())) } /// Storage: VoterList CounterForListNodes (r:1 w:0) /// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -662,15 +662,15 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 23_373_467 nanoseconds. Weight::from_parts(23_497_257_000, 511899) // Standard Error: 299_205 - .saturating_add(Weight::from_ref_time(3_434_000).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(3_434_000, 0).saturating_mul(v.into())) // Standard Error: 299_205 - .saturating_add(Weight::from_ref_time(2_568_954).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(2_568_954, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(201_u64)) .saturating_add(T::DbWeight::get().reads((5_u64).saturating_mul(v.into()))) .saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(n.into()))) .saturating_add(T::DbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(14295).saturating_mul(v.into())) - .saturating_add(Weight::from_proof_size(11775).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 14295).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(0, 11775).saturating_mul(n.into())) } /// Storage: Staking CounterForValidators (r:1 w:0) /// Proof: Staking CounterForValidators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -684,10 +684,10 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 3_882_120 nanoseconds. Weight::from_parts(3_951_993_000, 3019) // Standard Error: 46_729 - .saturating_add(Weight::from_ref_time(2_856_043).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(2_856_043, 0).saturating_mul(v.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(v.into()))) - .saturating_add(Weight::from_proof_size(2520).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(0, 2520).saturating_mul(v.into())) } /// Storage: Staking MinCommission (r:0 w:1) /// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -706,7 +706,7 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 8_427 nanoseconds. - Weight::from_ref_time(8_794_000) + Weight::from_parts(8_794_000, 0) .saturating_add(T::DbWeight::get().writes(6_u64)) } /// Storage: Staking MinCommission (r:0 w:1) @@ -726,7 +726,7 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 7_620 nanoseconds. - Weight::from_ref_time(7_901_000) + Weight::from_parts(7_901_000, 0) .saturating_add(T::DbWeight::get().writes(6_u64)) } /// Storage: Staking Ledger (r:1 w:0) @@ -778,7 +778,7 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 4_518 nanoseconds. - Weight::from_ref_time(4_656_000) + Weight::from_parts(4_656_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } } @@ -866,7 +866,7 @@ impl WeightInfo for () { // Minimum execution time: 31_479 nanoseconds. Weight::from_parts(32_410_035, 10442) // Standard Error: 313 - .saturating_add(Weight::from_ref_time(9_090).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(9_090, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(4_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) } @@ -906,11 +906,11 @@ impl WeightInfo for () { // Minimum execution time: 71_968 nanoseconds. Weight::from_parts(76_631_804, 32303) // Standard Error: 1_613 - .saturating_add(Weight::from_ref_time(1_058_968).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(1_058_968, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(13_u64)) .saturating_add(RocksDbWeight::get().writes(12_u64)) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(s.into()))) - .saturating_add(Weight::from_proof_size(4).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(0, 4).saturating_mul(s.into())) } /// Storage: Staking Ledger (r:1 w:0) /// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen) @@ -955,11 +955,11 @@ impl WeightInfo for () { // Minimum execution time: 25_685 nanoseconds. Weight::from_parts(25_290_286, 3566) // Standard Error: 5_164 - .saturating_add(Weight::from_ref_time(6_445_608).saturating_mul(k.into())) + .saturating_add(Weight::from_parts(6_445_608, 0).saturating_mul(k.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(k.into()))) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(k.into()))) - .saturating_add(Weight::from_proof_size(3033).saturating_mul(k.into())) + .saturating_add(Weight::from_parts(0, 3033).saturating_mul(k.into())) } /// Storage: Staking Ledger (r:1 w:0) /// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen) @@ -991,11 +991,11 @@ impl WeightInfo for () { // Minimum execution time: 59_542 nanoseconds. Weight::from_parts(57_558_678, 21988) // Standard Error: 10_364 - .saturating_add(Weight::from_ref_time(2_759_713).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(2_759_713, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(12_u64)) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(n.into()))) .saturating_add(RocksDbWeight::get().writes(6_u64)) - .saturating_add(Weight::from_proof_size(2520).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 2520).saturating_mul(n.into())) } /// Storage: Staking Ledger (r:1 w:0) /// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen) @@ -1053,7 +1053,7 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 3_069 nanoseconds. - Weight::from_ref_time(3_176_000) + Weight::from_parts(3_176_000, 0) .saturating_add(RocksDbWeight::get().writes(1_u64)) } /// Storage: Staking ForceEra (r:0 w:1) @@ -1063,7 +1063,7 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 11_386 nanoseconds. - Weight::from_ref_time(11_672_000) + Weight::from_parts(11_672_000, 0) .saturating_add(RocksDbWeight::get().writes(1_u64)) } /// Storage: Staking ForceEra (r:0 w:1) @@ -1073,7 +1073,7 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 11_591 nanoseconds. - Weight::from_ref_time(11_799_000) + Weight::from_parts(11_799_000, 0) .saturating_add(RocksDbWeight::get().writes(1_u64)) } /// Storage: Staking ForceEra (r:0 w:1) @@ -1083,7 +1083,7 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 11_553 nanoseconds. - Weight::from_ref_time(11_871_000) + Weight::from_parts(11_871_000, 0) .saturating_add(RocksDbWeight::get().writes(1_u64)) } /// Storage: Staking Invulnerables (r:0 w:1) @@ -1094,9 +1094,9 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 3_292 nanoseconds. - Weight::from_ref_time(3_754_352) + Weight::from_parts(3_754_352, 0) // Standard Error: 40 - .saturating_add(Weight::from_ref_time(9_838).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(9_838, 0).saturating_mul(v.into())) .saturating_add(RocksDbWeight::get().writes(1_u64)) } /// Storage: Staking Bonded (r:1 w:1) @@ -1133,11 +1133,11 @@ impl WeightInfo for () { // Minimum execution time: 65_307 nanoseconds. Weight::from_parts(70_227_980, 27930) // Standard Error: 2_113 - .saturating_add(Weight::from_ref_time(1_059_856).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(1_059_856, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(11_u64)) .saturating_add(RocksDbWeight::get().writes(12_u64)) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(s.into()))) - .saturating_add(Weight::from_proof_size(4).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(0, 4).saturating_mul(s.into())) } /// Storage: Staking UnappliedSlashes (r:1 w:1) /// Proof Skipped: Staking UnappliedSlashes (max_values: None, max_size: None, mode: Measured) @@ -1149,7 +1149,7 @@ impl WeightInfo for () { // Minimum execution time: 89_123 nanoseconds. Weight::from_parts(890_989_741, 69146) // Standard Error: 58_282 - .saturating_add(Weight::from_ref_time(4_920_413).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(4_920_413, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -1179,12 +1179,12 @@ impl WeightInfo for () { // Minimum execution time: 73_652 nanoseconds. Weight::from_parts(127_839_483, 54756) // Standard Error: 14_195 - .saturating_add(Weight::from_ref_time(21_932_079).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(21_932_079, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(9_u64)) .saturating_add(RocksDbWeight::get().reads((3_u64).saturating_mul(n.into()))) .saturating_add(RocksDbWeight::get().writes(2_u64)) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(n.into()))) - .saturating_add(Weight::from_proof_size(8024).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 8024).saturating_mul(n.into())) } /// Storage: Staking CurrentEra (r:1 w:0) /// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -1214,12 +1214,12 @@ impl WeightInfo for () { // Minimum execution time: 94_560 nanoseconds. Weight::from_parts(154_033_219, 83594) // Standard Error: 26_663 - .saturating_add(Weight::from_ref_time(31_269_223).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(31_269_223, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(10_u64)) .saturating_add(RocksDbWeight::get().reads((5_u64).saturating_mul(n.into()))) .saturating_add(RocksDbWeight::get().writes(3_u64)) .saturating_add(RocksDbWeight::get().writes((3_u64).saturating_mul(n.into()))) - .saturating_add(Weight::from_proof_size(16026).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 16026).saturating_mul(n.into())) } /// Storage: Staking Ledger (r:1 w:1) /// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen) @@ -1241,7 +1241,7 @@ impl WeightInfo for () { // Minimum execution time: 74_764 nanoseconds. Weight::from_parts(75_814_067, 25491) // Standard Error: 1_217 - .saturating_add(Weight::from_ref_time(64_725).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(64_725, 0).saturating_mul(l.into())) .saturating_add(RocksDbWeight::get().reads(9_u64)) .saturating_add(RocksDbWeight::get().writes(8_u64)) } @@ -1279,11 +1279,11 @@ impl WeightInfo for () { // Minimum execution time: 77_611 nanoseconds. Weight::from_parts(79_760_034, 31810) // Standard Error: 1_597 - .saturating_add(Weight::from_ref_time(1_039_268).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(1_039_268, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(12_u64)) .saturating_add(RocksDbWeight::get().writes(12_u64)) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(s.into()))) - .saturating_add(Weight::from_proof_size(4).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(0, 4).saturating_mul(s.into())) } /// Storage: VoterList CounterForListNodes (r:1 w:0) /// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -1328,16 +1328,16 @@ impl WeightInfo for () { // Minimum execution time: 489_824 nanoseconds. Weight::from_parts(491_687_000, 528203) // Standard Error: 1_787_577 - .saturating_add(Weight::from_ref_time(58_719_498).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(58_719_498, 0).saturating_mul(v.into())) // Standard Error: 178_122 - .saturating_add(Weight::from_ref_time(13_273_555).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(13_273_555, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(206_u64)) .saturating_add(RocksDbWeight::get().reads((5_u64).saturating_mul(v.into()))) .saturating_add(RocksDbWeight::get().reads((4_u64).saturating_mul(n.into()))) .saturating_add(RocksDbWeight::get().writes(4_u64)) .saturating_add(RocksDbWeight::get().writes((3_u64).saturating_mul(v.into()))) - .saturating_add(Weight::from_proof_size(16743).saturating_mul(v.into())) - .saturating_add(Weight::from_proof_size(12947).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 16743).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(0, 12947).saturating_mul(n.into())) } /// Storage: VoterList CounterForListNodes (r:1 w:0) /// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -1364,15 +1364,15 @@ impl WeightInfo for () { // Minimum execution time: 23_373_467 nanoseconds. Weight::from_parts(23_497_257_000, 511899) // Standard Error: 299_205 - .saturating_add(Weight::from_ref_time(3_434_000).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(3_434_000, 0).saturating_mul(v.into())) // Standard Error: 299_205 - .saturating_add(Weight::from_ref_time(2_568_954).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(2_568_954, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(201_u64)) .saturating_add(RocksDbWeight::get().reads((5_u64).saturating_mul(v.into()))) .saturating_add(RocksDbWeight::get().reads((4_u64).saturating_mul(n.into()))) .saturating_add(RocksDbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(14295).saturating_mul(v.into())) - .saturating_add(Weight::from_proof_size(11775).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 14295).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(0, 11775).saturating_mul(n.into())) } /// Storage: Staking CounterForValidators (r:1 w:0) /// Proof: Staking CounterForValidators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -1386,10 +1386,10 @@ impl WeightInfo for () { // Minimum execution time: 3_882_120 nanoseconds. Weight::from_parts(3_951_993_000, 3019) // Standard Error: 46_729 - .saturating_add(Weight::from_ref_time(2_856_043).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(2_856_043, 0).saturating_mul(v.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(v.into()))) - .saturating_add(Weight::from_proof_size(2520).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(0, 2520).saturating_mul(v.into())) } /// Storage: Staking MinCommission (r:0 w:1) /// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -1408,7 +1408,7 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 8_427 nanoseconds. - Weight::from_ref_time(8_794_000) + Weight::from_parts(8_794_000, 0) .saturating_add(RocksDbWeight::get().writes(6_u64)) } /// Storage: Staking MinCommission (r:0 w:1) @@ -1428,7 +1428,7 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 7_620 nanoseconds. - Weight::from_ref_time(7_901_000) + Weight::from_parts(7_901_000, 0) .saturating_add(RocksDbWeight::get().writes(6_u64)) } /// Storage: Staking Ledger (r:1 w:0) @@ -1480,7 +1480,7 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 4_518 nanoseconds. - Weight::from_ref_time(4_656_000) + Weight::from_parts(4_656_000, 0) .saturating_add(RocksDbWeight::get().writes(1_u64)) } } diff --git a/frame/state-trie-migration/src/lib.rs b/frame/state-trie-migration/src/lib.rs index 0ebb8122d4618..547dfa5cda9c8 100644 --- a/frame/state-trie-migration/src/lib.rs +++ b/frame/state-trie-migration/src/lib.rs @@ -1136,25 +1136,25 @@ mod mock { impl WeightInfo for StateMigrationTestWeight { fn process_top_key(_: u32) -> Weight { - Weight::from_ref_time(1000000) + Weight::from_parts(1000000, 0) } fn continue_migrate() -> Weight { - Weight::from_ref_time(1000000) + Weight::from_parts(1000000, 0) } fn continue_migrate_wrong_witness() -> Weight { - Weight::from_ref_time(1000000) + Weight::from_parts(1000000, 0) } fn migrate_custom_top_fail() -> Weight { - Weight::from_ref_time(1000000) + Weight::from_parts(1000000, 0) } fn migrate_custom_top_success() -> Weight { - Weight::from_ref_time(1000000) + Weight::from_parts(1000000, 0) } fn migrate_custom_child_fail() -> Weight { - Weight::from_ref_time(1000000) + Weight::from_parts(1000000, 0) } fn migrate_custom_child_success() -> Weight { - Weight::from_ref_time(1000000) + Weight::from_parts(1000000, 0) } } diff --git a/frame/state-trie-migration/src/weights.rs b/frame/state-trie-migration/src/weights.rs index a833d816cd13a..e087ba185994f 100644 --- a/frame/state-trie-migration/src/weights.rs +++ b/frame/state-trie-migration/src/weights.rs @@ -88,7 +88,7 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 8_817 nanoseconds. - Weight::from_ref_time(9_027_000) + Weight::from_parts(9_027_000, 0) } /// Storage: unknown `0x666f6f` (r:1 w:1) /// Proof Skipped: unknown `0x666f6f` (r:1 w:1) @@ -106,7 +106,7 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 9_020 nanoseconds. - Weight::from_ref_time(9_234_000) + Weight::from_parts(9_234_000, 0) } /// Storage: unknown `0x666f6f` (r:1 w:1) /// Proof Skipped: unknown `0x666f6f` (r:1 w:1) @@ -129,10 +129,10 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 5_279 nanoseconds. Weight::from_parts(5_517_000, 2700) // Standard Error: 1 - .saturating_add(Weight::from_ref_time(1_230).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(1_230, 0).saturating_mul(v.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(1).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(0, 1).saturating_mul(v.into())) } } @@ -166,7 +166,7 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 8_817 nanoseconds. - Weight::from_ref_time(9_027_000) + Weight::from_parts(9_027_000, 0) } /// Storage: unknown `0x666f6f` (r:1 w:1) /// Proof Skipped: unknown `0x666f6f` (r:1 w:1) @@ -184,7 +184,7 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 9_020 nanoseconds. - Weight::from_ref_time(9_234_000) + Weight::from_parts(9_234_000, 0) } /// Storage: unknown `0x666f6f` (r:1 w:1) /// Proof Skipped: unknown `0x666f6f` (r:1 w:1) @@ -207,9 +207,9 @@ impl WeightInfo for () { // Minimum execution time: 5_279 nanoseconds. Weight::from_parts(5_517_000, 2700) // Standard Error: 1 - .saturating_add(Weight::from_ref_time(1_230).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(1_230, 0).saturating_mul(v.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(1).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(0, 1).saturating_mul(v.into())) } } diff --git a/frame/sudo/src/tests.rs b/frame/sudo/src/tests.rs index e924bc77cf69e..c854fed8f0736 100644 --- a/frame/sudo/src/tests.rs +++ b/frame/sudo/src/tests.rs @@ -41,7 +41,7 @@ fn sudo_basics() { // A privileged function should work when `sudo` is passed the root `key` as `origin`. let call = Box::new(RuntimeCall::Logger(LoggerCall::privileged_i32_log { i: 42, - weight: Weight::from_ref_time(1_000), + weight: Weight::from_parts(1_000, 0), })); assert_ok!(Sudo::sudo(RuntimeOrigin::signed(1), call)); assert_eq!(Logger::i32_log(), vec![42i32]); @@ -49,7 +49,7 @@ fn sudo_basics() { // A privileged function should not work when `sudo` is passed a non-root `key` as `origin`. let call = Box::new(RuntimeCall::Logger(LoggerCall::privileged_i32_log { i: 42, - weight: Weight::from_ref_time(1_000), + weight: Weight::from_parts(1_000, 0), })); assert_noop!(Sudo::sudo(RuntimeOrigin::signed(2), call), Error::::RequireSudo); }); @@ -64,7 +64,7 @@ fn sudo_emits_events_correctly() { // Should emit event to indicate success when called with the root `key` and `call` is `Ok`. let call = Box::new(RuntimeCall::Logger(LoggerCall::privileged_i32_log { i: 42, - weight: Weight::from_ref_time(1), + weight: Weight::from_parts(1, 0), })); assert_ok!(Sudo::sudo(RuntimeOrigin::signed(1), call)); System::assert_has_event(TestEvent::Sudo(Event::Sudid { sudo_result: Ok(()) })); @@ -77,25 +77,25 @@ fn sudo_unchecked_weight_basics() { // A privileged function should work when `sudo` is passed the root `key` as origin. let call = Box::new(RuntimeCall::Logger(LoggerCall::privileged_i32_log { i: 42, - weight: Weight::from_ref_time(1_000), + weight: Weight::from_parts(1_000, 0), })); assert_ok!(Sudo::sudo_unchecked_weight( RuntimeOrigin::signed(1), call, - Weight::from_ref_time(1_000) + Weight::from_parts(1_000, 0) )); assert_eq!(Logger::i32_log(), vec![42i32]); // A privileged function should not work when called with a non-root `key`. let call = Box::new(RuntimeCall::Logger(LoggerCall::privileged_i32_log { i: 42, - weight: Weight::from_ref_time(1_000), + weight: Weight::from_parts(1_000, 0), })); assert_noop!( Sudo::sudo_unchecked_weight( RuntimeOrigin::signed(2), call, - Weight::from_ref_time(1_000) + Weight::from_parts(1_000, 0) ), Error::::RequireSudo, ); @@ -105,12 +105,12 @@ fn sudo_unchecked_weight_basics() { // Controls the dispatched weight. let call = Box::new(RuntimeCall::Logger(LoggerCall::privileged_i32_log { i: 42, - weight: Weight::from_ref_time(1), + weight: Weight::from_parts(1, 0), })); let sudo_unchecked_weight_call = - SudoCall::sudo_unchecked_weight { call, weight: Weight::from_ref_time(1_000) }; + SudoCall::sudo_unchecked_weight { call, weight: Weight::from_parts(1_000, 0) }; let info = sudo_unchecked_weight_call.get_dispatch_info(); - assert_eq!(info.weight, Weight::from_ref_time(1_000)); + assert_eq!(info.weight, Weight::from_parts(1_000, 0)); }); } @@ -123,12 +123,12 @@ fn sudo_unchecked_weight_emits_events_correctly() { // Should emit event to indicate success when called with the root `key` and `call` is `Ok`. let call = Box::new(RuntimeCall::Logger(LoggerCall::privileged_i32_log { i: 42, - weight: Weight::from_ref_time(1), + weight: Weight::from_parts(1, 0), })); assert_ok!(Sudo::sudo_unchecked_weight( RuntimeOrigin::signed(1), call, - Weight::from_ref_time(1_000) + Weight::from_parts(1_000, 0) )); System::assert_has_event(TestEvent::Sudo(Event::Sudid { sudo_result: Ok(()) })); }) @@ -170,7 +170,7 @@ fn sudo_as_basics() { // A privileged function will not work when passed to `sudo_as`. let call = Box::new(RuntimeCall::Logger(LoggerCall::privileged_i32_log { i: 42, - weight: Weight::from_ref_time(1_000), + weight: Weight::from_parts(1_000, 0), })); assert_ok!(Sudo::sudo_as(RuntimeOrigin::signed(1), 2, call)); assert!(Logger::i32_log().is_empty()); @@ -179,14 +179,14 @@ fn sudo_as_basics() { // A non-privileged function should not work when called with a non-root `key`. let call = Box::new(RuntimeCall::Logger(LoggerCall::non_privileged_log { i: 42, - weight: Weight::from_ref_time(1), + weight: Weight::from_parts(1, 0), })); assert_noop!(Sudo::sudo_as(RuntimeOrigin::signed(3), 2, call), Error::::RequireSudo); // A non-privileged function will work when passed to `sudo_as` with the root `key`. let call = Box::new(RuntimeCall::Logger(LoggerCall::non_privileged_log { i: 42, - weight: Weight::from_ref_time(1), + weight: Weight::from_parts(1, 0), })); assert_ok!(Sudo::sudo_as(RuntimeOrigin::signed(1), 2, call)); assert_eq!(Logger::i32_log(), vec![42i32]); @@ -204,7 +204,7 @@ fn sudo_as_emits_events_correctly() { // A non-privileged function will work when passed to `sudo_as` with the root `key`. let call = Box::new(RuntimeCall::Logger(LoggerCall::non_privileged_log { i: 42, - weight: Weight::from_ref_time(1), + weight: Weight::from_parts(1, 0), })); assert_ok!(Sudo::sudo_as(RuntimeOrigin::signed(1), 2, call)); System::assert_has_event(TestEvent::Sudo(Event::SudoAsDone { sudo_result: Ok(()) })); diff --git a/frame/support/src/dispatch.rs b/frame/support/src/dispatch.rs index c26a3d8e71a36..e2798763df437 100644 --- a/frame/support/src/dispatch.rs +++ b/frame/support/src/dispatch.rs @@ -314,7 +314,7 @@ pub trait WithPostDispatchInfo { /// # Example /// /// ```ignore - /// let who = ensure_signed(origin).map_err(|e| e.with_weight(Weight::from_ref_time(100)))?; + /// let who = ensure_signed(origin).map_err(|e| e.with_weight(Weight::from_parts(100, 0)))?; /// ensure!(who == me, Error::::NotMe.with_weight(200_000)); /// ``` fn with_weight(self, actual_weight: Weight) -> DispatchErrorWithPostInfo; @@ -365,7 +365,7 @@ impl GetDispatchInfo fn get_dispatch_info(&self) -> DispatchInfo { // for testing: weight == size. DispatchInfo { - weight: Weight::from_ref_time(self.encode().len() as _), + weight: Weight::from_parts(self.encode().len() as _, 0), pays_fee: Pays::Yes, class: self.call.get_dispatch_info().class, } @@ -552,7 +552,7 @@ impl ClassifyDispatch for (Weight, DispatchClass, Pays) { impl From> for PostDispatchInfo { fn from(maybe_actual_computation: Option) -> Self { let actual_weight = match maybe_actual_computation { - Some(actual_computation) => Some(Weight::zero().set_ref_time(actual_computation)), + Some(actual_computation) => Some(Weight::from_parts(actual_computation, 0)), None => None, }; Self { actual_weight, pays_fee: Default::default() } @@ -563,7 +563,7 @@ impl From<(Option, Pays)> for PostDispatchInfo { fn from(post_weight_info: (Option, Pays)) -> Self { let (maybe_actual_time, pays_fee) = post_weight_info; let actual_weight = match maybe_actual_time { - Some(actual_time) => Some(Weight::zero().set_ref_time(actual_time)), + Some(actual_time) => Some(Weight::from_parts(actual_time, 0)), None => None, }; Self { actual_weight, pays_fee } @@ -584,7 +584,7 @@ impl PaysFee for u64 { impl WeighData for u64 { fn weigh_data(&self, _: T) -> Weight { - return Weight::zero().set_ref_time(*self) + return Weight::from_parts(*self, 0) } } @@ -735,7 +735,7 @@ impl PaysFee for (u64, Pays) { /// pub struct Module for enum Call where origin: T::RuntimeOrigin { /// #[weight = 1_000_000] /// fn my_long_function(origin, do_expensive_calc: bool) -> DispatchResultWithPostInfo { -/// ensure_signed(origin).map_err(|e| e.with_weight(Weight::from_ref_time(100_000)))?; +/// ensure_signed(origin).map_err(|e| e.with_weight(Weight::from_parts(100_000, 0)))?; /// if do_expensive_calc { /// // do the expensive calculation /// // ... @@ -3239,13 +3239,13 @@ mod tests { #[weight = (5, DispatchClass::Operational)] fn operational(_origin) { unreachable!() } - fn on_initialize(n: T::BlockNumber,) -> Weight { if n.into() == 42 { panic!("on_initialize") } Weight::from_ref_time(7) } + fn on_initialize(n: T::BlockNumber,) -> Weight { if n.into() == 42 { panic!("on_initialize") } Weight::from_parts(7, 0) } fn on_idle(n: T::BlockNumber, remaining_weight: Weight,) -> Weight { - if n.into() == 42 || remaining_weight == Weight::from_ref_time(42) { panic!("on_idle") } - Weight::from_ref_time(7) + if n.into() == 42 || remaining_weight == Weight::from_parts(42, 0) { panic!("on_idle") } + Weight::from_parts(7, 0) } fn on_finalize(n: T::BlockNumber,) { if n.into() == 42 { panic!("on_finalize") } } - fn on_runtime_upgrade() -> Weight { Weight::from_ref_time(10) } + fn on_runtime_upgrade() -> Weight { Weight::from_parts(10, 0) } fn offchain_worker() {} /// Some doc fn integrity_test() { panic!("integrity_test") } @@ -3423,27 +3423,27 @@ mod tests { fn on_initialize_should_work_2() { assert_eq!( as OnInitialize>::on_initialize(10), - Weight::from_ref_time(7) + Weight::from_parts(7, 0) ); } #[test] #[should_panic(expected = "on_idle")] fn on_idle_should_work_1() { - as OnIdle>::on_idle(42, Weight::from_ref_time(9)); + as OnIdle>::on_idle(42, Weight::from_parts(9, 0)); } #[test] #[should_panic(expected = "on_idle")] fn on_idle_should_work_2() { - as OnIdle>::on_idle(9, Weight::from_ref_time(42)); + as OnIdle>::on_idle(9, Weight::from_parts(42, 0)); } #[test] fn on_idle_should_work_3() { assert_eq!( - as OnIdle>::on_idle(10, Weight::from_ref_time(11)), - Weight::from_ref_time(7) + as OnIdle>::on_idle(10, Weight::from_parts(11, 0)), + Weight::from_parts(7, 0) ); } @@ -3458,7 +3458,7 @@ mod tests { sp_io::TestExternalities::default().execute_with(|| { assert_eq!( as OnRuntimeUpgrade>::on_runtime_upgrade(), - Weight::from_ref_time(10) + Weight::from_parts(10, 0) ) }); } @@ -3469,7 +3469,7 @@ mod tests { assert_eq!( Call::::operational {}.get_dispatch_info(), DispatchInfo { - weight: Weight::from_ref_time(5), + weight: Weight::from_parts(5, 0), class: DispatchClass::Operational, pays_fee: Pays::Yes }, @@ -3478,7 +3478,7 @@ mod tests { assert_eq!( Call::::aux_3 {}.get_dispatch_info(), DispatchInfo { - weight: Weight::from_ref_time(3), + weight: Weight::from_parts(3, 0), class: DispatchClass::Normal, pays_fee: Pays::Yes }, @@ -3567,10 +3567,10 @@ mod weight_tests { #[weight = (0, DispatchClass::Operational, Pays::Yes)] fn f12(_origin, _a: u32, _eb: u32) { unimplemented!(); } - #[weight = T::DbWeight::get().reads(3) + T::DbWeight::get().writes(2) + Weight::from_ref_time(10_000)] + #[weight = T::DbWeight::get().reads(3) + T::DbWeight::get().writes(2) + Weight::from_parts(10_000, 0)] fn f20(_origin) { unimplemented!(); } - #[weight = T::DbWeight::get().reads_writes(6, 5) + Weight::from_ref_time(40_000)] + #[weight = T::DbWeight::get().reads_writes(6, 5) + Weight::from_parts(40_000, 0)] fn f21(_origin) { unimplemented!(); } } @@ -3580,96 +3580,96 @@ mod weight_tests { fn weights_are_correct() { // #[weight = 1000] let info = Call::::f00 {}.get_dispatch_info(); - assert_eq!(info.weight, Weight::from_ref_time(1000)); + assert_eq!(info.weight, Weight::from_parts(1000, 0)); assert_eq!(info.class, DispatchClass::Normal); assert_eq!(info.pays_fee, Pays::Yes); // #[weight = (1000, DispatchClass::Mandatory)] let info = Call::::f01 {}.get_dispatch_info(); - assert_eq!(info.weight, Weight::from_ref_time(1000)); + assert_eq!(info.weight, Weight::from_parts(1000, 0)); assert_eq!(info.class, DispatchClass::Mandatory); assert_eq!(info.pays_fee, Pays::Yes); // #[weight = (1000, Pays::No)] let info = Call::::f02 {}.get_dispatch_info(); - assert_eq!(info.weight, Weight::from_ref_time(1000)); + assert_eq!(info.weight, Weight::from_parts(1000, 0)); assert_eq!(info.class, DispatchClass::Normal); assert_eq!(info.pays_fee, Pays::No); // #[weight = (1000, DispatchClass::Operational, Pays::No)] let info = Call::::f03 {}.get_dispatch_info(); - assert_eq!(info.weight, Weight::from_ref_time(1000)); + assert_eq!(info.weight, Weight::from_parts(1000, 0)); assert_eq!(info.class, DispatchClass::Operational); assert_eq!(info.pays_fee, Pays::No); // #[weight = ((_a * 10 + _eb * 1) as Weight, DispatchClass::Normal, Pays::Yes)] let info = Call::::f11 { _a: 13, _eb: 20 }.get_dispatch_info(); - assert_eq!(info.weight, Weight::from_ref_time(150)); // 13*10 + 20 + assert_eq!(info.weight, Weight::from_parts(150, 0)); // 13*10 + 20 assert_eq!(info.class, DispatchClass::Normal); assert_eq!(info.pays_fee, Pays::Yes); // #[weight = (0, DispatchClass::Operational, Pays::Yes)] let info = Call::::f12 { _a: 10, _eb: 20 }.get_dispatch_info(); - assert_eq!(info.weight, Weight::from_ref_time(0)); + assert_eq!(info.weight, Weight::from_parts(0, 0)); assert_eq!(info.class, DispatchClass::Operational); assert_eq!(info.pays_fee, Pays::Yes); // #[weight = T::DbWeight::get().reads(3) + T::DbWeight::get().writes(2) + 10_000] let info = Call::::f20 {}.get_dispatch_info(); - assert_eq!(info.weight, Weight::from_ref_time(12300)); // 100*3 + 1000*2 + 10_1000 + assert_eq!(info.weight, Weight::from_parts(12300, 0)); // 100*3 + 1000*2 + 10_1000 assert_eq!(info.class, DispatchClass::Normal); assert_eq!(info.pays_fee, Pays::Yes); // #[weight = T::DbWeight::get().reads_writes(6, 5) + 40_000] let info = Call::::f21 {}.get_dispatch_info(); - assert_eq!(info.weight, Weight::from_ref_time(45600)); // 100*6 + 1000*5 + 40_1000 + assert_eq!(info.weight, Weight::from_parts(45600, 0)); // 100*6 + 1000*5 + 40_1000 assert_eq!(info.class, DispatchClass::Normal); assert_eq!(info.pays_fee, Pays::Yes); } #[test] fn extract_actual_weight_works() { - let pre = DispatchInfo { weight: Weight::from_ref_time(1000), ..Default::default() }; - assert_eq!(extract_actual_weight(&Ok(Some(7).into()), &pre), Weight::from_ref_time(7)); + let pre = DispatchInfo { weight: Weight::from_parts(1000, 0), ..Default::default() }; + assert_eq!(extract_actual_weight(&Ok(Some(7).into()), &pre), Weight::from_parts(7, 0)); assert_eq!( extract_actual_weight(&Ok(Some(1000).into()), &pre), - Weight::from_ref_time(1000) + Weight::from_parts(1000, 0) ); assert_eq!( extract_actual_weight( - &Err(DispatchError::BadOrigin.with_weight(Weight::from_ref_time(9))), + &Err(DispatchError::BadOrigin.with_weight(Weight::from_parts(9, 0))), &pre ), - Weight::from_ref_time(9) + Weight::from_parts(9, 0) ); } #[test] fn extract_actual_weight_caps_at_pre_weight() { - let pre = DispatchInfo { weight: Weight::from_ref_time(1000), ..Default::default() }; + let pre = DispatchInfo { weight: Weight::from_parts(1000, 0), ..Default::default() }; assert_eq!( extract_actual_weight(&Ok(Some(1250).into()), &pre), - Weight::from_ref_time(1000) + Weight::from_parts(1000, 0) ); assert_eq!( extract_actual_weight( - &Err(DispatchError::BadOrigin.with_weight(Weight::from_ref_time(1300))), + &Err(DispatchError::BadOrigin.with_weight(Weight::from_parts(1300, 0))), &pre ), - Weight::from_ref_time(1000), + Weight::from_parts(1000, 0), ); } #[test] fn extract_actual_pays_fee_works() { - let pre = DispatchInfo { weight: Weight::from_ref_time(1000), ..Default::default() }; + let pre = DispatchInfo { weight: Weight::from_parts(1000, 0), ..Default::default() }; assert_eq!(extract_actual_pays_fee(&Ok(Some(7).into()), &pre), Pays::Yes); assert_eq!(extract_actual_pays_fee(&Ok(Some(1000).into()), &pre), Pays::Yes); assert_eq!(extract_actual_pays_fee(&Ok((Some(1000), Pays::Yes).into()), &pre), Pays::Yes); assert_eq!(extract_actual_pays_fee(&Ok((Some(1000), Pays::No).into()), &pre), Pays::No); assert_eq!( extract_actual_pays_fee( - &Err(DispatchError::BadOrigin.with_weight(Weight::from_ref_time(9))), + &Err(DispatchError::BadOrigin.with_weight(Weight::from_parts(9, 0))), &pre ), Pays::Yes @@ -3686,7 +3686,7 @@ mod weight_tests { ); let pre = DispatchInfo { - weight: Weight::from_ref_time(1000), + weight: Weight::from_parts(1000, 0), pays_fee: Pays::No, ..Default::default() }; diff --git a/frame/support/src/traits/hooks.rs b/frame/support/src/traits/hooks.rs index fe67e33d1832c..a3374d0bf537f 100644 --- a/frame/support/src/traits/hooks.rs +++ b/frame/support/src/traits/hooks.rs @@ -367,18 +367,18 @@ mod tests { impl OnInitialize for Test { fn on_initialize(_n: u8) -> Weight { - Weight::from_ref_time(10) + Weight::from_parts(10, 0) } } impl OnRuntimeUpgrade for Test { fn on_runtime_upgrade() -> Weight { - Weight::from_ref_time(20) + Weight::from_parts(20, 0) } } TestExternalities::default().execute_with(|| { - assert_eq!(<(Test, Test)>::on_initialize(0), Weight::from_ref_time(20)); - assert_eq!(<(Test, Test)>::on_runtime_upgrade(), Weight::from_ref_time(40)); + assert_eq!(<(Test, Test)>::on_initialize(0), Weight::from_parts(20, 0)); + assert_eq!(<(Test, Test)>::on_runtime_upgrade(), Weight::from_parts(40, 0)); }); } diff --git a/frame/support/src/weights/block_weights.rs b/frame/support/src/weights/block_weights.rs index a208c77aa28c1..2389c51d9de9c 100644 --- a/frame/support/src/weights/block_weights.rs +++ b/frame/support/src/weights/block_weights.rs @@ -54,7 +54,7 @@ parameter_types! { /// 95th: 384_876 /// 75th: 380_642 pub const BlockExecutionWeight: Weight = - Weight::from_ref_time(WEIGHT_REF_TIME_PER_NANOS.saturating_mul(381_015)); + Weight::from_parts(WEIGHT_REF_TIME_PER_NANOS.saturating_mul(381_015), 0); } #[cfg(test)] diff --git a/frame/support/src/weights/extrinsic_weights.rs b/frame/support/src/weights/extrinsic_weights.rs index 4e3a0fda8d2f5..78798d2e3a277 100644 --- a/frame/support/src/weights/extrinsic_weights.rs +++ b/frame/support/src/weights/extrinsic_weights.rs @@ -54,7 +54,7 @@ parameter_types! { /// 95th: 100_051 /// 75th: 99_916 pub const ExtrinsicBaseWeight: Weight = - Weight::from_ref_time(WEIGHT_REF_TIME_PER_NANOS.saturating_mul(99_840)); + Weight::from_parts(WEIGHT_REF_TIME_PER_NANOS.saturating_mul(99_840), 0); } #[cfg(test)] diff --git a/frame/support/test/tests/construct_runtime.rs b/frame/support/test/tests/construct_runtime.rs index 0965577149d17..24f8a278b3539 100644 --- a/frame/support/test/tests/construct_runtime.rs +++ b/frame/support/test/tests/construct_runtime.rs @@ -508,7 +508,7 @@ fn call_weight_should_attach_to_call_enum() { assert_eq!( module3::Call::::operational {}.get_dispatch_info(), DispatchInfo { - weight: Weight::from_ref_time(5), + weight: Weight::from_parts(5, 0), class: DispatchClass::Operational, pays_fee: Pays::Yes }, @@ -517,7 +517,7 @@ fn call_weight_should_attach_to_call_enum() { assert_eq!( module3::Call::::aux_4 {}.get_dispatch_info(), DispatchInfo { - weight: Weight::from_ref_time(3), + weight: Weight::from_parts(3, 0), class: DispatchClass::Normal, pays_fee: Pays::Yes }, diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs index 8ce85fa506348..2a4732d0222d2 100644 --- a/frame/support/test/tests/pallet.rs +++ b/frame/support/test/tests/pallet.rs @@ -171,7 +171,7 @@ pub mod pallet { let _ = T::AccountId::from(SomeType1); // Test for where clause let _ = T::AccountId::from(SomeType2); // Test for where clause Self::deposit_event(Event::Something(10)); - Weight::from_ref_time(10) + Weight::from_parts(10, 0) } fn on_finalize(_: BlockNumberFor) { let _ = T::AccountId::from(SomeType1); // Test for where clause @@ -182,7 +182,7 @@ pub mod pallet { let _ = T::AccountId::from(SomeType1); // Test for where clause let _ = T::AccountId::from(SomeType2); // Test for where clause Self::deposit_event(Event::Something(30)); - Weight::from_ref_time(30) + Weight::from_parts(30, 0) } fn integrity_test() { let _ = T::AccountId::from(SomeType1); // Test for where clause @@ -197,7 +197,7 @@ pub mod pallet { { /// Doc comment put in metadata #[pallet::call_index(0)] - #[pallet::weight(Weight::from_ref_time(*_foo as u64))] + #[pallet::weight(Weight::from_parts(*_foo as u64, 0))] pub fn foo( origin: OriginFor, #[pallet::compact] _foo: u32, @@ -715,7 +715,7 @@ fn call_expand() { assert_eq!( call_foo.get_dispatch_info(), DispatchInfo { - weight: frame_support::weights::Weight::from_ref_time(3), + weight: frame_support::weights::Weight::from_parts(3, 0), class: DispatchClass::Normal, pays_fee: Pays::Yes } @@ -1096,10 +1096,10 @@ fn pallet_hooks_expand() { TestExternalities::default().execute_with(|| { frame_system::Pallet::::set_block_number(1); - assert_eq!(AllPalletsWithoutSystem::on_initialize(1), Weight::from_ref_time(10)); + assert_eq!(AllPalletsWithoutSystem::on_initialize(1), Weight::from_parts(10, 0)); AllPalletsWithoutSystem::on_finalize(1); - assert_eq!(AllPalletsWithoutSystem::on_runtime_upgrade(), Weight::from_ref_time(30)); + assert_eq!(AllPalletsWithoutSystem::on_runtime_upgrade(), Weight::from_parts(30, 0)); assert_eq!( frame_system::Pallet::::events()[0].event, @@ -1137,13 +1137,13 @@ fn all_pallets_type_reversed_order_is_correct() { { assert_eq!( AllPalletsWithoutSystemReversed::on_initialize(1), - Weight::from_ref_time(10) + Weight::from_parts(10, 0) ); AllPalletsWithoutSystemReversed::on_finalize(1); assert_eq!( AllPalletsWithoutSystemReversed::on_runtime_upgrade(), - Weight::from_ref_time(30) + Weight::from_parts(30, 0) ); } @@ -1219,7 +1219,7 @@ fn migrate_from_pallet_version_to_storage_version() { }; // `pallet_num` pallets, 2 writes and every write costs 5 weight. - assert_eq!(Weight::from_ref_time(pallet_num * 2 * 5), weight); + assert_eq!(Weight::from_parts(pallet_num * 2 * 5, 0), weight); // All pallet versions should be removed assert!(sp_io::storage::get(&pallet_version_key(Example::name())).is_none()); diff --git a/frame/support/test/tests/pallet_compatibility.rs b/frame/support/test/tests/pallet_compatibility.rs index 8b0573398bd1d..bd11d0da3ca65 100644 --- a/frame/support/test/tests/pallet_compatibility.rs +++ b/frame/support/test/tests/pallet_compatibility.rs @@ -85,7 +85,7 @@ mod pallet_old { fn on_initialize(_n: T::BlockNumber) -> Weight { >::put(T::Balance::from(10)); - Weight::from_ref_time(10) + Weight::from_parts(10, 0) } fn on_finalize(_n: T::BlockNumber) { @@ -131,7 +131,7 @@ pub mod pallet { impl Hooks for Pallet { fn on_initialize(_n: T::BlockNumber) -> Weight { >::put(T::Balance::from(10)); - Weight::from_ref_time(10) + Weight::from_parts(10, 0) } fn on_finalize(_n: T::BlockNumber) { diff --git a/frame/support/test/tests/pallet_compatibility_instance.rs b/frame/support/test/tests/pallet_compatibility_instance.rs index 5cc1c1f4478e7..1d2705b12ff31 100644 --- a/frame/support/test/tests/pallet_compatibility_instance.rs +++ b/frame/support/test/tests/pallet_compatibility_instance.rs @@ -72,7 +72,7 @@ mod pallet_old { fn on_initialize(_n: T::BlockNumber) -> Weight { >::put(T::Balance::from(10)); - Weight::from_ref_time(10) + Weight::from_parts(10, 0) } fn on_finalize(_n: T::BlockNumber) { @@ -117,7 +117,7 @@ pub mod pallet { impl, I: 'static> Hooks for Pallet { fn on_initialize(_n: T::BlockNumber) -> Weight { >::put(T::Balance::from(10)); - Weight::from_ref_time(10) + Weight::from_parts(10, 0) } fn on_finalize(_n: T::BlockNumber) { diff --git a/frame/support/test/tests/pallet_instance.rs b/frame/support/test/tests/pallet_instance.rs index ea1e27fe9f348..6dc73a6d4230f 100644 --- a/frame/support/test/tests/pallet_instance.rs +++ b/frame/support/test/tests/pallet_instance.rs @@ -54,10 +54,10 @@ pub mod pallet { fn on_initialize(_: BlockNumberFor) -> Weight { if TypeId::of::() == TypeId::of::<()>() { Self::deposit_event(Event::Something(10)); - Weight::from_ref_time(10) + Weight::from_parts(10, 0) } else { Self::deposit_event(Event::Something(11)); - Weight::from_ref_time(11) + Weight::from_parts(11, 0) } } fn on_finalize(_: BlockNumberFor) { @@ -70,10 +70,10 @@ pub mod pallet { fn on_runtime_upgrade() -> Weight { if TypeId::of::() == TypeId::of::<()>() { Self::deposit_event(Event::Something(30)); - Weight::from_ref_time(30) + Weight::from_parts(30, 0) } else { Self::deposit_event(Event::Something(31)); - Weight::from_ref_time(31) + Weight::from_parts(31, 0) } } fn integrity_test() {} @@ -83,7 +83,7 @@ pub mod pallet { impl, I: 'static> Pallet { /// Doc comment put in metadata #[pallet::call_index(0)] - #[pallet::weight(Weight::from_ref_time(*_foo as u64))] + #[pallet::weight(Weight::from_parts(*_foo as u64, 0))] pub fn foo( origin: OriginFor, #[pallet::compact] _foo: u32, @@ -356,7 +356,7 @@ fn call_expand() { assert_eq!( call_foo.get_dispatch_info(), DispatchInfo { - weight: Weight::from_ref_time(3), + weight: Weight::from_parts(3, 0), class: DispatchClass::Normal, pays_fee: Pays::Yes } @@ -368,7 +368,7 @@ fn call_expand() { assert_eq!( call_foo.get_dispatch_info(), DispatchInfo { - weight: Weight::from_ref_time(3), + weight: Weight::from_parts(3, 0), class: DispatchClass::Normal, pays_fee: Pays::Yes } @@ -649,10 +649,10 @@ fn pallet_hooks_expand() { TestExternalities::default().execute_with(|| { frame_system::Pallet::::set_block_number(1); - assert_eq!(AllPalletsWithoutSystem::on_initialize(1), Weight::from_ref_time(21)); + assert_eq!(AllPalletsWithoutSystem::on_initialize(1), Weight::from_parts(21, 0)); AllPalletsWithoutSystem::on_finalize(1); - assert_eq!(AllPalletsWithoutSystem::on_runtime_upgrade(), Weight::from_ref_time(61)); + assert_eq!(AllPalletsWithoutSystem::on_runtime_upgrade(), Weight::from_parts(61, 0)); assert_eq!( frame_system::Pallet::::events()[0].event, diff --git a/frame/system/src/extensions/check_mortality.rs b/frame/system/src/extensions/check_mortality.rs index 739a27a2ae139..23c357d481350 100644 --- a/frame/system/src/extensions/check_mortality.rs +++ b/frame/system/src/extensions/check_mortality.rs @@ -130,7 +130,7 @@ mod tests { fn signed_ext_check_era_should_change_longevity() { new_test_ext().execute_with(|| { let normal = DispatchInfo { - weight: Weight::from_ref_time(100), + weight: Weight::from_parts(100, 0), class: DispatchClass::Normal, pays_fee: Pays::Yes, }; diff --git a/frame/system/src/extensions/check_weight.rs b/frame/system/src/extensions/check_weight.rs index ca5f7a82c0e8b..1030c8daf7b04 100644 --- a/frame/system/src/extensions/check_weight.rs +++ b/frame/system/src/extensions/check_weight.rs @@ -308,7 +308,7 @@ mod tests { new_test_ext().execute_with(|| { let max = DispatchInfo { weight: block_weights().get(DispatchClass::Normal).max_extrinsic.unwrap() + - Weight::from_ref_time(1), + Weight::from_parts(1, 0), class: DispatchClass::Normal, ..Default::default() }; @@ -334,7 +334,7 @@ mod tests { let okay = DispatchInfo { weight, class: DispatchClass::Operational, ..Default::default() }; let max = DispatchInfo { - weight: weight + Weight::from_ref_time(1), + weight: weight + Weight::from_parts(1, 0), class: DispatchClass::Operational, ..Default::default() }; @@ -366,9 +366,9 @@ mod tests { // So normal extrinsic can be 758 weight (-5 for base extrinsic weight) // And Operational can be 246 to produce a full block (-10 for base) let max_normal = - DispatchInfo { weight: Weight::from_ref_time(753), ..Default::default() }; + DispatchInfo { weight: Weight::from_parts(753, 0), ..Default::default() }; let rest_operational = DispatchInfo { - weight: Weight::from_ref_time(246), + weight: Weight::from_parts(246, 0), class: DispatchClass::Operational, ..Default::default() }; @@ -376,9 +376,9 @@ mod tests { let len = 0_usize; assert_ok!(CheckWeight::::do_pre_dispatch(&max_normal, len)); - assert_eq!(System::block_weight().total(), Weight::from_ref_time(768)); + assert_eq!(System::block_weight().total(), Weight::from_parts(768, 0)); assert_ok!(CheckWeight::::do_pre_dispatch(&rest_operational, len)); - assert_eq!(block_weight_limit(), Weight::from_ref_time(1024).set_proof_size(u64::MAX)); + assert_eq!(block_weight_limit(), Weight::from_parts(1024, u64::MAX)); assert_eq!(System::block_weight().total(), block_weight_limit().set_proof_size(0)); // Checking single extrinsic should not take current block weight into account. assert_eq!(CheckWeight::::check_extrinsic_weight(&rest_operational), Ok(())); @@ -390,9 +390,9 @@ mod tests { new_test_ext().execute_with(|| { // We switch the order of `full_block_with_normal_and_operational` let max_normal = - DispatchInfo { weight: Weight::from_ref_time(753), ..Default::default() }; + DispatchInfo { weight: Weight::from_parts(753, 0), ..Default::default() }; let rest_operational = DispatchInfo { - weight: Weight::from_ref_time(246), + weight: Weight::from_parts(246, 0), class: DispatchClass::Operational, ..Default::default() }; @@ -401,9 +401,9 @@ mod tests { assert_ok!(CheckWeight::::do_pre_dispatch(&rest_operational, len)); // Extra 20 here from block execution + base extrinsic weight - assert_eq!(System::block_weight().total(), Weight::from_ref_time(266)); + assert_eq!(System::block_weight().total(), Weight::from_parts(266, 0)); assert_ok!(CheckWeight::::do_pre_dispatch(&max_normal, len)); - assert_eq!(block_weight_limit(), Weight::from_ref_time(1024).set_proof_size(u64::MAX)); + assert_eq!(block_weight_limit(), Weight::from_parts(1024, u64::MAX)); assert_eq!(System::block_weight().total(), block_weight_limit().set_proof_size(0)); }); } @@ -414,12 +414,12 @@ mod tests { // An on_initialize takes up the whole block! (Every time!) System::register_extra_weight_unchecked(Weight::MAX, DispatchClass::Mandatory); let dispatch_normal = DispatchInfo { - weight: Weight::from_ref_time(251), + weight: Weight::from_parts(251, 0), class: DispatchClass::Normal, ..Default::default() }; let dispatch_operational = DispatchInfo { - weight: Weight::from_ref_time(246), + weight: Weight::from_parts(246, 0), class: DispatchClass::Operational, ..Default::default() }; @@ -445,9 +445,9 @@ mod tests { #[test] fn signed_ext_check_weight_works_operational_tx() { new_test_ext().execute_with(|| { - let normal = DispatchInfo { weight: Weight::from_ref_time(100), ..Default::default() }; + let normal = DispatchInfo { weight: Weight::from_parts(100, 0), ..Default::default() }; let op = DispatchInfo { - weight: Weight::from_ref_time(100), + weight: Weight::from_parts(100, 0), class: DispatchClass::Operational, pays_fee: Pays::Yes, }; @@ -513,12 +513,12 @@ mod tests { fn signed_ext_check_weight_works_normal_tx() { new_test_ext().execute_with(|| { let normal_limit = normal_weight_limit(); - let small = DispatchInfo { weight: Weight::from_ref_time(100), ..Default::default() }; + let small = DispatchInfo { weight: Weight::from_parts(100, 0), ..Default::default() }; let base_extrinsic = block_weights().get(DispatchClass::Normal).base_extrinsic; let medium = DispatchInfo { weight: normal_limit - base_extrinsic, ..Default::default() }; let big = DispatchInfo { - weight: normal_limit - base_extrinsic + Weight::from_ref_time(1), + weight: normal_limit - base_extrinsic + Weight::from_parts(1, 0), ..Default::default() }; let len = 0_usize; @@ -537,7 +537,7 @@ mod tests { reset_check_weight(&small, false, Weight::zero()); reset_check_weight(&medium, false, Weight::zero()); - reset_check_weight(&big, true, Weight::from_ref_time(1)); + reset_check_weight(&big, true, Weight::from_parts(1, 0)); }) } @@ -545,9 +545,9 @@ mod tests { fn signed_ext_check_weight_refund_works() { new_test_ext().execute_with(|| { // This is half of the max block weight - let info = DispatchInfo { weight: Weight::from_ref_time(512), ..Default::default() }; + let info = DispatchInfo { weight: Weight::from_parts(512, 0), ..Default::default() }; let post_info = PostDispatchInfo { - actual_weight: Some(Weight::from_ref_time(128)), + actual_weight: Some(Weight::from_parts(128, 0)), pays_fee: Default::default(), }; let len = 0_usize; @@ -557,13 +557,13 @@ mod tests { BlockWeight::::mutate(|current_weight| { current_weight.set(Weight::zero(), DispatchClass::Mandatory); current_weight - .set(Weight::from_ref_time(256) - base_extrinsic, DispatchClass::Normal); + .set(Weight::from_parts(256, 0) - base_extrinsic, DispatchClass::Normal); }); let pre = CheckWeight::(PhantomData).pre_dispatch(&1, CALL, &info, len).unwrap(); assert_eq!( BlockWeight::::get().total(), - info.weight + Weight::from_ref_time(256) + info.weight + Weight::from_parts(256, 0) ); assert_ok!(CheckWeight::::post_dispatch( @@ -575,7 +575,7 @@ mod tests { )); assert_eq!( BlockWeight::::get().total(), - post_info.actual_weight.unwrap() + Weight::from_ref_time(256) + post_info.actual_weight.unwrap() + Weight::from_parts(256, 0) ); }) } @@ -583,23 +583,23 @@ mod tests { #[test] fn signed_ext_check_weight_actual_weight_higher_than_max_is_capped() { new_test_ext().execute_with(|| { - let info = DispatchInfo { weight: Weight::from_ref_time(512), ..Default::default() }; + let info = DispatchInfo { weight: Weight::from_parts(512, 0), ..Default::default() }; let post_info = PostDispatchInfo { - actual_weight: Some(Weight::from_ref_time(700)), + actual_weight: Some(Weight::from_parts(700, 0)), pays_fee: Default::default(), }; let len = 0_usize; BlockWeight::::mutate(|current_weight| { current_weight.set(Weight::zero(), DispatchClass::Mandatory); - current_weight.set(Weight::from_ref_time(128), DispatchClass::Normal); + current_weight.set(Weight::from_parts(128, 0), DispatchClass::Normal); }); let pre = CheckWeight::(PhantomData).pre_dispatch(&1, CALL, &info, len).unwrap(); assert_eq!( BlockWeight::::get().total(), info.weight + - Weight::from_ref_time(128) + + Weight::from_parts(128, 0) + block_weights().get(DispatchClass::Normal).base_extrinsic, ); @@ -613,7 +613,7 @@ mod tests { assert_eq!( BlockWeight::::get().total(), info.weight + - Weight::from_ref_time(128) + + Weight::from_parts(128, 0) + block_weights().get(DispatchClass::Normal).base_extrinsic, ); }) @@ -643,9 +643,9 @@ mod tests { // Max normal is 768 (75%) // Max mandatory is unlimited let max_normal = - DispatchInfo { weight: Weight::from_ref_time(753), ..Default::default() }; + DispatchInfo { weight: Weight::from_parts(753, 0), ..Default::default() }; let mandatory = DispatchInfo { - weight: Weight::from_ref_time(1019), + weight: Weight::from_parts(1019, 0), class: DispatchClass::Mandatory, ..Default::default() }; @@ -653,10 +653,10 @@ mod tests { let len = 0_usize; assert_ok!(CheckWeight::::do_pre_dispatch(&max_normal, len)); - assert_eq!(System::block_weight().total(), Weight::from_ref_time(768)); + assert_eq!(System::block_weight().total(), Weight::from_parts(768, 0)); assert_ok!(CheckWeight::::do_pre_dispatch(&mandatory, len)); - assert_eq!(block_weight_limit(), Weight::from_ref_time(1024).set_proof_size(u64::MAX)); - assert_eq!(System::block_weight().total(), Weight::from_ref_time(1024 + 768)); + assert_eq!(block_weight_limit(), Weight::from_parts(1024, u64::MAX)); + assert_eq!(System::block_weight().total(), Weight::from_parts(1024 + 768, 0)); assert_eq!(CheckWeight::::check_extrinsic_weight(&mandatory), Ok(())); }); } @@ -668,30 +668,30 @@ mod tests { .base_block(Weight::zero()) .for_class(DispatchClass::non_mandatory(), |w| { w.base_extrinsic = Weight::zero(); - w.max_total = Some(Weight::from_ref_time(20).set_proof_size(u64::MAX)); + w.max_total = Some(Weight::from_parts(20, u64::MAX)); }) .for_class(DispatchClass::Mandatory, |w| { w.base_extrinsic = Weight::zero(); - w.reserved = Some(Weight::from_ref_time(5).set_proof_size(u64::MAX)); + w.reserved = Some(Weight::from_parts(5, u64::MAX)); w.max_total = None; }) .build_or_panic(); let all_weight = crate::ConsumedWeight::new(|class| match class { - DispatchClass::Normal => Weight::from_ref_time(10), - DispatchClass::Operational => Weight::from_ref_time(10), + DispatchClass::Normal => Weight::from_parts(10, 0), + DispatchClass::Operational => Weight::from_parts(10, 0), DispatchClass::Mandatory => Weight::zero(), }); assert_eq!(maximum_weight.max_block, all_weight.total().set_proof_size(u64::MAX)); // fits into reserved let mandatory1 = DispatchInfo { - weight: Weight::from_ref_time(5), + weight: Weight::from_parts(5, 0), class: DispatchClass::Mandatory, ..Default::default() }; // does not fit into reserved and the block is full. let mandatory2 = DispatchInfo { - weight: Weight::from_ref_time(6), + weight: Weight::from_parts(6, 0), class: DispatchClass::Mandatory, ..Default::default() }; diff --git a/frame/system/src/mock.rs b/frame/system/src/mock.rs index a3807512dedcb..83e12dccaa165 100644 --- a/frame/system/src/mock.rs +++ b/frame/system/src/mock.rs @@ -41,7 +41,7 @@ frame_support::construct_runtime!( ); const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75); -const MAX_BLOCK_WEIGHT: Weight = Weight::from_ref_time(1024).set_proof_size(u64::MAX); +const MAX_BLOCK_WEIGHT: Weight = Weight::from_parts(1024, u64::MAX); parameter_types! { pub Version: RuntimeVersion = RuntimeVersion { @@ -59,15 +59,15 @@ parameter_types! { write: 100, }; pub RuntimeBlockWeights: limits::BlockWeights = limits::BlockWeights::builder() - .base_block(Weight::from_ref_time(10)) + .base_block(Weight::from_parts(10, 0)) .for_class(DispatchClass::all(), |weights| { - weights.base_extrinsic = Weight::from_ref_time(5); + weights.base_extrinsic = Weight::from_parts(5, 0); }) .for_class(DispatchClass::Normal, |weights| { weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAX_BLOCK_WEIGHT); }) .for_class(DispatchClass::Operational, |weights| { - weights.base_extrinsic = Weight::from_ref_time(10); + weights.base_extrinsic = Weight::from_parts(10, 0); weights.max_total = Some(MAX_BLOCK_WEIGHT); weights.reserved = Some( MAX_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAX_BLOCK_WEIGHT diff --git a/frame/system/src/tests.rs b/frame/system/src/tests.rs index 3e24d8f3c2fe4..ebb28ca87bbd8 100644 --- a/frame/system/src/tests.rs +++ b/frame/system/src/tests.rs @@ -233,7 +233,7 @@ fn deposit_event_uses_actual_weight_and_pays_fee() { let normal_base = ::BlockWeights::get() .get(DispatchClass::Normal) .base_extrinsic; - let pre_info = DispatchInfo { weight: Weight::from_ref_time(1000), ..Default::default() }; + let pre_info = DispatchInfo { weight: Weight::from_parts(1000, 0), ..Default::default() }; System::note_applied_extrinsic(&Ok(Some(300).into()), pre_info); System::note_applied_extrinsic(&Ok(Some(1000).into()), pre_info); System::note_applied_extrinsic( @@ -246,7 +246,7 @@ fn deposit_event_uses_actual_weight_and_pays_fee() { System::note_applied_extrinsic(&Ok((Some(2_500_000), Pays::No).into()), pre_info); System::note_applied_extrinsic(&Ok((Some(500), Pays::No).into()), pre_info); System::note_applied_extrinsic( - &Err(DispatchError::BadOrigin.with_weight(Weight::from_ref_time(999))), + &Err(DispatchError::BadOrigin.with_weight(Weight::from_parts(999, 0))), pre_info, ); @@ -260,7 +260,7 @@ fn deposit_event_uses_actual_weight_and_pays_fee() { System::note_applied_extrinsic( &Err(DispatchErrorWithPostInfo { post_info: PostDispatchInfo { - actual_weight: Some(Weight::from_ref_time(800)), + actual_weight: Some(Weight::from_parts(800, 0)), pays_fee: Pays::Yes, }, error: DispatchError::BadOrigin, @@ -270,7 +270,7 @@ fn deposit_event_uses_actual_weight_and_pays_fee() { System::note_applied_extrinsic( &Err(DispatchErrorWithPostInfo { post_info: PostDispatchInfo { - actual_weight: Some(Weight::from_ref_time(800)), + actual_weight: Some(Weight::from_parts(800, 0)), pays_fee: Pays::No, }, error: DispatchError::BadOrigin, @@ -283,7 +283,7 @@ fn deposit_event_uses_actual_weight_and_pays_fee() { .base_extrinsic; assert!(normal_base != operational_base, "Test pre-condition violated"); let pre_info = DispatchInfo { - weight: Weight::from_ref_time(1000), + weight: Weight::from_parts(1000, 0), class: DispatchClass::Operational, ..Default::default() }; @@ -295,7 +295,7 @@ fn deposit_event_uses_actual_weight_and_pays_fee() { phase: Phase::ApplyExtrinsic(0), event: SysEvent::ExtrinsicSuccess { dispatch_info: DispatchInfo { - weight: Weight::from_ref_time(300).saturating_add(normal_base), + weight: Weight::from_parts(300, 0).saturating_add(normal_base), ..Default::default() }, } @@ -306,7 +306,7 @@ fn deposit_event_uses_actual_weight_and_pays_fee() { phase: Phase::ApplyExtrinsic(1), event: SysEvent::ExtrinsicSuccess { dispatch_info: DispatchInfo { - weight: Weight::from_ref_time(1000).saturating_add(normal_base), + weight: Weight::from_parts(1000, 0).saturating_add(normal_base), ..Default::default() }, } @@ -317,7 +317,7 @@ fn deposit_event_uses_actual_weight_and_pays_fee() { phase: Phase::ApplyExtrinsic(2), event: SysEvent::ExtrinsicSuccess { dispatch_info: DispatchInfo { - weight: Weight::from_ref_time(1000).saturating_add(normal_base), + weight: Weight::from_parts(1000, 0).saturating_add(normal_base), ..Default::default() }, } @@ -328,7 +328,7 @@ fn deposit_event_uses_actual_weight_and_pays_fee() { phase: Phase::ApplyExtrinsic(3), event: SysEvent::ExtrinsicSuccess { dispatch_info: DispatchInfo { - weight: Weight::from_ref_time(1000).saturating_add(normal_base), + weight: Weight::from_parts(1000, 0).saturating_add(normal_base), pays_fee: Pays::Yes, ..Default::default() }, @@ -340,7 +340,7 @@ fn deposit_event_uses_actual_weight_and_pays_fee() { phase: Phase::ApplyExtrinsic(4), event: SysEvent::ExtrinsicSuccess { dispatch_info: DispatchInfo { - weight: Weight::from_ref_time(1000).saturating_add(normal_base), + weight: Weight::from_parts(1000, 0).saturating_add(normal_base), pays_fee: Pays::No, ..Default::default() }, @@ -352,7 +352,7 @@ fn deposit_event_uses_actual_weight_and_pays_fee() { phase: Phase::ApplyExtrinsic(5), event: SysEvent::ExtrinsicSuccess { dispatch_info: DispatchInfo { - weight: Weight::from_ref_time(1000).saturating_add(normal_base), + weight: Weight::from_parts(1000, 0).saturating_add(normal_base), pays_fee: Pays::No, ..Default::default() }, @@ -364,7 +364,7 @@ fn deposit_event_uses_actual_weight_and_pays_fee() { phase: Phase::ApplyExtrinsic(6), event: SysEvent::ExtrinsicSuccess { dispatch_info: DispatchInfo { - weight: Weight::from_ref_time(500).saturating_add(normal_base), + weight: Weight::from_parts(500, 0).saturating_add(normal_base), pays_fee: Pays::No, ..Default::default() }, @@ -377,7 +377,7 @@ fn deposit_event_uses_actual_weight_and_pays_fee() { event: SysEvent::ExtrinsicFailed { dispatch_error: DispatchError::BadOrigin.into(), dispatch_info: DispatchInfo { - weight: Weight::from_ref_time(999).saturating_add(normal_base), + weight: Weight::from_parts(999, 0).saturating_add(normal_base), ..Default::default() }, } @@ -389,7 +389,7 @@ fn deposit_event_uses_actual_weight_and_pays_fee() { event: SysEvent::ExtrinsicFailed { dispatch_error: DispatchError::BadOrigin.into(), dispatch_info: DispatchInfo { - weight: Weight::from_ref_time(1000).saturating_add(normal_base), + weight: Weight::from_parts(1000, 0).saturating_add(normal_base), pays_fee: Pays::Yes, ..Default::default() }, @@ -402,7 +402,7 @@ fn deposit_event_uses_actual_weight_and_pays_fee() { event: SysEvent::ExtrinsicFailed { dispatch_error: DispatchError::BadOrigin.into(), dispatch_info: DispatchInfo { - weight: Weight::from_ref_time(800).saturating_add(normal_base), + weight: Weight::from_parts(800, 0).saturating_add(normal_base), pays_fee: Pays::Yes, ..Default::default() }, @@ -415,7 +415,7 @@ fn deposit_event_uses_actual_weight_and_pays_fee() { event: SysEvent::ExtrinsicFailed { dispatch_error: DispatchError::BadOrigin.into(), dispatch_info: DispatchInfo { - weight: Weight::from_ref_time(800).saturating_add(normal_base), + weight: Weight::from_parts(800, 0).saturating_add(normal_base), pays_fee: Pays::No, ..Default::default() }, @@ -427,7 +427,7 @@ fn deposit_event_uses_actual_weight_and_pays_fee() { phase: Phase::ApplyExtrinsic(11), event: SysEvent::ExtrinsicSuccess { dispatch_info: DispatchInfo { - weight: Weight::from_ref_time(300).saturating_add(operational_base), + weight: Weight::from_parts(300, 0).saturating_add(operational_base), class: DispatchClass::Operational, ..Default::default() }, diff --git a/frame/system/src/weights.rs b/frame/system/src/weights.rs index fa77db90d0c96..812f2d091fcfe 100644 --- a/frame/system/src/weights.rs +++ b/frame/system/src/weights.rs @@ -65,9 +65,9 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 2_018 nanoseconds. - Weight::from_ref_time(2_091_000) + Weight::from_parts(2_091_000, 0) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(362).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(362, 0).saturating_mul(b.into())) } /// The range of component `b` is `[0, 3932160]`. fn remark_with_event(b: u32, ) -> Weight { @@ -75,9 +75,9 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 7_449 nanoseconds. - Weight::from_ref_time(7_748_000) + Weight::from_parts(7_748_000, 0) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_423).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(1_423, 0).saturating_mul(b.into())) } /// Storage: System Digest (r:1 w:1) /// Proof Skipped: System Digest (max_values: Some(1), max_size: None, mode: Measured) @@ -100,9 +100,9 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 1_981 nanoseconds. - Weight::from_ref_time(2_114_000) + Weight::from_parts(2_114_000, 0) // Standard Error: 804 - .saturating_add(Weight::from_ref_time(631_438).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(631_438, 0).saturating_mul(i.into())) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into()))) } /// Storage: Skipped Metadata (r:0 w:0) @@ -113,9 +113,9 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 2_061 nanoseconds. - Weight::from_ref_time(2_153_000) + Weight::from_parts(2_153_000, 0) // Standard Error: 952 - .saturating_add(Weight::from_ref_time(502_629).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(502_629, 0).saturating_mul(i.into())) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into()))) } /// Storage: Skipped Metadata (r:0 w:0) @@ -128,9 +128,9 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 4_026 nanoseconds. Weight::from_parts(4_174_000, 121) // Standard Error: 1_148 - .saturating_add(Weight::from_ref_time(1_093_099).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(1_093_099, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into()))) - .saturating_add(Weight::from_proof_size(70).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 70).saturating_mul(p.into())) } } @@ -142,9 +142,9 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 2_018 nanoseconds. - Weight::from_ref_time(2_091_000) + Weight::from_parts(2_091_000, 0) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(362).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(362, 0).saturating_mul(b.into())) } /// The range of component `b` is `[0, 3932160]`. fn remark_with_event(b: u32, ) -> Weight { @@ -152,9 +152,9 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 7_449 nanoseconds. - Weight::from_ref_time(7_748_000) + Weight::from_parts(7_748_000, 0) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_423).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(1_423, 0).saturating_mul(b.into())) } /// Storage: System Digest (r:1 w:1) /// Proof Skipped: System Digest (max_values: Some(1), max_size: None, mode: Measured) @@ -177,9 +177,9 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 1_981 nanoseconds. - Weight::from_ref_time(2_114_000) + Weight::from_parts(2_114_000, 0) // Standard Error: 804 - .saturating_add(Weight::from_ref_time(631_438).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(631_438, 0).saturating_mul(i.into())) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(i.into()))) } /// Storage: Skipped Metadata (r:0 w:0) @@ -190,9 +190,9 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 2_061 nanoseconds. - Weight::from_ref_time(2_153_000) + Weight::from_parts(2_153_000, 0) // Standard Error: 952 - .saturating_add(Weight::from_ref_time(502_629).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(502_629, 0).saturating_mul(i.into())) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(i.into()))) } /// Storage: Skipped Metadata (r:0 w:0) @@ -205,8 +205,8 @@ impl WeightInfo for () { // Minimum execution time: 4_026 nanoseconds. Weight::from_parts(4_174_000, 121) // Standard Error: 1_148 - .saturating_add(Weight::from_ref_time(1_093_099).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(1_093_099, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(p.into()))) - .saturating_add(Weight::from_proof_size(70).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 70).saturating_mul(p.into())) } } diff --git a/frame/timestamp/src/weights.rs b/frame/timestamp/src/weights.rs index 8c7ef0d1f1afe..943f941d55305 100644 --- a/frame/timestamp/src/weights.rs +++ b/frame/timestamp/src/weights.rs @@ -73,7 +73,7 @@ impl WeightInfo for SubstrateWeight { // Measured: `161` // Estimated: `0` // Minimum execution time: 3_927 nanoseconds. - Weight::from_ref_time(4_078_000) + Weight::from_parts(4_078_000, 0) } } @@ -97,6 +97,6 @@ impl WeightInfo for () { // Measured: `161` // Estimated: `0` // Minimum execution time: 3_927 nanoseconds. - Weight::from_ref_time(4_078_000) + Weight::from_parts(4_078_000, 0) } } diff --git a/frame/tips/src/weights.rs b/frame/tips/src/weights.rs index 41fdf4928833c..2b265d7879712 100644 --- a/frame/tips/src/weights.rs +++ b/frame/tips/src/weights.rs @@ -71,7 +71,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 23_262 nanoseconds. Weight::from_parts(24_104_224, 4958) // Standard Error: 148 - .saturating_add(Weight::from_ref_time(1_963).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_963, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -103,12 +103,12 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 18_382 nanoseconds. Weight::from_parts(18_195_288, 4644) // Standard Error: 103 - .saturating_add(Weight::from_ref_time(2_096).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(2_096, 0).saturating_mul(r.into())) // Standard Error: 2_469 - .saturating_add(Weight::from_ref_time(97_092).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(97_092, 0).saturating_mul(t.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) - .saturating_add(Weight::from_proof_size(192).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(0, 192).saturating_mul(t.into())) } /// Storage: Elections Members (r:1 w:0) /// Proof Skipped: Elections Members (max_values: Some(1), max_size: None, mode: Measured) @@ -122,10 +122,10 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 13_564 nanoseconds. Weight::from_parts(13_867_280, 4592) // Standard Error: 4_245 - .saturating_add(Weight::from_ref_time(206_587).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(206_587, 0).saturating_mul(t.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(224).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(0, 224).saturating_mul(t.into())) } /// Storage: Tips Tips (r:1 w:1) /// Proof Skipped: Tips Tips (max_values: None, max_size: None, mode: Measured) @@ -143,10 +143,10 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 39_902 nanoseconds. Weight::from_parts(40_747_650, 8096) // Standard Error: 5_322 - .saturating_add(Weight::from_ref_time(144_298).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(144_298, 0).saturating_mul(t.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(336).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(0, 336).saturating_mul(t.into())) } /// Storage: Tips Tips (r:1 w:1) /// Proof Skipped: Tips Tips (max_values: None, max_size: None, mode: Measured) @@ -160,7 +160,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 13_511 nanoseconds. Weight::from_parts(14_114_101, 3077) // Standard Error: 1_815 - .saturating_add(Weight::from_ref_time(7_825).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(7_825, 0).saturating_mul(t.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -180,7 +180,7 @@ impl WeightInfo for () { // Minimum execution time: 23_262 nanoseconds. Weight::from_parts(24_104_224, 4958) // Standard Error: 148 - .saturating_add(Weight::from_ref_time(1_963).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(1_963, 0).saturating_mul(r.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -212,12 +212,12 @@ impl WeightInfo for () { // Minimum execution time: 18_382 nanoseconds. Weight::from_parts(18_195_288, 4644) // Standard Error: 103 - .saturating_add(Weight::from_ref_time(2_096).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(2_096, 0).saturating_mul(r.into())) // Standard Error: 2_469 - .saturating_add(Weight::from_ref_time(97_092).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(97_092, 0).saturating_mul(t.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) - .saturating_add(Weight::from_proof_size(192).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(0, 192).saturating_mul(t.into())) } /// Storage: Elections Members (r:1 w:0) /// Proof Skipped: Elections Members (max_values: Some(1), max_size: None, mode: Measured) @@ -231,10 +231,10 @@ impl WeightInfo for () { // Minimum execution time: 13_564 nanoseconds. Weight::from_parts(13_867_280, 4592) // Standard Error: 4_245 - .saturating_add(Weight::from_ref_time(206_587).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(206_587, 0).saturating_mul(t.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_proof_size(224).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(0, 224).saturating_mul(t.into())) } /// Storage: Tips Tips (r:1 w:1) /// Proof Skipped: Tips Tips (max_values: None, max_size: None, mode: Measured) @@ -252,10 +252,10 @@ impl WeightInfo for () { // Minimum execution time: 39_902 nanoseconds. Weight::from_parts(40_747_650, 8096) // Standard Error: 5_322 - .saturating_add(Weight::from_ref_time(144_298).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(144_298, 0).saturating_mul(t.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(336).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(0, 336).saturating_mul(t.into())) } /// Storage: Tips Tips (r:1 w:1) /// Proof Skipped: Tips Tips (max_values: None, max_size: None, mode: Measured) @@ -269,7 +269,7 @@ impl WeightInfo for () { // Minimum execution time: 13_511 nanoseconds. Weight::from_parts(14_114_101, 3077) // Standard Error: 1_815 - .saturating_add(Weight::from_ref_time(7_825).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(7_825, 0).saturating_mul(t.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } diff --git a/frame/transaction-payment/asset-tx-payment/src/mock.rs b/frame/transaction-payment/asset-tx-payment/src/mock.rs index ada4777cfe719..bc994b4dce2cb 100644 --- a/frame/transaction-payment/asset-tx-payment/src/mock.rs +++ b/frame/transaction-payment/asset-tx-payment/src/mock.rs @@ -67,7 +67,7 @@ impl Get for BlockWeights { weights.base_extrinsic = ExtrinsicBaseWeight::get().into(); }) .for_class(DispatchClass::non_mandatory(), |weights| { - weights.max_total = Weight::from_ref_time(1024).set_proof_size(u64::MAX).into(); + weights.max_total = Weight::from_parts(1024, u64::MAX).into(); }) .build_or_panic() } diff --git a/frame/transaction-payment/asset-tx-payment/src/tests.rs b/frame/transaction-payment/asset-tx-payment/src/tests.rs index 08699fef032e8..cd9891825db32 100644 --- a/frame/transaction-payment/asset-tx-payment/src/tests.rs +++ b/frame/transaction-payment/asset-tx-payment/src/tests.rs @@ -41,7 +41,7 @@ impl Default for ExtBuilder { fn default() -> Self { Self { balance_factor: 1, - base_weight: Weight::from_ref_time(0), + base_weight: Weight::from_parts(0, 0), byte_fee: 1, weight_to_fee: 1, } @@ -112,19 +112,19 @@ fn transaction_payment_in_native_possible() { let balance_factor = 100; ExtBuilder::default() .balance_factor(balance_factor) - .base_weight(Weight::from_ref_time(5)) + .base_weight(Weight::from_parts(5, 0)) .build() .execute_with(|| { let len = 10; let pre = ChargeAssetTxPayment::::from(0, None) - .pre_dispatch(&1, CALL, &info_from_weight(Weight::from_ref_time(5)), len) + .pre_dispatch(&1, CALL, &info_from_weight(Weight::from_parts(5, 0)), len) .unwrap(); let initial_balance = 10 * balance_factor; assert_eq!(Balances::free_balance(1), initial_balance - 5 - 5 - 10); assert_ok!(ChargeAssetTxPayment::::post_dispatch( Some(pre), - &info_from_weight(Weight::from_ref_time(5)), + &info_from_weight(Weight::from_parts(5, 0)), &default_post_info(), len, &Ok(()) @@ -132,15 +132,15 @@ fn transaction_payment_in_native_possible() { assert_eq!(Balances::free_balance(1), initial_balance - 5 - 5 - 10); let pre = ChargeAssetTxPayment::::from(5 /* tipped */, None) - .pre_dispatch(&2, CALL, &info_from_weight(Weight::from_ref_time(100)), len) + .pre_dispatch(&2, CALL, &info_from_weight(Weight::from_parts(100, 0)), len) .unwrap(); let initial_balance_for_2 = 20 * balance_factor; assert_eq!(Balances::free_balance(2), initial_balance_for_2 - 5 - 10 - 100 - 5); assert_ok!(ChargeAssetTxPayment::::post_dispatch( Some(pre), - &info_from_weight(Weight::from_ref_time(100)), - &post_info_from_weight(Weight::from_ref_time(50)), + &info_from_weight(Weight::from_parts(100, 0)), + &post_info_from_weight(Weight::from_parts(50, 0)), len, &Ok(()) )); @@ -154,7 +154,7 @@ fn transaction_payment_in_asset_possible() { let balance_factor = 100; ExtBuilder::default() .balance_factor(balance_factor) - .base_weight(Weight::from_ref_time(base_weight)) + .base_weight(Weight::from_parts(base_weight, 0)) .build() .execute_with(|| { // create the asset @@ -180,7 +180,7 @@ fn transaction_payment_in_asset_possible() { // existential deposit let fee = (base_weight + weight + len as u64) * min_balance / ExistentialDeposit::get(); let pre = ChargeAssetTxPayment::::from(0, Some(asset_id)) - .pre_dispatch(&caller, CALL, &info_from_weight(Weight::from_ref_time(weight)), len) + .pre_dispatch(&caller, CALL, &info_from_weight(Weight::from_parts(weight, 0)), len) .unwrap(); // assert that native balance is not used assert_eq!(Balances::free_balance(caller), 10 * balance_factor); @@ -190,7 +190,7 @@ fn transaction_payment_in_asset_possible() { assert_ok!(ChargeAssetTxPayment::::post_dispatch( Some(pre), - &info_from_weight(Weight::from_ref_time(weight)), + &info_from_weight(Weight::from_parts(weight, 0)), &default_post_info(), len, &Ok(()) @@ -207,7 +207,7 @@ fn transaction_payment_without_fee() { let balance_factor = 100; ExtBuilder::default() .balance_factor(balance_factor) - .base_weight(Weight::from_ref_time(base_weight)) + .base_weight(Weight::from_parts(base_weight, 0)) .build() .execute_with(|| { // create the asset @@ -233,7 +233,7 @@ fn transaction_payment_without_fee() { // existential deposit let fee = (base_weight + weight + len as u64) * min_balance / ExistentialDeposit::get(); let pre = ChargeAssetTxPayment::::from(0, Some(asset_id)) - .pre_dispatch(&caller, CALL, &info_from_weight(Weight::from_ref_time(weight)), len) + .pre_dispatch(&caller, CALL, &info_from_weight(Weight::from_parts(weight, 0)), len) .unwrap(); // assert that native balance is not used assert_eq!(Balances::free_balance(caller), 10 * balance_factor); @@ -243,7 +243,7 @@ fn transaction_payment_without_fee() { assert_ok!(ChargeAssetTxPayment::::post_dispatch( Some(pre), - &info_from_weight(Weight::from_ref_time(weight)), + &info_from_weight(Weight::from_parts(weight, 0)), &post_info_from_pays(Pays::No), len, &Ok(()) @@ -260,7 +260,7 @@ fn asset_transaction_payment_with_tip_and_refund() { let base_weight = 5; ExtBuilder::default() .balance_factor(100) - .base_weight(Weight::from_ref_time(base_weight)) + .base_weight(Weight::from_parts(base_weight, 0)) .build() .execute_with(|| { // create the asset @@ -288,15 +288,15 @@ fn asset_transaction_payment_with_tip_and_refund() { let fee_with_tip = (base_weight + weight + len as u64 + tip) * min_balance / ExistentialDeposit::get(); let pre = ChargeAssetTxPayment::::from(tip, Some(asset_id)) - .pre_dispatch(&caller, CALL, &info_from_weight(Weight::from_ref_time(weight)), len) + .pre_dispatch(&caller, CALL, &info_from_weight(Weight::from_parts(weight, 0)), len) .unwrap(); assert_eq!(Assets::balance(asset_id, caller), balance - fee_with_tip); let final_weight = 50; assert_ok!(ChargeAssetTxPayment::::post_dispatch( Some(pre), - &info_from_weight(Weight::from_ref_time(weight)), - &post_info_from_weight(Weight::from_ref_time(final_weight)), + &info_from_weight(Weight::from_parts(weight, 0)), + &post_info_from_weight(Weight::from_parts(final_weight, 0)), len, &Ok(()) )); @@ -312,7 +312,7 @@ fn payment_from_account_with_only_assets() { let base_weight = 5; ExtBuilder::default() .balance_factor(100) - .base_weight(Weight::from_ref_time(base_weight)) + .base_weight(Weight::from_parts(base_weight, 0)) .build() .execute_with(|| { // create the asset @@ -340,7 +340,7 @@ fn payment_from_account_with_only_assets() { // existential deposit let fee = (base_weight + weight + len as u64) * min_balance / ExistentialDeposit::get(); let pre = ChargeAssetTxPayment::::from(0, Some(asset_id)) - .pre_dispatch(&caller, CALL, &info_from_weight(Weight::from_ref_time(weight)), len) + .pre_dispatch(&caller, CALL, &info_from_weight(Weight::from_parts(weight, 0)), len) .unwrap(); assert_eq!(Balances::free_balance(caller), 0); // check that fee was charged in the given asset @@ -348,7 +348,7 @@ fn payment_from_account_with_only_assets() { assert_ok!(ChargeAssetTxPayment::::post_dispatch( Some(pre), - &info_from_weight(Weight::from_ref_time(weight)), + &info_from_weight(Weight::from_parts(weight, 0)), &default_post_info(), len, &Ok(()) @@ -363,7 +363,7 @@ fn payment_only_with_existing_sufficient_asset() { let base_weight = 5; ExtBuilder::default() .balance_factor(100) - .base_weight(Weight::from_ref_time(base_weight)) + .base_weight(Weight::from_parts(base_weight, 0)) .build() .execute_with(|| { let asset_id = 1; @@ -372,7 +372,7 @@ fn payment_only_with_existing_sufficient_asset() { let len = 10; // pre_dispatch fails for non-existent asset assert!(ChargeAssetTxPayment::::from(0, Some(asset_id)) - .pre_dispatch(&caller, CALL, &info_from_weight(Weight::from_ref_time(weight)), len) + .pre_dispatch(&caller, CALL, &info_from_weight(Weight::from_parts(weight, 0)), len) .is_err()); // create the non-sufficient asset @@ -386,7 +386,7 @@ fn payment_only_with_existing_sufficient_asset() { )); // pre_dispatch fails for non-sufficient asset assert!(ChargeAssetTxPayment::::from(0, Some(asset_id)) - .pre_dispatch(&caller, CALL, &info_from_weight(Weight::from_ref_time(weight)), len) + .pre_dispatch(&caller, CALL, &info_from_weight(Weight::from_parts(weight, 0)), len) .is_err()); }); } @@ -396,7 +396,7 @@ fn converted_fee_is_never_zero_if_input_fee_is_not() { let base_weight = 1; ExtBuilder::default() .balance_factor(100) - .base_weight(Weight::from_ref_time(base_weight)) + .base_weight(Weight::from_parts(base_weight, 0)) .build() .execute_with(|| { // create the asset @@ -440,14 +440,14 @@ fn converted_fee_is_never_zero_if_input_fee_is_not() { assert_eq!(Assets::balance(asset_id, caller), balance); } let pre = ChargeAssetTxPayment::::from(0, Some(asset_id)) - .pre_dispatch(&caller, CALL, &info_from_weight(Weight::from_ref_time(weight)), len) + .pre_dispatch(&caller, CALL, &info_from_weight(Weight::from_parts(weight, 0)), len) .unwrap(); // check that at least one coin was charged in the given asset assert_eq!(Assets::balance(asset_id, caller), balance - 1); assert_ok!(ChargeAssetTxPayment::::post_dispatch( Some(pre), - &info_from_weight(Weight::from_ref_time(weight)), + &info_from_weight(Weight::from_parts(weight, 0)), &default_post_info(), len, &Ok(()) @@ -461,7 +461,7 @@ fn post_dispatch_fee_is_zero_if_pre_dispatch_fee_is_zero() { let base_weight = 1; ExtBuilder::default() .balance_factor(100) - .base_weight(Weight::from_ref_time(base_weight)) + .base_weight(Weight::from_parts(base_weight, 0)) .build() .execute_with(|| { // create the asset @@ -518,7 +518,7 @@ fn post_dispatch_fee_is_zero_if_unsigned_pre_dispatch_fee_is_zero() { let base_weight = 1; ExtBuilder::default() .balance_factor(100) - .base_weight(Weight::from_ref_time(base_weight)) + .base_weight(Weight::from_parts(base_weight, 0)) .build() .execute_with(|| { // create the asset @@ -542,7 +542,7 @@ fn post_dispatch_fee_is_zero_if_unsigned_pre_dispatch_fee_is_zero() { let len = 1; ChargeAssetTxPayment::::pre_dispatch_unsigned( CALL, - &info_from_weight(Weight::from_ref_time(weight)), + &info_from_weight(Weight::from_parts(weight, 0)), len, ) .unwrap(); @@ -553,7 +553,7 @@ fn post_dispatch_fee_is_zero_if_unsigned_pre_dispatch_fee_is_zero() { // initial fee) assert_ok!(ChargeAssetTxPayment::::post_dispatch( None, - &info_from_weight(Weight::from_ref_time(weight)), + &info_from_weight(Weight::from_parts(weight, 0)), &post_info_from_pays(Pays::Yes), len, &Ok(()) diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs index 6ed3e9789c35a..42798c62f4012 100644 --- a/frame/transaction-payment/src/lib.rs +++ b/frame/transaction-payment/src/lib.rs @@ -614,7 +614,7 @@ where /// Compute the length portion of a fee by invoking the configured `LengthToFee` impl. pub fn length_to_fee(length: u32) -> BalanceOf { - T::LengthToFee::weight_to_fee(&Weight::from_ref_time(length as u64)) + T::LengthToFee::weight_to_fee(&Weight::from_parts(length as u64, 0)) } /// Compute the unadjusted portion of the weight fee by invoking the configured `WeightToFee` diff --git a/frame/transaction-payment/src/mock.rs b/frame/transaction-payment/src/mock.rs index b4b8a784a6f22..92799bf5b0237 100644 --- a/frame/transaction-payment/src/mock.rs +++ b/frame/transaction-payment/src/mock.rs @@ -64,7 +64,7 @@ impl Get for BlockWeights { weights.base_extrinsic = ExtrinsicBaseWeight::get().into(); }) .for_class(DispatchClass::non_mandatory(), |weights| { - weights.max_total = Weight::from_ref_time(1024).set_proof_size(u64::MAX).into(); + weights.max_total = Weight::from_parts(1024, u64::MAX).into(); }) .build_or_panic() } diff --git a/frame/transaction-payment/src/tests.rs b/frame/transaction-payment/src/tests.rs index 2748b80b1cdac..218f50e1cc95f 100644 --- a/frame/transaction-payment/src/tests.rs +++ b/frame/transaction-payment/src/tests.rs @@ -129,18 +129,18 @@ fn default_post_info() -> PostDispatchInfo { fn signed_extension_transaction_payment_work() { ExtBuilder::default() .balance_factor(10) - .base_weight(Weight::from_ref_time(5)) + .base_weight(Weight::from_parts(5, 0)) .build() .execute_with(|| { let len = 10; let pre = ChargeTransactionPayment::::from(0) - .pre_dispatch(&1, CALL, &info_from_weight(Weight::from_ref_time(5)), len) + .pre_dispatch(&1, CALL, &info_from_weight(Weight::from_parts(5, 0)), len) .unwrap(); assert_eq!(Balances::free_balance(1), 100 - 5 - 5 - 10); assert_ok!(ChargeTransactionPayment::::post_dispatch( Some(pre), - &info_from_weight(Weight::from_ref_time(5)), + &info_from_weight(Weight::from_parts(5, 0)), &default_post_info(), len, &Ok(()) @@ -152,14 +152,14 @@ fn signed_extension_transaction_payment_work() { FeeUnbalancedAmount::mutate(|a| *a = 0); let pre = ChargeTransactionPayment::::from(5 /* tipped */) - .pre_dispatch(&2, CALL, &info_from_weight(Weight::from_ref_time(100)), len) + .pre_dispatch(&2, CALL, &info_from_weight(Weight::from_parts(100, 0)), len) .unwrap(); assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5); assert_ok!(ChargeTransactionPayment::::post_dispatch( Some(pre), - &info_from_weight(Weight::from_ref_time(100)), - &post_info_from_weight(Weight::from_ref_time(50)), + &info_from_weight(Weight::from_parts(100, 0)), + &post_info_from_weight(Weight::from_parts(50, 0)), len, &Ok(()) )); @@ -173,22 +173,22 @@ fn signed_extension_transaction_payment_work() { fn signed_extension_transaction_payment_multiplied_refund_works() { ExtBuilder::default() .balance_factor(10) - .base_weight(Weight::from_ref_time(5)) + .base_weight(Weight::from_parts(5, 0)) .build() .execute_with(|| { let len = 10; >::put(Multiplier::saturating_from_rational(3, 2)); let pre = ChargeTransactionPayment::::from(5 /* tipped */) - .pre_dispatch(&2, CALL, &info_from_weight(Weight::from_ref_time(100)), len) + .pre_dispatch(&2, CALL, &info_from_weight(Weight::from_parts(100, 0)), len) .unwrap(); // 5 base fee, 10 byte fee, 3/2 * 100 weight fee, 5 tip assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 150 - 5); assert_ok!(ChargeTransactionPayment::::post_dispatch( Some(pre), - &info_from_weight(Weight::from_ref_time(100)), - &post_info_from_weight(Weight::from_ref_time(50)), + &info_from_weight(Weight::from_parts(100, 0)), + &post_info_from_weight(Weight::from_parts(50, 0)), len, &Ok(()) )); @@ -219,7 +219,7 @@ fn signed_extension_transaction_payment_is_bounded() { #[test] fn signed_extension_allows_free_transactions() { ExtBuilder::default() - .base_weight(Weight::from_ref_time(100)) + .base_weight(Weight::from_parts(100, 0)) .balance_factor(0) .build() .execute_with(|| { @@ -230,7 +230,7 @@ fn signed_extension_allows_free_transactions() { // This is a completely free (and thus wholly insecure/DoS-ridden) transaction. let operational_transaction = DispatchInfo { - weight: Weight::from_ref_time(0), + weight: Weight::from_parts(0, 0), class: DispatchClass::Operational, pays_fee: Pays::No, }; @@ -243,7 +243,7 @@ fn signed_extension_allows_free_transactions() { // like a InsecureFreeNormal let free_transaction = DispatchInfo { - weight: Weight::from_ref_time(0), + weight: Weight::from_parts(0, 0), class: DispatchClass::Normal, pays_fee: Pays::Yes, }; @@ -262,7 +262,7 @@ fn signed_extension_allows_free_transactions() { #[test] fn signed_ext_length_fee_is_also_updated_per_congestion() { ExtBuilder::default() - .base_weight(Weight::from_ref_time(5)) + .base_weight(Weight::from_parts(5, 0)) .balance_factor(10) .build() .execute_with(|| { @@ -271,7 +271,7 @@ fn signed_ext_length_fee_is_also_updated_per_congestion() { let len = 10; assert_ok!(ChargeTransactionPayment::::from(10) // tipped - .pre_dispatch(&1, CALL, &info_from_weight(Weight::from_ref_time(3)), len)); + .pre_dispatch(&1, CALL, &info_from_weight(Weight::from_parts(3, 0)), len)); assert_eq!( Balances::free_balance(1), 100 // original @@ -297,7 +297,7 @@ fn query_info_and_fee_details_works() { let unsigned_xt_info = unsigned_xt.get_dispatch_info(); ExtBuilder::default() - .base_weight(Weight::from_ref_time(5)) + .base_weight(Weight::from_parts(5, 0)) .weight_fee(2) .build() .execute_with(|| { @@ -354,7 +354,7 @@ fn query_call_info_and_fee_details_works() { let len = encoded_call.len() as u32; ExtBuilder::default() - .base_weight(Weight::from_ref_time(5)) + .base_weight(Weight::from_parts(5, 0)) .weight_fee(2) .build() .execute_with(|| { @@ -392,7 +392,7 @@ fn query_call_info_and_fee_details_works() { #[test] fn compute_fee_works_without_multiplier() { ExtBuilder::default() - .base_weight(Weight::from_ref_time(100)) + .base_weight(Weight::from_parts(100, 0)) .byte_fee(10) .balance_factor(0) .build() @@ -402,14 +402,14 @@ fn compute_fee_works_without_multiplier() { // Tip only, no fees works let dispatch_info = DispatchInfo { - weight: Weight::from_ref_time(0), + weight: Weight::from_parts(0, 0), class: DispatchClass::Operational, pays_fee: Pays::No, }; assert_eq!(Pallet::::compute_fee(0, &dispatch_info, 10), 10); // No tip, only base fee works let dispatch_info = DispatchInfo { - weight: Weight::from_ref_time(0), + weight: Weight::from_parts(0, 0), class: DispatchClass::Operational, pays_fee: Pays::Yes, }; @@ -420,7 +420,7 @@ fn compute_fee_works_without_multiplier() { assert_eq!(Pallet::::compute_fee(42, &dispatch_info, 0), 520); // Weight fee + base fee works let dispatch_info = DispatchInfo { - weight: Weight::from_ref_time(1000), + weight: Weight::from_parts(1000, 0), class: DispatchClass::Operational, pays_fee: Pays::Yes, }; @@ -431,7 +431,7 @@ fn compute_fee_works_without_multiplier() { #[test] fn compute_fee_works_with_multiplier() { ExtBuilder::default() - .base_weight(Weight::from_ref_time(100)) + .base_weight(Weight::from_parts(100, 0)) .byte_fee(10) .balance_factor(0) .build() @@ -440,7 +440,7 @@ fn compute_fee_works_with_multiplier() { >::put(Multiplier::saturating_from_rational(3, 2)); // Base fee is unaffected by multiplier let dispatch_info = DispatchInfo { - weight: Weight::from_ref_time(0), + weight: Weight::from_parts(0, 0), class: DispatchClass::Operational, pays_fee: Pays::Yes, }; @@ -448,7 +448,7 @@ fn compute_fee_works_with_multiplier() { // Everything works together :) let dispatch_info = DispatchInfo { - weight: Weight::from_ref_time(123), + weight: Weight::from_parts(123, 0), class: DispatchClass::Operational, pays_fee: Pays::Yes, }; @@ -463,7 +463,7 @@ fn compute_fee_works_with_multiplier() { #[test] fn compute_fee_works_with_negative_multiplier() { ExtBuilder::default() - .base_weight(Weight::from_ref_time(100)) + .base_weight(Weight::from_parts(100, 0)) .byte_fee(10) .balance_factor(0) .build() @@ -473,7 +473,7 @@ fn compute_fee_works_with_negative_multiplier() { // Base fee is unaffected by multiplier. let dispatch_info = DispatchInfo { - weight: Weight::from_ref_time(0), + weight: Weight::from_parts(0, 0), class: DispatchClass::Operational, pays_fee: Pays::Yes, }; @@ -481,7 +481,7 @@ fn compute_fee_works_with_negative_multiplier() { // Everything works together. let dispatch_info = DispatchInfo { - weight: Weight::from_ref_time(123), + weight: Weight::from_parts(123, 0), class: DispatchClass::Operational, pays_fee: Pays::Yes, }; @@ -496,7 +496,7 @@ fn compute_fee_works_with_negative_multiplier() { #[test] fn compute_fee_does_not_overflow() { ExtBuilder::default() - .base_weight(Weight::from_ref_time(100)) + .base_weight(Weight::from_parts(100, 0)) .byte_fee(10) .balance_factor(0) .build() @@ -518,14 +518,14 @@ fn compute_fee_does_not_overflow() { fn refund_does_not_recreate_account() { ExtBuilder::default() .balance_factor(10) - .base_weight(Weight::from_ref_time(5)) + .base_weight(Weight::from_parts(5, 0)) .build() .execute_with(|| { // So events are emitted System::set_block_number(10); let len = 10; let pre = ChargeTransactionPayment::::from(5 /* tipped */) - .pre_dispatch(&2, CALL, &info_from_weight(Weight::from_ref_time(100)), len) + .pre_dispatch(&2, CALL, &info_from_weight(Weight::from_parts(100, 0)), len) .unwrap(); assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5); @@ -535,8 +535,8 @@ fn refund_does_not_recreate_account() { assert_ok!(ChargeTransactionPayment::::post_dispatch( Some(pre), - &info_from_weight(Weight::from_ref_time(100)), - &post_info_from_weight(Weight::from_ref_time(50)), + &info_from_weight(Weight::from_parts(100, 0)), + &post_info_from_weight(Weight::from_parts(50, 0)), len, &Ok(()) )); @@ -558,19 +558,19 @@ fn refund_does_not_recreate_account() { fn actual_weight_higher_than_max_refunds_nothing() { ExtBuilder::default() .balance_factor(10) - .base_weight(Weight::from_ref_time(5)) + .base_weight(Weight::from_parts(5, 0)) .build() .execute_with(|| { let len = 10; let pre = ChargeTransactionPayment::::from(5 /* tipped */) - .pre_dispatch(&2, CALL, &info_from_weight(Weight::from_ref_time(100)), len) + .pre_dispatch(&2, CALL, &info_from_weight(Weight::from_parts(100, 0)), len) .unwrap(); assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5); assert_ok!(ChargeTransactionPayment::::post_dispatch( Some(pre), - &info_from_weight(Weight::from_ref_time(100)), - &post_info_from_weight(Weight::from_ref_time(101)), + &info_from_weight(Weight::from_parts(100, 0)), + &post_info_from_weight(Weight::from_parts(101, 0)), len, &Ok(()) )); @@ -582,14 +582,14 @@ fn actual_weight_higher_than_max_refunds_nothing() { fn zero_transfer_on_free_transaction() { ExtBuilder::default() .balance_factor(10) - .base_weight(Weight::from_ref_time(5)) + .base_weight(Weight::from_parts(5, 0)) .build() .execute_with(|| { // So events are emitted System::set_block_number(10); let len = 10; let dispatch_info = DispatchInfo { - weight: Weight::from_ref_time(100), + weight: Weight::from_parts(100, 0), pays_fee: Pays::No, class: DispatchClass::Normal, }; @@ -621,11 +621,11 @@ fn zero_transfer_on_free_transaction() { fn refund_consistent_with_actual_weight() { ExtBuilder::default() .balance_factor(10) - .base_weight(Weight::from_ref_time(7)) + .base_weight(Weight::from_parts(7, 0)) .build() .execute_with(|| { - let info = info_from_weight(Weight::from_ref_time(100)); - let post_info = post_info_from_weight(Weight::from_ref_time(33)); + let info = info_from_weight(Weight::from_parts(100, 0)); + let post_info = post_info_from_weight(Weight::from_parts(33, 0)); let prev_balance = Balances::free_balance(2); let len = 10; let tip = 5; @@ -662,7 +662,7 @@ fn should_alter_operational_priority() { ExtBuilder::default().balance_factor(100).build().execute_with(|| { let normal = DispatchInfo { - weight: Weight::from_ref_time(100), + weight: Weight::from_parts(100, 0), class: DispatchClass::Normal, pays_fee: Pays::Yes, }; @@ -683,7 +683,7 @@ fn should_alter_operational_priority() { ExtBuilder::default().balance_factor(100).build().execute_with(|| { let op = DispatchInfo { - weight: Weight::from_ref_time(100), + weight: Weight::from_parts(100, 0), class: DispatchClass::Operational, pays_fee: Pays::Yes, }; @@ -708,7 +708,7 @@ fn no_tip_has_some_priority() { ExtBuilder::default().balance_factor(100).build().execute_with(|| { let normal = DispatchInfo { - weight: Weight::from_ref_time(100), + weight: Weight::from_parts(100, 0), class: DispatchClass::Normal, pays_fee: Pays::Yes, }; @@ -722,7 +722,7 @@ fn no_tip_has_some_priority() { ExtBuilder::default().balance_factor(100).build().execute_with(|| { let op = DispatchInfo { - weight: Weight::from_ref_time(100), + weight: Weight::from_parts(100, 0), class: DispatchClass::Operational, pays_fee: Pays::Yes, }; @@ -742,7 +742,7 @@ fn higher_tip_have_higher_priority() { let len = 10; ExtBuilder::default().balance_factor(100).build().execute_with(|| { let normal = DispatchInfo { - weight: Weight::from_ref_time(100), + weight: Weight::from_parts(100, 0), class: DispatchClass::Normal, pays_fee: Pays::Yes, }; @@ -754,7 +754,7 @@ fn higher_tip_have_higher_priority() { ExtBuilder::default().balance_factor(100).build().execute_with(|| { let op = DispatchInfo { - weight: Weight::from_ref_time(100), + weight: Weight::from_parts(100, 0), class: DispatchClass::Operational, pays_fee: Pays::Yes, }; @@ -781,10 +781,10 @@ fn higher_tip_have_higher_priority() { fn post_info_can_change_pays_fee() { ExtBuilder::default() .balance_factor(10) - .base_weight(Weight::from_ref_time(7)) + .base_weight(Weight::from_parts(7, 0)) .build() .execute_with(|| { - let info = info_from_weight(Weight::from_ref_time(100)); + let info = info_from_weight(Weight::from_parts(100, 0)); let post_info = post_info_from_pays(Pays::No); let prev_balance = Balances::free_balance(2); let len = 10; diff --git a/frame/transaction-payment/src/types.rs b/frame/transaction-payment/src/types.rs index b8bc17918ab36..cbe85309b856a 100644 --- a/frame/transaction-payment/src/types.rs +++ b/frame/transaction-payment/src/types.rs @@ -144,7 +144,7 @@ mod tests { #[test] fn should_serialize_and_deserialize_properly_with_string() { let info = RuntimeDispatchInfo { - weight: Weight::from_ref_time(5), + weight: Weight::from_parts(5, 0), class: DispatchClass::Normal, partial_fee: 1_000_000_u64, }; @@ -162,7 +162,7 @@ mod tests { #[test] fn should_serialize_and_deserialize_properly_large_value() { let info = RuntimeDispatchInfo { - weight: Weight::from_ref_time(5), + weight: Weight::from_parts(5, 0), class: DispatchClass::Normal, partial_fee: u128::max_value(), }; diff --git a/frame/transaction-storage/src/weights.rs b/frame/transaction-storage/src/weights.rs index d9659a925ab24..896e1ebab43aa 100644 --- a/frame/transaction-storage/src/weights.rs +++ b/frame/transaction-storage/src/weights.rs @@ -70,7 +70,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 28_702 nanoseconds. Weight::from_parts(29_164_000, 38383) // Standard Error: 2 - .saturating_add(Weight::from_ref_time(5_601).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(5_601, 0).saturating_mul(l.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -128,7 +128,7 @@ impl WeightInfo for () { // Minimum execution time: 28_702 nanoseconds. Weight::from_parts(29_164_000, 38383) // Standard Error: 2 - .saturating_add(Weight::from_ref_time(5_601).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(5_601, 0).saturating_mul(l.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } diff --git a/frame/treasury/src/weights.rs b/frame/treasury/src/weights.rs index 10bab00836836..abf461c622a0f 100644 --- a/frame/treasury/src/weights.rs +++ b/frame/treasury/src/weights.rs @@ -112,7 +112,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 9_366 nanoseconds. Weight::from_parts(11_731_455, 3480) // Standard Error: 761 - .saturating_add(Weight::from_ref_time(21_665).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(21_665, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -145,12 +145,12 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 37_834 nanoseconds. Weight::from_parts(47_496_917, 2305) // Standard Error: 12_505 - .saturating_add(Weight::from_ref_time(26_902_474).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(26_902_474, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(p.into()))) .saturating_add(T::DbWeight::get().writes(3_u64)) .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(p.into()))) - .saturating_add(Weight::from_proof_size(7789).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 7789).saturating_mul(p.into())) } } @@ -209,7 +209,7 @@ impl WeightInfo for () { // Minimum execution time: 9_366 nanoseconds. Weight::from_parts(11_731_455, 3480) // Standard Error: 761 - .saturating_add(Weight::from_ref_time(21_665).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(21_665, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -242,11 +242,11 @@ impl WeightInfo for () { // Minimum execution time: 37_834 nanoseconds. Weight::from_parts(47_496_917, 2305) // Standard Error: 12_505 - .saturating_add(Weight::from_ref_time(26_902_474).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(26_902_474, 0).saturating_mul(p.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().reads((3_u64).saturating_mul(p.into()))) .saturating_add(RocksDbWeight::get().writes(3_u64)) .saturating_add(RocksDbWeight::get().writes((3_u64).saturating_mul(p.into()))) - .saturating_add(Weight::from_proof_size(7789).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 7789).saturating_mul(p.into())) } } diff --git a/frame/uniques/src/weights.rs b/frame/uniques/src/weights.rs index 144a384f0a6d7..edf3bd35dcef0 100644 --- a/frame/uniques/src/weights.rs +++ b/frame/uniques/src/weights.rs @@ -131,18 +131,18 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 2_404_081 nanoseconds. Weight::from_parts(2_419_004_000, 5250) // Standard Error: 27_175 - .saturating_add(Weight::from_ref_time(8_616_904).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(8_616_904, 0).saturating_mul(n.into())) // Standard Error: 27_175 - .saturating_add(Weight::from_ref_time(334_249).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(334_249, 0).saturating_mul(m.into())) // Standard Error: 27_175 - .saturating_add(Weight::from_ref_time(213_038).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(213_038, 0).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into()))) .saturating_add(T::DbWeight::get().writes(4_u64)) .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(n.into()))) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(m.into()))) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(a.into()))) - .saturating_add(Weight::from_proof_size(2597).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 2597).saturating_mul(n.into())) } /// Storage: Uniques Asset (r:1 w:1) /// Proof: Uniques Asset (max_values: None, max_size: Some(122), added: 2597, mode: MaxEncodedLen) @@ -207,12 +207,12 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 13_633 nanoseconds. Weight::from_parts(13_797_000, 2653) // Standard Error: 9_293 - .saturating_add(Weight::from_ref_time(11_163_914).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(11_163_914, 0).saturating_mul(i.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(i.into()))) .saturating_add(T::DbWeight::get().writes(1_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into()))) - .saturating_add(Weight::from_proof_size(2597).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(0, 2597).saturating_mul(i.into())) } /// Storage: Uniques Asset (r:1 w:1) /// Proof: Uniques Asset (max_values: None, max_size: Some(122), added: 2597, mode: MaxEncodedLen) @@ -519,18 +519,18 @@ impl WeightInfo for () { // Minimum execution time: 2_404_081 nanoseconds. Weight::from_parts(2_419_004_000, 5250) // Standard Error: 27_175 - .saturating_add(Weight::from_ref_time(8_616_904).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(8_616_904, 0).saturating_mul(n.into())) // Standard Error: 27_175 - .saturating_add(Weight::from_ref_time(334_249).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(334_249, 0).saturating_mul(m.into())) // Standard Error: 27_175 - .saturating_add(Weight::from_ref_time(213_038).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(213_038, 0).saturating_mul(a.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(n.into()))) .saturating_add(RocksDbWeight::get().writes(4_u64)) .saturating_add(RocksDbWeight::get().writes((2_u64).saturating_mul(n.into()))) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(m.into()))) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(a.into()))) - .saturating_add(Weight::from_proof_size(2597).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 2597).saturating_mul(n.into())) } /// Storage: Uniques Asset (r:1 w:1) /// Proof: Uniques Asset (max_values: None, max_size: Some(122), added: 2597, mode: MaxEncodedLen) @@ -595,12 +595,12 @@ impl WeightInfo for () { // Minimum execution time: 13_633 nanoseconds. Weight::from_parts(13_797_000, 2653) // Standard Error: 9_293 - .saturating_add(Weight::from_ref_time(11_163_914).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(11_163_914, 0).saturating_mul(i.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(i.into()))) .saturating_add(RocksDbWeight::get().writes(1_u64)) .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(i.into()))) - .saturating_add(Weight::from_proof_size(2597).saturating_mul(i.into())) + .saturating_add(Weight::from_parts(0, 2597).saturating_mul(i.into())) } /// Storage: Uniques Asset (r:1 w:1) /// Proof: Uniques Asset (max_values: None, max_size: Some(122), added: 2597, mode: MaxEncodedLen) diff --git a/frame/utility/src/tests.rs b/frame/utility/src/tests.rs index 938a5392b963d..413315a25eb44 100644 --- a/frame/utility/src/tests.rs +++ b/frame/utility/src/tests.rs @@ -308,8 +308,8 @@ fn as_derivative_works() { #[test] fn as_derivative_handles_weight_refund() { new_test_ext().execute_with(|| { - let start_weight = Weight::from_ref_time(100); - let end_weight = Weight::from_ref_time(75); + let start_weight = Weight::from_parts(100, 0); + let end_weight = Weight::from_parts(75, 0); let diff = start_weight - end_weight; // Full weight when ok @@ -495,8 +495,8 @@ fn batch_weight_calculation_doesnt_overflow() { #[test] fn batch_handles_weight_refund() { new_test_ext().execute_with(|| { - let start_weight = Weight::from_ref_time(100); - let end_weight = Weight::from_ref_time(75); + let start_weight = Weight::from_parts(100, 0); + let end_weight = Weight::from_parts(75, 0); let diff = start_weight - end_weight; let batch_len = 4; @@ -611,8 +611,8 @@ fn batch_all_revert() { #[test] fn batch_all_handles_weight_refund() { new_test_ext().execute_with(|| { - let start_weight = Weight::from_ref_time(100); - let end_weight = Weight::from_ref_time(75); + let start_weight = Weight::from_parts(100, 0); + let end_weight = Weight::from_parts(75, 0); let diff = start_weight - end_weight; let batch_len = 4; @@ -739,7 +739,7 @@ fn force_batch_works() { RuntimeOrigin::signed(1), vec![ call_transfer(2, 5), - call_foobar(true, Weight::from_ref_time(75), None), + call_foobar(true, Weight::from_parts(75, 0), None), call_transfer(2, 10), call_transfer(2, 5), ] diff --git a/frame/utility/src/weights.rs b/frame/utility/src/weights.rs index 8c7a14715989e..c680c9ff00f9f 100644 --- a/frame/utility/src/weights.rs +++ b/frame/utility/src/weights.rs @@ -64,16 +64,16 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 6_742 nanoseconds. - Weight::from_ref_time(16_087_635) + Weight::from_parts(16_087_635, 0) // Standard Error: 2_411 - .saturating_add(Weight::from_ref_time(3_665_506).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(3_665_506, 0).saturating_mul(c.into())) } fn as_derivative() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` // Minimum execution time: 4_802 nanoseconds. - Weight::from_ref_time(5_269_000) + Weight::from_parts(5_269_000, 0) } /// The range of component `c` is `[0, 1000]`. fn batch_all(c: u32, ) -> Weight { @@ -81,16 +81,16 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 7_100 nanoseconds. - Weight::from_ref_time(14_090_381) + Weight::from_parts(14_090_381, 0) // Standard Error: 1_917 - .saturating_add(Weight::from_ref_time(3_744_891).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(3_744_891, 0).saturating_mul(c.into())) } fn dispatch_as() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` // Minimum execution time: 8_840 nanoseconds. - Weight::from_ref_time(9_280_000) + Weight::from_parts(9_280_000, 0) } /// The range of component `c` is `[0, 1000]`. fn force_batch(c: u32, ) -> Weight { @@ -98,9 +98,9 @@ impl WeightInfo for SubstrateWeight { // Measured: `0` // Estimated: `0` // Minimum execution time: 7_245 nanoseconds. - Weight::from_ref_time(14_292_923) + Weight::from_parts(14_292_923, 0) // Standard Error: 1_803 - .saturating_add(Weight::from_ref_time(3_645_950).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(3_645_950, 0).saturating_mul(c.into())) } } @@ -112,16 +112,16 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 6_742 nanoseconds. - Weight::from_ref_time(16_087_635) + Weight::from_parts(16_087_635, 0) // Standard Error: 2_411 - .saturating_add(Weight::from_ref_time(3_665_506).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(3_665_506, 0).saturating_mul(c.into())) } fn as_derivative() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` // Minimum execution time: 4_802 nanoseconds. - Weight::from_ref_time(5_269_000) + Weight::from_parts(5_269_000, 0) } /// The range of component `c` is `[0, 1000]`. fn batch_all(c: u32, ) -> Weight { @@ -129,16 +129,16 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 7_100 nanoseconds. - Weight::from_ref_time(14_090_381) + Weight::from_parts(14_090_381, 0) // Standard Error: 1_917 - .saturating_add(Weight::from_ref_time(3_744_891).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(3_744_891, 0).saturating_mul(c.into())) } fn dispatch_as() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` // Minimum execution time: 8_840 nanoseconds. - Weight::from_ref_time(9_280_000) + Weight::from_parts(9_280_000, 0) } /// The range of component `c` is `[0, 1000]`. fn force_batch(c: u32, ) -> Weight { @@ -146,8 +146,8 @@ impl WeightInfo for () { // Measured: `0` // Estimated: `0` // Minimum execution time: 7_245 nanoseconds. - Weight::from_ref_time(14_292_923) + Weight::from_parts(14_292_923, 0) // Standard Error: 1_803 - .saturating_add(Weight::from_ref_time(3_645_950).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(3_645_950, 0).saturating_mul(c.into())) } } diff --git a/frame/vesting/src/weights.rs b/frame/vesting/src/weights.rs index 350e6a86e24e4..de3260fa1e6a6 100644 --- a/frame/vesting/src/weights.rs +++ b/frame/vesting/src/weights.rs @@ -74,9 +74,9 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 28_062 nanoseconds. Weight::from_parts(26_857_563, 7306) // Standard Error: 623 - .saturating_add(Weight::from_ref_time(55_988).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(55_988, 0).saturating_mul(l.into())) // Standard Error: 1_109 - .saturating_add(Weight::from_ref_time(59_714).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(59_714, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -93,9 +93,9 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 27_027 nanoseconds. Weight::from_parts(26_509_364, 7306) // Standard Error: 815 - .saturating_add(Weight::from_ref_time(54_711).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(54_711, 0).saturating_mul(l.into())) // Standard Error: 1_451 - .saturating_add(Weight::from_ref_time(32_792).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(32_792, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -114,9 +114,9 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 29_554 nanoseconds. Weight::from_parts(28_269_203, 9909) // Standard Error: 623 - .saturating_add(Weight::from_ref_time(59_058).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(59_058, 0).saturating_mul(l.into())) // Standard Error: 1_108 - .saturating_add(Weight::from_ref_time(63_429).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(63_429, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -135,9 +135,9 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 28_546 nanoseconds. Weight::from_parts(28_299_251, 9909) // Standard Error: 786 - .saturating_add(Weight::from_ref_time(53_401).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(53_401, 0).saturating_mul(l.into())) // Standard Error: 1_399 - .saturating_add(Weight::from_ref_time(29_713).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(29_713, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -156,9 +156,9 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 43_436 nanoseconds. Weight::from_parts(44_885_707, 9909) // Standard Error: 1_516 - .saturating_add(Weight::from_ref_time(59_066).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(59_066, 0).saturating_mul(l.into())) // Standard Error: 2_698 - .saturating_add(Weight::from_ref_time(32_053).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(32_053, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -177,9 +177,9 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 45_805 nanoseconds. Weight::from_parts(46_869_490, 12512) // Standard Error: 1_445 - .saturating_add(Weight::from_ref_time(52_654).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(52_654, 0).saturating_mul(l.into())) // Standard Error: 2_571 - .saturating_add(Weight::from_ref_time(34_202).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(34_202, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -198,9 +198,9 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 30_460 nanoseconds. Weight::from_parts(29_407_637, 9909) // Standard Error: 794 - .saturating_add(Weight::from_ref_time(63_757).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(63_757, 0).saturating_mul(l.into())) // Standard Error: 1_466 - .saturating_add(Weight::from_ref_time(56_032).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(56_032, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -219,9 +219,9 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 30_413 nanoseconds. Weight::from_parts(29_350_467, 9909) // Standard Error: 724 - .saturating_add(Weight::from_ref_time(65_366).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(65_366, 0).saturating_mul(l.into())) // Standard Error: 1_337 - .saturating_add(Weight::from_ref_time(53_799).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(53_799, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -242,9 +242,9 @@ impl WeightInfo for () { // Minimum execution time: 28_062 nanoseconds. Weight::from_parts(26_857_563, 7306) // Standard Error: 623 - .saturating_add(Weight::from_ref_time(55_988).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(55_988, 0).saturating_mul(l.into())) // Standard Error: 1_109 - .saturating_add(Weight::from_ref_time(59_714).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(59_714, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -261,9 +261,9 @@ impl WeightInfo for () { // Minimum execution time: 27_027 nanoseconds. Weight::from_parts(26_509_364, 7306) // Standard Error: 815 - .saturating_add(Weight::from_ref_time(54_711).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(54_711, 0).saturating_mul(l.into())) // Standard Error: 1_451 - .saturating_add(Weight::from_ref_time(32_792).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(32_792, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -282,9 +282,9 @@ impl WeightInfo for () { // Minimum execution time: 29_554 nanoseconds. Weight::from_parts(28_269_203, 9909) // Standard Error: 623 - .saturating_add(Weight::from_ref_time(59_058).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(59_058, 0).saturating_mul(l.into())) // Standard Error: 1_108 - .saturating_add(Weight::from_ref_time(63_429).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(63_429, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) } @@ -303,9 +303,9 @@ impl WeightInfo for () { // Minimum execution time: 28_546 nanoseconds. Weight::from_parts(28_299_251, 9909) // Standard Error: 786 - .saturating_add(Weight::from_ref_time(53_401).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(53_401, 0).saturating_mul(l.into())) // Standard Error: 1_399 - .saturating_add(Weight::from_ref_time(29_713).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(29_713, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) } @@ -324,9 +324,9 @@ impl WeightInfo for () { // Minimum execution time: 43_436 nanoseconds. Weight::from_parts(44_885_707, 9909) // Standard Error: 1_516 - .saturating_add(Weight::from_ref_time(59_066).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(59_066, 0).saturating_mul(l.into())) // Standard Error: 2_698 - .saturating_add(Weight::from_ref_time(32_053).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(32_053, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) } @@ -345,9 +345,9 @@ impl WeightInfo for () { // Minimum execution time: 45_805 nanoseconds. Weight::from_parts(46_869_490, 12512) // Standard Error: 1_445 - .saturating_add(Weight::from_ref_time(52_654).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(52_654, 0).saturating_mul(l.into())) // Standard Error: 2_571 - .saturating_add(Weight::from_ref_time(34_202).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(34_202, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(4_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) } @@ -366,9 +366,9 @@ impl WeightInfo for () { // Minimum execution time: 30_460 nanoseconds. Weight::from_parts(29_407_637, 9909) // Standard Error: 794 - .saturating_add(Weight::from_ref_time(63_757).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(63_757, 0).saturating_mul(l.into())) // Standard Error: 1_466 - .saturating_add(Weight::from_ref_time(56_032).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(56_032, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) } @@ -387,9 +387,9 @@ impl WeightInfo for () { // Minimum execution time: 30_413 nanoseconds. Weight::from_parts(29_350_467, 9909) // Standard Error: 724 - .saturating_add(Weight::from_ref_time(65_366).saturating_mul(l.into())) + .saturating_add(Weight::from_parts(65_366, 0).saturating_mul(l.into())) // Standard Error: 1_337 - .saturating_add(Weight::from_ref_time(53_799).saturating_mul(s.into())) + .saturating_add(Weight::from_parts(53_799, 0).saturating_mul(s.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) } diff --git a/frame/whitelist/src/tests.rs b/frame/whitelist/src/tests.rs index 986a09b8e03de..3a60adbcfbedc 100644 --- a/frame/whitelist/src/tests.rs +++ b/frame/whitelist/src/tests.rs @@ -119,7 +119,7 @@ fn test_whitelist_call_and_execute() { RuntimeOrigin::root(), call_hash, call_encoded_len, - call_weight - Weight::from_ref_time(1) + call_weight - Weight::from_parts(1, 0) ), crate::Error::::InvalidCallWeightWitness, ); diff --git a/frame/whitelist/src/weights.rs b/frame/whitelist/src/weights.rs index 2b25e81941540..667d602a3c0ba 100644 --- a/frame/whitelist/src/weights.rs +++ b/frame/whitelist/src/weights.rs @@ -97,10 +97,10 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 27_539 nanoseconds. Weight::from_parts(27_950_000, 8007) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_134).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(1_134, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(1).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into())) } /// Storage: Whitelist WhitelistedCall (r:1 w:1) /// Proof: Whitelist WhitelistedCall (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen) @@ -114,7 +114,7 @@ impl WeightInfo for SubstrateWeight { // Minimum execution time: 20_581 nanoseconds. Weight::from_parts(21_762_318, 5081) // Standard Error: 4 - .saturating_add(Weight::from_ref_time(1_480).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(1_480, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -162,10 +162,10 @@ impl WeightInfo for () { // Minimum execution time: 27_539 nanoseconds. Weight::from_parts(27_950_000, 8007) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_134).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(1_134, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_proof_size(1).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into())) } /// Storage: Whitelist WhitelistedCall (r:1 w:1) /// Proof: Whitelist WhitelistedCall (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen) @@ -179,7 +179,7 @@ impl WeightInfo for () { // Minimum execution time: 20_581 nanoseconds. Weight::from_parts(21_762_318, 5081) // Standard Error: 4 - .saturating_add(Weight::from_ref_time(1_480).saturating_mul(n.into())) + .saturating_add(Weight::from_parts(1_480, 0).saturating_mul(n.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } diff --git a/primitives/weights/src/lib.rs b/primitives/weights/src/lib.rs index acfcae1dfcd15..8a842307355bf 100644 --- a/primitives/weights/src/lib.rs +++ b/primitives/weights/src/lib.rs @@ -82,17 +82,17 @@ pub struct RuntimeDbWeight { impl RuntimeDbWeight { pub fn reads(self, r: u64) -> Weight { - Weight::from_ref_time(self.read.saturating_mul(r)) + Weight::from_parts(self.read.saturating_mul(r), 0) } pub fn writes(self, w: u64) -> Weight { - Weight::from_ref_time(self.write.saturating_mul(w)) + Weight::from_parts(self.write.saturating_mul(w), 0) } pub fn reads_writes(self, r: u64, w: u64) -> Weight { let read_weight = self.read.saturating_mul(r); let write_weight = self.write.saturating_mul(w); - Weight::from_ref_time(read_weight.saturating_add(write_weight)) + Weight::from_parts(read_weight.saturating_add(write_weight), 0) } } @@ -264,15 +264,15 @@ mod tests { #[test] fn polynomial_works() { // 100^3/2=500000 100^2*(2+1/3)=23333 700 -10000 - assert_eq!(Poly::weight_to_fee(&Weight::from_ref_time(100)), 514033); + assert_eq!(Poly::weight_to_fee(&Weight::from_parts(100, 0)), 514033); // 10123^3/2=518677865433 10123^2*(2+1/3)=239108634 70861 -10000 - assert_eq!(Poly::weight_to_fee(&Weight::from_ref_time(10_123)), 518917034928); + assert_eq!(Poly::weight_to_fee(&Weight::from_parts(10_123, 0)), 518917034928); } #[test] fn polynomial_does_not_underflow() { assert_eq!(Poly::weight_to_fee(&Weight::zero()), 0); - assert_eq!(Poly::weight_to_fee(&Weight::from_ref_time(10)), 0); + assert_eq!(Poly::weight_to_fee(&Weight::from_parts(10, 0)), 0); } #[test] @@ -283,7 +283,7 @@ mod tests { #[test] fn identity_fee_works() { assert_eq!(IdentityFee::::weight_to_fee(&Weight::zero()), 0); - assert_eq!(IdentityFee::::weight_to_fee(&Weight::from_ref_time(50)), 50); + assert_eq!(IdentityFee::::weight_to_fee(&Weight::from_parts(50, 0)), 50); assert_eq!(IdentityFee::::weight_to_fee(&Weight::MAX), Balance::max_value()); } @@ -295,20 +295,20 @@ mod tests { 0 ); assert_eq!( - ConstantMultiplier::>::weight_to_fee(&Weight::from_ref_time( - 50 + ConstantMultiplier::>::weight_to_fee(&Weight::from_parts( + 50, 0 )), 500 ); assert_eq!( - ConstantMultiplier::>::weight_to_fee(&Weight::from_ref_time( - 16 + ConstantMultiplier::>::weight_to_fee(&Weight::from_parts( + 16, 0 )), 16384 ); assert_eq!( ConstantMultiplier::>::weight_to_fee( - &Weight::from_ref_time(2) + &Weight::from_parts(2, 0) ), u128::MAX ); diff --git a/primitives/weights/src/weight_v2.rs b/primitives/weights/src/weight_v2.rs index f6e6164b5fe4b..ca137145920bb 100644 --- a/primitives/weights/src/weight_v2.rs +++ b/primitives/weights/src/weight_v2.rs @@ -37,7 +37,7 @@ pub struct Weight { impl From for Weight { fn from(old: OldWeight) -> Self { - Weight::from_ref_time(old.0) + Weight::from_parts(old.0, 0) } } @@ -103,11 +103,13 @@ impl Weight { } /// Construct [`Weight`] with reference time weight and 0 storage size weight. + #[deprecated = "Will be removed soon; use `from_parts` instead."] pub const fn from_ref_time(ref_time: u64) -> Self { Self { ref_time, proof_size: 0 } } /// Construct [`Weight`] with storage size weight and 0 reference time weight. + #[deprecated = "Will be removed soon; use `from_parts` instead."] pub const fn from_proof_size(proof_size: u64) -> Self { Self { ref_time: 0, proof_size } } @@ -238,7 +240,7 @@ impl Weight { /// of all those divisions. Returns `None` in case **all** components of `other` are zero. /// /// This returns `Some` even if some components of `other` are zero as long as there is at least - /// one non-zero component in `other`. The devision for this particular component will then + /// one non-zero component in `other`. The division for this particular component will then /// yield the maximum value (e.g u64::MAX). This is because we assume not every operation and /// hence each `Weight` will necessarily use each resource. pub const fn checked_div_per_component(self, other: &Self) -> Option { diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs index 87a60acfc87ce..1ea8b866367dd 100644 --- a/test-utils/runtime/src/lib.rs +++ b/test-utils/runtime/src/lib.rs @@ -601,7 +601,7 @@ parameter_types! { pub RuntimeBlockLength: BlockLength = BlockLength::max(4 * 1024 * 1024); pub RuntimeBlockWeights: BlockWeights = - BlockWeights::with_sensible_defaults(Weight::from_ref_time(4 * 1024 * 1024), Perbill::from_percent(75)); + BlockWeights::with_sensible_defaults(Weight::from_parts(4 * 1024 * 1024, 0), Perbill::from_percent(75)); } impl From> for Extrinsic { diff --git a/utils/frame/benchmarking-cli/src/overhead/README.md b/utils/frame/benchmarking-cli/src/overhead/README.md index 1584c2affe0a3..85bcc7fa36f2d 100644 --- a/utils/frame/benchmarking-cli/src/overhead/README.md +++ b/utils/frame/benchmarking-cli/src/overhead/README.md @@ -31,7 +31,7 @@ The file will contain the concrete weight value and various statistics about the /// 95th: 3_595_674 /// 75th: 3_526_435 pub const BlockExecutionWeight: Weight = - Weight::from_ref_time(WEIGHT_REF_TIME_PER_NANOS.saturating_mul(3_532_484)); + Weight::from_parts(WEIGHT_REF_TIME_PER_NANOS.saturating_mul(3_532_484), 0); ``` In this example it takes 3.5 ms to execute an empty block. That means that it always takes at least 3.5 ms to execute *any* block. @@ -61,7 +61,7 @@ The relevant section in the output file looks like this: /// 95th: 67_843 /// 75th: 67_749 pub const ExtrinsicBaseWeight: Weight = - Weight::from_ref_time(WEIGHT_REF_TIME_PER_NANOS.saturating_mul(67_745)); + Weight::from_parts(WEIGHT_REF_TIME_PER_NANOS.saturating_mul(67_745), 0); ``` In this example it takes 67.7 µs to execute a NO-OP extrinsic. That means that it always takes at least 67.7 µs to execute *any* extrinsic. diff --git a/utils/frame/benchmarking-cli/src/overhead/weights.hbs b/utils/frame/benchmarking-cli/src/overhead/weights.hbs index c54393d200bd3..6e364facc12f4 100644 --- a/utils/frame/benchmarking-cli/src/overhead/weights.hbs +++ b/utils/frame/benchmarking-cli/src/overhead/weights.hbs @@ -35,7 +35,7 @@ parameter_types! { /// 95th: {{underscore stats.p95}} /// 75th: {{underscore stats.p75}} pub const {{long_name}}Weight: Weight = - Weight::from_ref_time(WEIGHT_REF_TIME_PER_NANOS.saturating_mul({{underscore weight}})); + Weight::from_parts(WEIGHT_REF_TIME_PER_NANOS.saturating_mul({{underscore weight}}), 0); } #[cfg(test)] diff --git a/utils/frame/benchmarking-cli/src/pallet/template.hbs b/utils/frame/benchmarking-cli/src/pallet/template.hbs index 0bec34eaae774..88d6b69a6c339 100644 --- a/utils/frame/benchmarking-cli/src/pallet/template.hbs +++ b/utils/frame/benchmarking-cli/src/pallet/template.hbs @@ -37,12 +37,12 @@ impl {{pallet}}::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `{{benchmark.base_recorded_proof_size}}{{#each benchmark.component_recorded_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}` // Estimated: `{{benchmark.base_calculated_proof_size}}{{#each benchmark.component_calculated_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}` - // Minimum execution time: {{underscore benchmark.min_execution_time}} nanoseconds. - Weight::from_ref_time({{underscore benchmark.base_weight}}) - .saturating_add(Weight::from_proof_size({{benchmark.base_calculated_proof_size}})) + // Minimum execution time: {{underscore benchmark.min_execution_time}}_000 picoseconds. + Weight::from_parts({{underscore benchmark.base_weight}}, 0) + .saturating_add(Weight::from_parts(0, {{benchmark.base_calculated_proof_size}})) {{#each benchmark.component_weight as |cw|}} // Standard Error: {{underscore cw.error}} - .saturating_add(Weight::from_ref_time({{underscore cw.slope}}).saturating_mul({{cw.name}}.into())) + .saturating_add(Weight::from_parts({{underscore cw.slope}}, 0).saturating_mul({{cw.name}}.into())) {{/each}} {{#if (ne benchmark.base_reads "0")}} .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}})) @@ -57,7 +57,7 @@ impl {{pallet}}::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into()))) {{/each}} {{#each benchmark.component_calculated_proof_size as |cp|}} - .saturating_add(Weight::from_proof_size({{cp.slope}}).saturating_mul({{cp.name}}.into())) + .saturating_add(Weight::from_parts(0, {{cp.slope}}).saturating_mul({{cp.name}}.into())) {{/each}} } {{/each}}