update weight-template and some related comments.

.maintain/frame-weight-template.hbs

@@ -60,10 +60,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		{{~#each benchmark.components as |c| ~}}
 		{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
 	) -> Weight {
-		{{weightAsNanoseconds benchmark.base_weight}}
+		({{weightAsNanoseconds benchmark.base_weight}} as Weight).saturating_mul(WEIGHT_PER_NANOS)
 			{{#each benchmark.component_weight as |cw|}}
-			// Standard Error: {{weightAsNanoseconds cw.error}}
-			.saturating_add({{weightAsNanoseconds cw.slope}}.saturating_mul({{cw.name}} as Weight))
+			// Standard Error: {{weightAsNanoseconds cw.error}} NS
+			.saturating_add(({{weightAsNanoseconds cw.slope}} as Weight).saturating_mul(WEIGHT_PER_NANOS).saturating_mul({{cw.name}} as Weight))
 			{{/each}}
 			{{#if (ne benchmark.base_reads "0")}}
 			.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as Weight))
@@ -92,10 +92,10 @@ impl WeightInfo for () {
 		{{~#each benchmark.components as |c| ~}}
 		{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
 	) -> Weight {
-		{{weightAsNanoseconds benchmark.base_weight}}
+		({{weightAsNanoseconds benchmark.base_weight}} as Weight).saturating_mul(WEIGHT_PER_NANOS)
 			{{#each benchmark.component_weight as |cw|}}
-			// Standard Error: {{weightAsNanoseconds cw.error}}
-			.saturating_add({{weightAsNanoseconds cw.slope}}.saturating_mul({{cw.name}} as Weight))
+			// Standard Error: {{weightAsNanoseconds cw.error}} NS
+			.saturating_add(({{weightAsNanoseconds cw.slope}} as Weight).saturating_mul(WEIGHT_PER_NANOS).saturating_mul({{cw.name}} as Weight))
 			{{/each}}
 			{{#if (ne benchmark.base_reads "0")}}
 			.saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}} as Weight))

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

@@ -29,10 +29,10 @@ impl<T: frame_system::Config> {{pallet}}::WeightInfo for WeightInfo<T> {
 		{{~#each benchmark.components as |c| ~}}
 		{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
 	) -> Weight {
-		{{weightAsNanoseconds benchmark.base_weight}}
+		({{weightAsNanoseconds benchmark.base_weight}} as Weight).saturating_mul(WEIGHT_PER_NANOS)
 			{{#each benchmark.component_weight as |cw|}}
-			// Standard Error: {{weightAsNanoseconds cw.error}}
-			.saturating_add({{weightAsNanoseconds cw.slope}}.saturating_mul({{cw.name}} as Weight))
+			// Standard Error: {{weightAsNanoseconds cw.error}} NS
+			.saturating_add(({{weightAsNanoseconds cw.slope}} as Weight).saturating_mul(WEIGHT_PER_NANOS).saturating_mul({{cw.name}} as Weight))
 			{{/each}}
 			{{#if (ne benchmark.base_reads "0")}}
 			.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as Weight))

utils/frame/benchmarking-cli/src/shared/mod.rs

@@ -67,8 +67,8 @@ where
 	s
 }
 
-/// A Handlebars helper to add an underscore after every 3rd character,then format it,
-/// i.e. a separator for large numbers : 123000000 -> 123_000 * WEIGHT_PER_NANOS.
+/// A Handlebars helper to convert to NS as a unit and add an underscore after every 3rd character,
+/// i.e. a separator for large numbers : 123000000 -> 123_000 NS.
 #[derive(Clone, Copy)]
 pub struct WeightAsNanoseconds;
 
@@ -88,8 +88,8 @@ impl handlebars::HelperDef for WeightAsNanoseconds {
 	}
 }
 
-/// Add an underscore after every 3rd character, then format it, i.e. a separator for large numbers:
-/// 123000000 -> 123_000 * WEIGHT_PER_NANOS.
+/// Convert to NS as a unit and add an underscore after every 3rd character,
+/// i.e. a separator for large numbers: 123000000 -> 123_000 NS.
 fn weight_as_nanoseconds<Number>(i: Number) -> String
 where
 	Number: std::string::ToString,
@@ -106,8 +106,6 @@ where
 		}
 		s.insert(0, val);
 	}
-	s.insert(0, '(');
-	s.push_str(" as Weight).saturating_mul(WEIGHT_PER_NANOS)");
 	s
 }