get rid of obsolete weight functions (paritytech#1926)

bridges/bin/runtime-common/src/refund_relayer_extension.rs

@@ -746,8 +746,9 @@ mod tests {
 
 	fn dispatch_info() -> DispatchInfo {
 		DispatchInfo {
-			weight: Weight::from_ref_time(
+			weight: Weight::from_parts(
 				frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND,
+				0,
 			),
 			class: frame_support::dispatch::DispatchClass::Normal,
 			pays_fee: frame_support::dispatch::Pays::Yes,
@@ -1037,8 +1038,9 @@ mod tests {
 			initialize_environment(200, 200, [1u8; 32].into(), 200);
 
 			let mut dispatch_info = dispatch_info();
-			dispatch_info.weight = Weight::from_ref_time(
+			dispatch_info.weight = Weight::from_parts(
 				frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND * 2,
+				0,
 			);
 
 			// without any size/weight refund: we expect regular reward

bridges/modules/beefy/src/lib.rs

@@ -133,7 +133,7 @@ pub mod pallet {
 		fn on_initialize(_n: T::BlockNumber) -> frame_support::weights::Weight {
 			<RequestCount<T, I>>::mutate(|count| *count = count.saturating_sub(1));
 
-			Weight::from_ref_time(0)
+			Weight::from_parts(0, 0)
 				.saturating_add(T::DbWeight::get().reads(1))
 				.saturating_add(T::DbWeight::get().writes(1))
 		}

bridges/modules/beefy/src/mock.rs

@@ -72,7 +72,7 @@ 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();
 }

bridges/modules/grandpa/src/mock.rs

@@ -54,7 +54,7 @@ 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();
 }

bridges/modules/grandpa/src/weights.rs

@@ -17,7 +17,7 @@
 //! Autogenerated weights for pallet_bridge_grandpa
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-03-01, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-03-02, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `covid`, CPU: `11th Gen Intel(R) Core(TM) i7-11800H @ 2.30GHz`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
@@ -100,12 +100,12 @@ impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `394 + p * (60 ±0)`
 		//  Estimated: `4745`
-		// Minimum execution time: 221_810 nanoseconds.
-		Weight::from_parts(33_157_392, 4745)
-			// Standard Error: 109_045
-			.saturating_add(Weight::from_ref_time(41_100_656).saturating_mul(p.into()))
-			// Standard Error: 7_754
-			.saturating_add(Weight::from_ref_time(1_534_466).saturating_mul(v.into()))
+		// Minimum execution time: 228_072 nanoseconds.
+		Weight::from_parts(57_853_228, 4745)
+			// Standard Error: 149_421
+			.saturating_add(Weight::from_parts(36_708_702, 0).saturating_mul(p.into()))
+			// Standard Error: 10_625
+			.saturating_add(Weight::from_parts(1_469_032, 0).saturating_mul(v.into()))
 			.saturating_add(T::DbWeight::get().reads(6_u64))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
@@ -155,12 +155,12 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `394 + p * (60 ±0)`
 		//  Estimated: `4745`
-		// Minimum execution time: 221_810 nanoseconds.
-		Weight::from_parts(33_157_392, 4745)
-			// Standard Error: 109_045
-			.saturating_add(Weight::from_ref_time(41_100_656).saturating_mul(p.into()))
-			// Standard Error: 7_754
-			.saturating_add(Weight::from_ref_time(1_534_466).saturating_mul(v.into()))
+		// Minimum execution time: 228_072 nanoseconds.
+		Weight::from_parts(57_853_228, 4745)
+			// Standard Error: 149_421
+			.saturating_add(Weight::from_parts(36_708_702, 0).saturating_mul(p.into()))
+			// Standard Error: 10_625
+			.saturating_add(Weight::from_parts(1_469_032, 0).saturating_mul(v.into()))
 			.saturating_add(RocksDbWeight::get().reads(6_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}

bridges/modules/messages/src/mock.rs

@@ -89,7 +89,7 @@ frame_support::construct_runtime! {
 
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	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();
 }
@@ -410,7 +410,7 @@ pub const fn message_payload(id: u64, declared_weight: u64) -> TestPayload {
 	TestPayload {
 		id,
 		reject_by_lane_verifier: false,
-		declared_weight: Weight::from_ref_time(declared_weight),
+		declared_weight: Weight::from_parts(declared_weight, 0),
 		dispatch_result: dispatch_result(0),
 		extra: Vec::new(),
 	}
@@ -421,7 +421,7 @@ pub const fn dispatch_result(
 	unspent_weight: u64,
 ) -> MessageDispatchResult<TestDispatchLevelResult> {
 	MessageDispatchResult {
-		unspent_weight: Weight::from_ref_time(unspent_weight),
+		unspent_weight: Weight::from_parts(unspent_weight, 0),
 		dispatch_level_result: (),
 	}
 }

bridges/modules/messages/src/weights.rs

@@ -14,10 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Autogenerated weights for pallet_bridge_messages
+//! Autogenerated weights for RialtoMessages
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-03-01, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-03-02, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `covid`, CPU: `11th Gen Intel(R) Core(TM) i7-11800H @ 2.30GHz`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
@@ -29,7 +29,7 @@
 // --chain=dev
 // --steps=50
 // --repeat=20
-// --pallet=pallet_bridge_messages
+// --pallet=RialtoMessages
 // --extrinsic=*
 // --execution=wasm
 // --wasm-execution=Compiled
@@ -48,7 +48,7 @@ use frame_support::{
 };
 use sp_std::marker::PhantomData;
 
-/// Weight functions needed for pallet_bridge_messages.
+/// Weight functions needed for RialtoMessages.
 pub trait WeightInfo {
 	fn receive_single_message_proof() -> Weight;
 	fn receive_two_messages_proof() -> Weight;
@@ -60,7 +60,7 @@ pub trait WeightInfo {
 	fn receive_delivery_proof_for_two_messages_by_two_relayers() -> Weight;
 }
 
-/// Weights for `pallet_bridge_messages` that are generated using one of the Bridge testnets.
+/// Weights for `RialtoMessages` that are generated using one of the Bridge testnets.
 ///
 /// Those weights are test only and must never be used in production.
 pub struct BridgeWeight<T>(PhantomData<T>);
@@ -88,8 +88,8 @@ impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `693`
 		//  Estimated: `54703`
-		// Minimum execution time: 48_426 nanoseconds.
-		Weight::from_parts(50_113_000, 54703)
+		// Minimum execution time: 48_058 nanoseconds.
+		Weight::from_parts(50_422_000, 54703)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -116,8 +116,8 @@ impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `693`
 		//  Estimated: `54703`
-		// Minimum execution time: 59_739 nanoseconds.
-		Weight::from_parts(61_704_000, 54703)
+		// Minimum execution time: 59_371 nanoseconds.
+		Weight::from_parts(61_726_000, 54703)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -144,8 +144,8 @@ impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `693`
 		//  Estimated: `54703`
-		// Minimum execution time: 53_760 nanoseconds.
-		Weight::from_parts(55_645_000, 54703)
+		// Minimum execution time: 53_398 nanoseconds.
+		Weight::from_parts(54_351_000, 54703)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -167,8 +167,8 @@ impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `618`
 		//  Estimated: `54200`
-		// Minimum execution time: 49_582 nanoseconds.
-		Weight::from_parts(51_250_000, 54200)
+		// Minimum execution time: 50_064 nanoseconds.
+		Weight::from_parts(51_306_000, 54200)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -190,8 +190,8 @@ impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `618`
 		//  Estimated: `54200`
-		// Minimum execution time: 76_418 nanoseconds.
-		Weight::from_parts(77_877_000, 54200)
+		// Minimum execution time: 75_403 nanoseconds.
+		Weight::from_parts(77_006_000, 54200)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -218,8 +218,8 @@ impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `579`
 		//  Estimated: `5624`
-		// Minimum execution time: 41_795 nanoseconds.
-		Weight::from_parts(43_683_000, 5624)
+		// Minimum execution time: 41_670 nanoseconds.
+		Weight::from_parts(42_863_000, 5624)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -246,8 +246,8 @@ impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `596`
 		//  Estimated: `5624`
-		// Minimum execution time: 39_946 nanoseconds.
-		Weight::from_parts(41_509_000, 5624)
+		// Minimum execution time: 40_928 nanoseconds.
+		Weight::from_parts(42_165_000, 5624)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -274,8 +274,8 @@ impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `596`
 		//  Estimated: `8164`
-		// Minimum execution time: 42_882 nanoseconds.
-		Weight::from_parts(44_367_000, 8164)
+		// Minimum execution time: 44_022 nanoseconds.
+		Weight::from_parts(44_657_000, 8164)
 			.saturating_add(T::DbWeight::get().reads(5_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -306,8 +306,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `693`
 		//  Estimated: `54703`
-		// Minimum execution time: 48_426 nanoseconds.
-		Weight::from_parts(50_113_000, 54703)
+		// Minimum execution time: 48_058 nanoseconds.
+		Weight::from_parts(50_422_000, 54703)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -334,8 +334,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `693`
 		//  Estimated: `54703`
-		// Minimum execution time: 59_739 nanoseconds.
-		Weight::from_parts(61_704_000, 54703)
+		// Minimum execution time: 59_371 nanoseconds.
+		Weight::from_parts(61_726_000, 54703)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -362,8 +362,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `693`
 		//  Estimated: `54703`
-		// Minimum execution time: 53_760 nanoseconds.
-		Weight::from_parts(55_645_000, 54703)
+		// Minimum execution time: 53_398 nanoseconds.
+		Weight::from_parts(54_351_000, 54703)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -385,8 +385,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `618`
 		//  Estimated: `54200`
-		// Minimum execution time: 49_582 nanoseconds.
-		Weight::from_parts(51_250_000, 54200)
+		// Minimum execution time: 50_064 nanoseconds.
+		Weight::from_parts(51_306_000, 54200)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -408,8 +408,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `618`
 		//  Estimated: `54200`
-		// Minimum execution time: 76_418 nanoseconds.
-		Weight::from_parts(77_877_000, 54200)
+		// Minimum execution time: 75_403 nanoseconds.
+		Weight::from_parts(77_006_000, 54200)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -436,8 +436,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `579`
 		//  Estimated: `5624`
-		// Minimum execution time: 41_795 nanoseconds.
-		Weight::from_parts(43_683_000, 5624)
+		// Minimum execution time: 41_670 nanoseconds.
+		Weight::from_parts(42_863_000, 5624)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -464,8 +464,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `596`
 		//  Estimated: `5624`
-		// Minimum execution time: 39_946 nanoseconds.
-		Weight::from_parts(41_509_000, 5624)
+		// Minimum execution time: 40_928 nanoseconds.
+		Weight::from_parts(42_165_000, 5624)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -492,8 +492,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `596`
 		//  Estimated: `8164`
-		// Minimum execution time: 42_882 nanoseconds.
-		Weight::from_parts(44_367_000, 8164)
+		// Minimum execution time: 44_022 nanoseconds.
+		Weight::from_parts(44_657_000, 8164)
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}

bridges/modules/parachains/src/mock.rs

@@ -158,7 +158,7 @@ construct_runtime! {
 
 parameter_types! {
 	pub const BlockHashCount: TestNumber = 250;
-	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();
 }