Skip to content

Commit d87a45b

Browse files
aurexavjiguantongboundless-forest
authored
To polkadot-v0.9.40 (#1153)
* Remove `account` * Update and companions * Companion of paritytech/cumulus#2164 * Companion of paritytech/substrate#13159 * Companion of paritytech/cumulus#1909 * Fmt * Companion of paritytech/polkadot#6744 * Companion of paritytech/cumulus#2245 * Companion of paritytech/substrate#12828 * Companion of paritytech/cumulus#2287 * Companion of paritytech/substrate#13592 * Companion of paritytech/cumulus#2308 * Companion of paritytech/substrate#13410 * Companion of paritytech/substrate#13305 * Companion of polkadot-evm/frontier#1050 * TODO weight * TODO weight * Companion of polkadot-evm/frontier#1040 Signed-off-by: Xavier Lau <[email protected]> * Remove unused dep * Try fix dev node paritytech/substrate#12828 * Fix the frontier part (#1154) * Fix dev node * Fmt * Bump moonbeam * Bump moonbeam * Remove unnecessary clone * Fix tests --------- Signed-off-by: Xavier Lau <[email protected]> Co-authored-by: Guantong <[email protected]> Co-authored-by: bear <[email protected]>
1 parent ae96c26 commit d87a45b

File tree

163 files changed

+2704
-2431
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+2704
-2431
lines changed

.maintain/pallet-weight-template.hbs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
5454
// Measured: `{{benchmark.base_recorded_proof_size}}{{#each benchmark.component_recorded_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
5555
// Estimated: `{{benchmark.base_calculated_proof_size}}{{#each benchmark.component_calculated_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
5656
// Minimum execution time: {{underscore benchmark.min_execution_time}} nanoseconds.
57-
Weight::from_ref_time({{underscore benchmark.base_weight}})
58-
.saturating_add(Weight::from_proof_size({{benchmark.base_calculated_proof_size}}))
57+
Weight::from_parts({{underscore benchmark.base_weight}}, 0)
58+
.saturating_add(Weight::from_parts({{benchmark.base_calculated_proof_size}}, 0))
5959
{{#each benchmark.component_weight as |cw|}}
6060
// Standard Error: {{underscore cw.error}}
61-
.saturating_add(Weight::from_ref_time({{underscore cw.slope}}).saturating_mul({{cw.name}}.into()))
61+
.saturating_add(Weight::from_parts({{underscore cw.slope}}, 0).saturating_mul({{cw.name}}.into()))
6262
{{/each}}
6363
{{#if (ne benchmark.base_reads "0")}}
6464
.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}_u64))
@@ -73,7 +73,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
7373
.saturating_add(T::DbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
7474
{{/each}}
7575
{{#each benchmark.component_calculated_proof_size as |cp|}}
76-
.saturating_add(Weight::from_proof_size({{cp.slope}}).saturating_mul({{cp.name}}.into()))
76+
.saturating_add(Weight::from_parts({{cp.slope}}, 0).saturating_mul({{cp.name}}.into()))
7777
{{/each}}
7878
}
7979
{{/each}}
@@ -97,11 +97,11 @@ impl WeightInfo for () {
9797
// Measured: `{{benchmark.base_recorded_proof_size}}{{#each benchmark.component_recorded_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
9898
// Estimated: `{{benchmark.base_calculated_proof_size}}{{#each benchmark.component_calculated_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
9999
// Minimum execution time: {{underscore benchmark.min_execution_time}} nanoseconds.
100-
Weight::from_ref_time({{underscore benchmark.base_weight}})
101-
.saturating_add(Weight::from_proof_size({{benchmark.base_calculated_proof_size}}))
100+
Weight::from_parts({{underscore benchmark.base_weight}}, 0)
101+
.saturating_add(Weight::from_parts({{benchmark.base_calculated_proof_size}}, 0))
102102
{{#each benchmark.component_weight as |cw|}}
103103
// Standard Error: {{underscore cw.error}}
104-
.saturating_add(Weight::from_ref_time({{underscore cw.slope}}).saturating_mul({{cw.name}}.into()))
104+
.saturating_add(Weight::from_parts({{underscore cw.slope}}, 0).saturating_mul({{cw.name}}.into()))
105105
{{/each}}
106106
{{#if (ne benchmark.base_reads "0")}}
107107
.saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}}_u64))
@@ -116,7 +116,7 @@ impl WeightInfo for () {
116116
.saturating_add(RocksDbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
117117
{{/each}}
118118
{{#each benchmark.component_calculated_proof_size as |cp|}}
119-
.saturating_add(Weight::from_proof_size({{cp.slope}}).saturating_mul({{cp.name}}.into()))
119+
.saturating_add(Weight::from_parts({{cp.slope}}, 0).saturating_mul({{cp.name}}.into()))
120120
{{/each}}
121121
}
122122
{{/each}}

0 commit comments

Comments
 (0)