Update template to remove clippy warnings (#12670)

* Update template to remove clippy warnings

* ".git/.scripts/bench-bot.sh" pallet dev pallet_lottery

* Update templates from child project

This should remove clippy warnings on generated files

* Update after review

* Update frame-weight-template.hbs

Commit suggestion

* ".git/.scripts/bench-bot.sh" pallet dev pallet_lottery

* Rerun linter on linked project

Updates from child project

* ".git/.scripts/bench-bot.sh" pallet dev pallet_lottery

Co-authored-by: command-bot <>

.maintain/frame-weight-template.hbs

@@ -49,22 +49,22 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
 	) -> Weight {
 		// Minimum execution time: {{underscore benchmark.min_execution_time}} nanoseconds.
-		Weight::from_ref_time({{underscore benchmark.base_weight}} as u64)
+		Weight::from_ref_time({{underscore benchmark.base_weight}})
 			{{#each benchmark.component_weight as |cw|}}
 			// Standard Error: {{underscore cw.error}}
-			.saturating_add(Weight::from_ref_time({{underscore cw.slope}} as u64).saturating_mul({{cw.name}} as u64))
+			.saturating_add(Weight::from_ref_time({{underscore cw.slope}}).saturating_mul({{cw.name}}.into()))
 			{{/each}}
 			{{#if (ne benchmark.base_reads "0")}}
-			.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as u64))
+			.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}))
 			{{/if}}
 			{{#each benchmark.component_reads as |cr|}}
-			.saturating_add(T::DbWeight::get().reads(({{cr.slope}} as u64).saturating_mul({{cr.name}} as u64)))
+			.saturating_add(T::DbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into())))
 			{{/each}}
 			{{#if (ne benchmark.base_writes "0")}}
-			.saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as u64))
+			.saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}))
 			{{/if}}
 			{{#each benchmark.component_writes as |cw|}}
-			.saturating_add(T::DbWeight::get().writes(({{cw.slope}} as u64).saturating_mul({{cw.name}} as u64)))
+			.saturating_add(T::DbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
 			{{/each}}
 	}
 	{{/each}}
@@ -85,22 +85,22 @@ impl WeightInfo for () {
 		{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
 	) -> Weight {
 		// Minimum execution time: {{underscore benchmark.min_execution_time}} nanoseconds.
-		Weight::from_ref_time({{underscore benchmark.base_weight}} as u64)
+		Weight::from_ref_time({{underscore benchmark.base_weight}})
 			{{#each benchmark.component_weight as |cw|}}
 			// Standard Error: {{underscore cw.error}}
-			.saturating_add(Weight::from_ref_time({{underscore cw.slope}} as u64).saturating_mul({{cw.name}} as u64))
+			.saturating_add(Weight::from_ref_time({{underscore cw.slope}}).saturating_mul({{cw.name}}.into()))
 			{{/each}}
 			{{#if (ne benchmark.base_reads "0")}}
-			.saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}} as u64))
+			.saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}}))
 			{{/if}}
 			{{#each benchmark.component_reads as |cr|}}
-			.saturating_add(RocksDbWeight::get().reads(({{cr.slope}} as u64).saturating_mul({{cr.name}} as u64)))
+			.saturating_add(RocksDbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into())))
 			{{/each}}
 			{{#if (ne benchmark.base_writes "0")}}
-			.saturating_add(RocksDbWeight::get().writes({{benchmark.base_writes}} as u64))
+			.saturating_add(RocksDbWeight::get().writes({{benchmark.base_writes}}))
 			{{/if}}
 			{{#each benchmark.component_writes as |cw|}}
-			.saturating_add(RocksDbWeight::get().writes(({{cw.slope}} as u64).saturating_mul({{cw.name}} as u64)))
+			.saturating_add(RocksDbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
 			{{/each}}
 	}
 	{{/each}}

frame/lottery/src/weights.rs

@@ -18,24 +18,25 @@
 //! Autogenerated weights for pallet_lottery
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `bm2`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
+//! DATE: 2022-11-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `bm3`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/substrate
+// /home/benchbot/cargo_target_dir/production/substrate
 // benchmark
 // pallet
-// --chain=dev
 // --steps=50
 // --repeat=20
-// --pallet=pallet_lottery
 // --extrinsic=*
 // --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
-// --output=./frame/lottery/src/weights.rs
+// --json-file=/var/lib/gitlab-runner/builds/zyw4fam_/0/parity/mirrors/substrate/.git/.artifacts/bench.json
+// --pallet=pallet_lottery
+// --chain=dev
 // --header=./HEADER-APACHE2
+// --output=./frame/lottery/src/weights.rs
 // --template=./.maintain/frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
@@ -66,46 +67,46 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:1)
 	// Storage: Lottery Tickets (r:0 w:1)
 	fn buy_ticket() -> Weight {
-		// Minimum execution time: 52_451 nanoseconds.
-		Weight::from_ref_time(52_843_000 as u64)
-			.saturating_add(T::DbWeight::get().reads(6 as u64))
-			.saturating_add(T::DbWeight::get().writes(4 as u64))
+		// Minimum execution time: 53_735 nanoseconds.
+		Weight::from_ref_time(54_235_000)
+			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	// Storage: Lottery CallIndices (r:0 w:1)
 	/// The range of component `n` is `[0, 10]`.
 	fn set_calls(n: u32, ) -> Weight {
-		// Minimum execution time: 14_389 nanoseconds.
-		Weight::from_ref_time(15_700_569 as u64)
-			// Standard Error: 4_677
-			.saturating_add(Weight::from_ref_time(296_850 as u64).saturating_mul(n as u64))
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
+		// Minimum execution time: 15_065 nanoseconds.
+		Weight::from_ref_time(16_467_398)
+			// Standard Error: 5_392
+			.saturating_add(Weight::from_ref_time(294_914).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	// Storage: Lottery Lottery (r:1 w:1)
 	// Storage: Lottery LotteryIndex (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn start_lottery() -> Weight {
-		// Minimum execution time: 44_814 nanoseconds.
-		Weight::from_ref_time(45_611_000 as u64)
-			.saturating_add(T::DbWeight::get().reads(3 as u64))
-			.saturating_add(T::DbWeight::get().writes(3 as u64))
+		// Minimum execution time: 45_990 nanoseconds.
+		Weight::from_ref_time(46_789_000)
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
 	// Storage: Lottery Lottery (r:1 w:1)
 	fn stop_repeat() -> Weight {
-		// Minimum execution time: 10_384 nanoseconds.
-		Weight::from_ref_time(10_727_000 as u64)
-			.saturating_add(T::DbWeight::get().reads(1 as u64))
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
+		// Minimum execution time: 10_783 nanoseconds.
+		Weight::from_ref_time(11_180_000)
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	// Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0)
 	// Storage: Lottery Lottery (r:1 w:1)
 	// Storage: System Account (r:2 w:2)
 	// Storage: Lottery TicketsCount (r:1 w:1)
 	// Storage: Lottery Tickets (r:1 w:0)
 	fn on_initialize_end() -> Weight {
-		// Minimum execution time: 62_720 nanoseconds.
-		Weight::from_ref_time(63_545_000 as u64)
-			.saturating_add(T::DbWeight::get().reads(6 as u64))
-			.saturating_add(T::DbWeight::get().writes(4 as u64))
+		// Minimum execution time: 62_088 nanoseconds.
+		Weight::from_ref_time(63_670_000)
+			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	// Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0)
 	// Storage: Lottery Lottery (r:1 w:1)
@@ -114,10 +115,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Lottery Tickets (r:1 w:0)
 	// Storage: Lottery LotteryIndex (r:1 w:1)
 	fn on_initialize_repeat() -> Weight {
-		// Minimum execution time: 63_452 nanoseconds.
-		Weight::from_ref_time(65_010_000 as u64)
-			.saturating_add(T::DbWeight::get().reads(7 as u64))
-			.saturating_add(T::DbWeight::get().writes(5 as u64))
+		// Minimum execution time: 64_953 nanoseconds.
+		Weight::from_ref_time(65_465_000)
+			.saturating_add(T::DbWeight::get().reads(7))
+			.saturating_add(T::DbWeight::get().writes(5))
 	}
 }
 
@@ -131,46 +132,46 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:1)
 	// Storage: Lottery Tickets (r:0 w:1)
 	fn buy_ticket() -> Weight {
-		// Minimum execution time: 52_451 nanoseconds.
-		Weight::from_ref_time(52_843_000 as u64)
-			.saturating_add(RocksDbWeight::get().reads(6 as u64))
-			.saturating_add(RocksDbWeight::get().writes(4 as u64))
+		// Minimum execution time: 53_735 nanoseconds.
+		Weight::from_ref_time(54_235_000)
+			.saturating_add(RocksDbWeight::get().reads(6))
+			.saturating_add(RocksDbWeight::get().writes(4))
 	}
 	// Storage: Lottery CallIndices (r:0 w:1)
 	/// The range of component `n` is `[0, 10]`.
 	fn set_calls(n: u32, ) -> Weight {
-		// Minimum execution time: 14_389 nanoseconds.
-		Weight::from_ref_time(15_700_569 as u64)
-			// Standard Error: 4_677
-			.saturating_add(Weight::from_ref_time(296_850 as u64).saturating_mul(n as u64))
-			.saturating_add(RocksDbWeight::get().writes(1 as u64))
+		// Minimum execution time: 15_065 nanoseconds.
+		Weight::from_ref_time(16_467_398)
+			// Standard Error: 5_392
+			.saturating_add(Weight::from_ref_time(294_914).saturating_mul(n.into()))
+			.saturating_add(RocksDbWeight::get().writes(1))
 	}
 	// Storage: Lottery Lottery (r:1 w:1)
 	// Storage: Lottery LotteryIndex (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn start_lottery() -> Weight {
-		// Minimum execution time: 44_814 nanoseconds.
-		Weight::from_ref_time(45_611_000 as u64)
-			.saturating_add(RocksDbWeight::get().reads(3 as u64))
-			.saturating_add(RocksDbWeight::get().writes(3 as u64))
+		// Minimum execution time: 45_990 nanoseconds.
+		Weight::from_ref_time(46_789_000)
+			.saturating_add(RocksDbWeight::get().reads(3))
+			.saturating_add(RocksDbWeight::get().writes(3))
 	}
 	// Storage: Lottery Lottery (r:1 w:1)
 	fn stop_repeat() -> Weight {
-		// Minimum execution time: 10_384 nanoseconds.
-		Weight::from_ref_time(10_727_000 as u64)
-			.saturating_add(RocksDbWeight::get().reads(1 as u64))
-			.saturating_add(RocksDbWeight::get().writes(1 as u64))
+		// Minimum execution time: 10_783 nanoseconds.
+		Weight::from_ref_time(11_180_000)
+			.saturating_add(RocksDbWeight::get().reads(1))
+			.saturating_add(RocksDbWeight::get().writes(1))
 	}
 	// Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0)
 	// Storage: Lottery Lottery (r:1 w:1)
 	// Storage: System Account (r:2 w:2)
 	// Storage: Lottery TicketsCount (r:1 w:1)
 	// Storage: Lottery Tickets (r:1 w:0)
 	fn on_initialize_end() -> Weight {
-		// Minimum execution time: 62_720 nanoseconds.
-		Weight::from_ref_time(63_545_000 as u64)
-			.saturating_add(RocksDbWeight::get().reads(6 as u64))
-			.saturating_add(RocksDbWeight::get().writes(4 as u64))
+		// Minimum execution time: 62_088 nanoseconds.
+		Weight::from_ref_time(63_670_000)
+			.saturating_add(RocksDbWeight::get().reads(6))
+			.saturating_add(RocksDbWeight::get().writes(4))
 	}
 	// Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0)
 	// Storage: Lottery Lottery (r:1 w:1)
@@ -179,9 +180,9 @@ impl WeightInfo for () {
 	// Storage: Lottery Tickets (r:1 w:0)
 	// Storage: Lottery LotteryIndex (r:1 w:1)
 	fn on_initialize_repeat() -> Weight {
-		// Minimum execution time: 63_452 nanoseconds.
-		Weight::from_ref_time(65_010_000 as u64)
-			.saturating_add(RocksDbWeight::get().reads(7 as u64))
-			.saturating_add(RocksDbWeight::get().writes(5 as u64))
+		// Minimum execution time: 64_953 nanoseconds.
+		Weight::from_ref_time(65_465_000)
+			.saturating_add(RocksDbWeight::get().reads(7))
+			.saturating_add(RocksDbWeight::get().writes(5))
 	}
 }

utils/frame/benchmarking-cli/src/pallet/template.hbs

@@ -34,22 +34,22 @@ impl<T: frame_system::Config> {{pallet}}::WeightInfo for WeightInfo<T> {
 		{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
 	) -> Weight {
 		// Minimum execution time: {{underscore benchmark.min_execution_time}} nanoseconds.
-		Weight::from_ref_time({{underscore benchmark.base_weight}} as u64)
+		Weight::from_ref_time({{underscore benchmark.base_weight}})
 			{{#each benchmark.component_weight as |cw|}}
 			// Standard Error: {{underscore cw.error}}
-			.saturating_add(Weight::from_ref_time({{underscore cw.slope}} as u64).saturating_mul({{cw.name}} as u64))
+			.saturating_add(Weight::from_ref_time({{underscore cw.slope}}).saturating_mul({{cw.name}}.into()))
 			{{/each}}
 			{{#if (ne benchmark.base_reads "0")}}
-			.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as u64))
+			.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}))
 			{{/if}}
 			{{#each benchmark.component_reads as |cr|}}
-			.saturating_add(T::DbWeight::get().reads(({{cr.slope}} as u64).saturating_mul({{cr.name}} as u64)))
+			.saturating_add(T::DbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into())))
 			{{/each}}
 			{{#if (ne benchmark.base_writes "0")}}
-			.saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as u64))
+			.saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}))
 			{{/if}}
 			{{#each benchmark.component_writes as |cw|}}
-			.saturating_add(T::DbWeight::get().writes(({{cw.slope}} as u64).saturating_mul({{cw.name}} as u64)))
+			.saturating_add(T::DbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
 			{{/each}}
 	}
 	{{/each}}