Weight v1.5: Opaque Struct

bin/node/runtime/src/impls.rs

@@ -426,8 +426,8 @@ mod multiplier_tests {
 			4294967295,
 			BlockWeights::get().max_block / 2,
 			BlockWeights::get().max_block,
-			Weight::max_value() / 2,
-			Weight::max_value(),
+			Weight::MAX / 2,
+			Weight::MAX,
 		]
 		.into_iter()
 		.for_each(|i| {

bin/node/runtime/src/lib.rs

@@ -170,7 +170,7 @@ const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);
 /// by  Operational  extrinsics.
 const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
 /// We allow for 2 seconds of compute with a 6 second average block time.
-const MAXIMUM_BLOCK_WEIGHT: Weight = 2 * WEIGHT_PER_SECOND;
+const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_ref_time(2 * WEIGHT_PER_SECOND);
 
 parameter_types! {
 	pub const BlockHashCount: BlockNumber = 2400;

docs/Upgrading-2.0-to-3.0.md

@@ -100,12 +100,12 @@ And update the overall definition for weights on frame and a few related types a
 +/// by  Operational  extrinsics.
 +const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
 +/// We allow for 2 seconds of compute with a 6 second average block time.
-+const MAXIMUM_BLOCK_WEIGHT: Weight = 2 * WEIGHT_PER_SECOND;
++const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_ref_time(2 * WEIGHT_PER_SECOND);
 +
  parameter_types! {
  	pub const BlockHashCount: BlockNumber = 2400;
 -	/// We allow for 2 seconds of compute with a 6 second average block time.
--	pub const MaximumBlockWeight: Weight = 2 * WEIGHT_PER_SECOND;
+-	pub const MaximumBlockWeight: Weight = Weight::from_ref_time(2 * WEIGHT_PER_SECOND);
 -	pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
 -	/// Assume 10% of weight for average on_initialize calls.
 -	pub MaximumExtrinsicWeight: Weight =

frame/alliance/src/benchmarking.rs

@@ -332,7 +332,7 @@ benchmarks_instance_pallet! {
 		// Whitelist voter account from further DB operations.
 		let voter_key = frame_system::Account::<T>::hashed_key_for(&voter);
 		frame_benchmarking::benchmarking::add_to_whitelist(voter_key.into());
-	}: close(SystemOrigin::Signed(voter), last_hash.clone(), index, Weight::max_value(), bytes_in_storage)
+	}: close(SystemOrigin::Signed(voter), last_hash.clone(), index, Weight::MAX, bytes_in_storage)
 	verify {
 		// The last proposal is removed.
 		assert_eq!(T::ProposalProvider::proposal_of(last_hash), None);
@@ -417,7 +417,7 @@ benchmarks_instance_pallet! {
 			index,
 			true,
 		)?;
-	}: close(SystemOrigin::Signed(voter), last_hash.clone(), index, Weight::max_value(), bytes_in_storage)
+	}: close(SystemOrigin::Signed(voter), last_hash.clone(), index, Weight::MAX, bytes_in_storage)
 	verify {
 		// The last proposal is removed.
 		assert_eq!(T::ProposalProvider::proposal_of(last_hash), None);
@@ -489,7 +489,7 @@ benchmarks_instance_pallet! {
 
 		System::<T>::set_block_number(T::BlockNumber::max_value());
 
-	}: close(SystemOrigin::Signed(voter), last_hash.clone(), index, Weight::max_value(), bytes_in_storage)
+	}: close(SystemOrigin::Signed(voter), last_hash.clone(), index, Weight::MAX, bytes_in_storage)
 	verify {
 		// The last proposal is removed.
 		assert_eq!(T::ProposalProvider::proposal_of(last_hash), None);
@@ -562,7 +562,7 @@ benchmarks_instance_pallet! {
 		// caller is prime, prime already votes aye by creating the proposal
 		System::<T>::set_block_number(T::BlockNumber::max_value());
 
-	}: close(SystemOrigin::Signed(voter), last_hash.clone(), index, Weight::max_value(), bytes_in_storage)
+	}: close(SystemOrigin::Signed(voter), last_hash.clone(), index, Weight::MAX, bytes_in_storage)
 	verify {
 		// The last proposal is removed.
 		assert_eq!(T::ProposalProvider::proposal_of(last_hash), None);

frame/authorship/src/lib.rs

@@ -190,7 +190,7 @@ pub mod pallet {
 				T::EventHandler::note_author(author);
 			}
 
-			0
+			Weight::zero()
 		}
 
 		fn on_finalize(_: T::BlockNumber) {

frame/babe/src/default_weights.rs

@@ -25,7 +25,7 @@ use frame_support::weights::{
 
 impl crate::WeightInfo for () {
 	fn plan_config_change() -> Weight {
-		DbWeight::get().writes(1)
+		Weight::from_ref_time(DbWeight::get().writes(1))
 	}
 
 	fn report_equivocation(validator_count: u32) -> Weight {
@@ -38,7 +38,7 @@ impl crate::WeightInfo for () {
 		const MAX_NOMINATORS: u64 = 200;
 
 		// checking membership proof
-		(35 * WEIGHT_PER_MICROS)
+		let ref_time_weight = (35 * WEIGHT_PER_MICROS)
 			.saturating_add((175 * WEIGHT_PER_NANOS).saturating_mul(validator_count))
 			.saturating_add(DbWeight::get().reads(5))
 			// check equivocation proof
@@ -47,6 +47,8 @@ impl crate::WeightInfo for () {
 			.saturating_add(110 * WEIGHT_PER_MICROS)
 			.saturating_add(25 * WEIGHT_PER_MICROS * MAX_NOMINATORS)
 			.saturating_add(DbWeight::get().reads(14 + 3 * MAX_NOMINATORS))
-			.saturating_add(DbWeight::get().writes(10 + 3 * MAX_NOMINATORS))
+			.saturating_add(DbWeight::get().writes(10 + 3 * MAX_NOMINATORS));
+
+		Weight::from_ref_time(ref_time_weight)
 	}
 }

frame/babe/src/lib.rs

@@ -336,7 +336,7 @@ pub mod pallet {
 		/// Initialization
 		fn on_initialize(now: BlockNumberFor<T>) -> Weight {
 			Self::initialize(now);
-			0
+			Weight::zero()
 		}
 
 		/// Block finalization
@@ -880,15 +880,15 @@ impl<T: Config> frame_support::traits::EstimateNextSessionRotation<T::BlockNumbe
 		(
 			Some(Permill::from_rational(*elapsed, T::EpochDuration::get())),
 			// Read: Current Slot, Epoch Index, Genesis Slot
-			T::DbWeight::get().reads(3),
+			Weight::from_ref_time(T::DbWeight::get().reads(3)),
 		)
 	}
 
 	fn estimate_next_session_rotation(now: T::BlockNumber) -> (Option<T::BlockNumber>, Weight) {
 		(
 			Self::next_expected_epoch_change(now),
 			// Read: Current Slot, Epoch Index, Genesis Slot
-			T::DbWeight::get().reads(3),
+			Weight::from_ref_time(T::DbWeight::get().reads(3)),
 		)
 	}
 }
@@ -1008,6 +1008,6 @@ pub mod migrations {
 
 		writes += 3;
 
-		T::DbWeight::get().writes(writes) + T::DbWeight::get().reads(reads)
+		Weight::from_ref_time(T::DbWeight::get().reads_writes(reads, writes))
 	}
 }

frame/balances/src/weights.rs

@@ -39,7 +39,7 @@
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
-use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use frame_support::{traits::Get, weights::{RefTimeWeight as Weight, constants::RocksDbWeight}};
 use sp_std::marker::PhantomData;
 
 /// Weight functions needed for pallet_balances.

frame/benchmarking/src/utils.rs

@@ -127,7 +127,7 @@ pub struct BenchmarkResult {
 
 impl BenchmarkResult {
 	pub fn from_weight(w: Weight) -> Self {
-		Self { extrinsic_time: (w as u128) / 1_000, ..Default::default() }
+		Self { extrinsic_time: (w.ref_time() / 1_000) as u128, ..Default::default() }
 	}
 }
 

frame/child-bounties/src/tests.rs

@@ -60,7 +60,7 @@ frame_support::construct_runtime!(
 );
 
 parameter_types! {
-	pub const MaximumBlockWeight: Weight = 1024;
+	pub const MaximumBlockWeight= Weight::from_ref_time(1024);
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }

frame/collective/src/benchmarking.rs

@@ -355,7 +355,7 @@ benchmarks_instance_pallet! {
 		// Whitelist voter account from further DB operations.
 		let voter_key = frame_system::Account::<T>::hashed_key_for(&voter);
 		frame_benchmarking::benchmarking::add_to_whitelist(voter_key.into());
-	}: close(SystemOrigin::Signed(voter), last_hash, index, Weight::max_value(), bytes_in_storage)
+	}: close(SystemOrigin::Signed(voter), last_hash, index, Weight::MAX, bytes_in_storage)
 	verify {
 		// The last proposal is removed.
 		assert_eq!(Collective::<T, I>::proposals().len(), (p - 1) as usize);
@@ -436,7 +436,7 @@ benchmarks_instance_pallet! {
 			index, approve,
 		)?;
 
-	}: close(SystemOrigin::Signed(caller), last_hash, index, Weight::max_value(), bytes_in_storage)
+	}: close(SystemOrigin::Signed(caller), last_hash, index, Weight::MAX, bytes_in_storage)
 	verify {
 		// The last proposal is removed.
 		assert_eq!(Collective::<T, I>::proposals().len(), (p - 1) as usize);
@@ -511,7 +511,7 @@ benchmarks_instance_pallet! {
 		assert_eq!(Collective::<T, I>::proposals().len(), p as usize);
 
 		// Prime nay will close it as disapproved
-	}: close(SystemOrigin::Signed(caller), last_hash, index, Weight::max_value(), bytes_in_storage)
+	}: close(SystemOrigin::Signed(caller), last_hash, index, Weight::MAX, bytes_in_storage)
 	verify {
 		assert_eq!(Collective::<T, I>::proposals().len(), (p - 1) as usize);
 		assert_last_event::<T, I>(Event::Disapproved { proposal_hash: last_hash }.into());
@@ -583,7 +583,7 @@ benchmarks_instance_pallet! {
 		assert_eq!(Collective::<T, I>::proposals().len(), p as usize);
 
 		// Prime aye will close it as approved
-	}: close(SystemOrigin::Signed(caller), last_hash, p - 1, Weight::max_value(), bytes_in_storage)
+	}: close(SystemOrigin::Signed(caller), last_hash, p - 1, Weight::MAX, bytes_in_storage)
 	verify {
 		assert_eq!(Collective::<T, I>::proposals().len(), (p - 1) as usize);
 		assert_last_event::<T, I>(Event::Executed { proposal_hash: last_hash, result: Err(DispatchError::BadOrigin) }.into());

frame/contracts/rpc/src/lib.rs

@@ -56,11 +56,11 @@ pub type Weight = u64;
 /// As 1 gas is equal to 1 weight we base this on the conducted benchmarks which
 /// determined runtime weights:
 /// <https://github.com/paritytech/substrate/pull/5446>
-const GAS_PER_SECOND: Weight = 1_000_000_000_000;
+const GAS_PER_SECOND: Weight = Weight::from_ref_time(1_000_000_000_000);
 
 /// The maximum amount of weight that the call and instantiate rpcs are allowed to consume.
 /// This puts a ceiling on the weight limit that is supplied to the rpc as an argument.
-const GAS_LIMIT: Weight = 5 * GAS_PER_SECOND;
+const GAS_LIMIT: Weight = Weight::from_ref_time(5 * GAS_PER_SECOND);
 
 /// A private newtype for converting `ContractAccessError` into an RPC error.
 struct ContractAccessError(pallet_contracts_primitives::ContractAccessError);
@@ -229,7 +229,7 @@ where
 			call_request;
 
 		let value: Balance = decode_hex(value, "balance")?;
-		let gas_limit: Weight = decode_hex(gas_limit, "weight")?;
+		let gas_limit = Weight::from_ref_time(decode_hex(gas_limit, "weight")?);
 		let storage_deposit_limit: Option<Balance> =
 			storage_deposit_limit.map(|l| decode_hex(l, "balance")).transpose()?;
 		limit_gas(gas_limit)?;
@@ -259,7 +259,7 @@ where
 		} = instantiate_request;
 
 		let value: Balance = decode_hex(value, "balance")?;
-		let gas_limit: Weight = decode_hex(gas_limit, "weight")?;
+		let gas_limit = Weight::from_ref_time(decode_hex(gas_limit, "weight")?);
 		let storage_deposit_limit: Option<Balance> =
 			storage_deposit_limit.map(|l| decode_hex(l, "balance")).transpose()?;
 		limit_gas(gas_limit)?;

frame/contracts/src/migration.rs

@@ -26,7 +26,7 @@ use sp_std::{marker::PhantomData, prelude::*};
 /// Wrapper for all migrations of this pallet, based on `StorageVersion`.
 pub fn migrate<T: Config>() -> Weight {
 	let version = StorageVersion::get::<Pallet<T>>();
-	let mut weight: Weight = 0;
+	let mut weight = Weight::new();
 
 	if version < 4 {
 		weight = weight.saturating_add(v4::migrate::<T>());
@@ -127,7 +127,7 @@ mod v5 {
 	type DeletionQueue<T: Config> = StorageValue<Pallet<T>, Vec<DeletedContract>>;
 
 	pub fn migrate<T: Config>() -> Weight {
-		let mut weight: Weight = 0;
+		let mut weight = Weight::new();
 
 		<ContractInfoOf<T>>::translate(|_key, old: OldContractInfo<T>| {
 			weight = weight.saturating_add(T::DbWeight::get().reads_writes(1, 1));
@@ -216,7 +216,7 @@ mod v6 {
 	type OwnerInfoOf<T: Config> = StorageMap<Pallet<T>, Identity, CodeHash<T>, OwnerInfo<T>>;
 
 	pub fn migrate<T: Config>() -> Weight {
-		let mut weight: Weight = 0;
+		let mut weight = Weight::new();
 
 		<ContractInfoOf<T>>::translate(|_key, old: OldContractInfo<T>| {
 			weight = weight.saturating_add(T::DbWeight::get().reads_writes(1, 1));

frame/contracts/src/tests.rs

@@ -384,7 +384,7 @@ pub const BOB: AccountId32 = AccountId32::new([2u8; 32]);
 pub const CHARLIE: AccountId32 = AccountId32::new([3u8; 32]);
 pub const DJANGO: AccountId32 = AccountId32::new([4u8; 32]);
 
-pub const GAS_LIMIT: Weight = 100_000_000_000;
+pub const GAS_LIMIT: Weight = Weight::from_ref_time(100_000_000_000);
 
 pub struct ExtBuilder {
 	existential_deposit: u64,
@@ -1826,7 +1826,7 @@ fn lazy_removal_works() {
 		assert_matches!(child::get(trie, &[99]), Some(42));
 
 		// Run the lazy removal
-		Contracts::on_idle(System::block_number(), Weight::max_value());
+		Contracts::on_idle(System::block_number(), Weight::MAX);
 
 		// Value should be gone now
 		assert_matches!(child::get::<i32>(trie, &[99]), None);
@@ -1896,7 +1896,7 @@ fn lazy_batch_removal_works() {
 		}
 
 		// Run single lazy removal
-		Contracts::on_idle(System::block_number(), Weight::max_value());
+		Contracts::on_idle(System::block_number(), Weight::MAX);
 
 		// The single lazy removal should have removed all queued tries
 		for trie in tries.iter() {
@@ -2085,7 +2085,7 @@ fn lazy_removal_does_no_run_on_low_remaining_weight() {
 		assert_matches!(child::get::<i32>(trie, &[99]), Some(42));
 
 		// Run on_idle with max remaining weight, this should remove the value
-		Contracts::on_idle(System::block_number(), Weight::max_value());
+		Contracts::on_idle(System::block_number(), Weight::MAX);
 
 		// Value should be gone
 		assert_matches!(child::get::<i32>(trie, &[99]), None);

frame/democracy/src/lib.rs

@@ -1765,7 +1765,7 @@ impl<T: Config> Pallet<T> {
 	/// # </weight>
 	fn begin_block(now: T::BlockNumber) -> Weight {
 		let max_block_weight = T::BlockWeights::get().max_block;
-		let mut weight = 0;
+		let mut weight = Weight::new();
 
 		let next = Self::lowest_unbaked();
 		let last = Self::referendum_count();

frame/democracy/src/tests.rs

@@ -107,7 +107,7 @@ impl frame_system::Config for Test {
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
 }
 parameter_types! {
-	pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) * BlockWeights::get().max_block;
+	pub MaximumSchedulerWeight: Weight = Weight::from_ref_time(Perbill::from_percent(80) * BlockWeights::get().max_block);
 }
 impl pallet_scheduler::Config for Test {
 	type Event = Event;

frame/election-provider-multi-phase/src/mock.rs

@@ -271,12 +271,12 @@ parameter_types! {
 	pub static SignedDepositByte: Balance = 0;
 	pub static SignedDepositWeight: Balance = 0;
 	pub static SignedRewardBase: Balance = 7;
-	pub static SignedMaxWeight: Weight = BlockWeights::get().max_block;
+	pub static SignedMaxWeight: Weight = Weight::from_ref_time(BlockWeights::get().max_block);
 	pub static MinerTxPriority: u64 = 100;
 	pub static BetterSignedThreshold: Perbill = Perbill::zero();
 	pub static BetterUnsignedThreshold: Perbill = Perbill::zero();
 	pub static OffchainRepeat: BlockNumber = 5;
-	pub static MinerMaxWeight: Weight = BlockWeights::get().max_block;
+	pub static MinerMaxWeight: Weight = Weight::from_ref_time(BlockWeights::get().max_block);
 	pub static MinerMaxLength: u32 = 256;
 	pub static MockWeightInfo: MockedWeightInfo = MockedWeightInfo::Real;
 	pub static MaxElectingVoters: VoterIndex = u32::max_value();

frame/elections-phragmen/src/migrations/v3.rs

@@ -101,7 +101,7 @@ pub fn apply<V: V2ToV3, T: Config>(
 
 		StorageVersion::new(3).put::<Pallet<T>>();
 
-		Weight::max_value()
+		Weight::MAX
 	} else {
 		log::warn!(
 			target: "runtime::elections-phragmen",

frame/elections-phragmen/src/migrations/v5.rs

@@ -8,7 +8,7 @@ use super::super::*;
 /// situation where they could increase their free balance but still not be able to use their funds
 /// because they were less than the lock.
 pub fn migrate<T: Config>(to_migrate: Vec<T::AccountId>) -> Weight {
-	let mut weight = 0;
+	let mut weight = Weight::new();
 
 	for who in to_migrate.iter() {
 		if let Ok(mut voter) = Voting::<T>::try_get(who) {

frame/executive/README.md

@@ -56,7 +56,7 @@ struct CustomOnRuntimeUpgrade;
 impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
     fn on_runtime_upgrade() -> frame_support::weights::Weight {
         // Do whatever you want.
-        0
+        frame_support::weights::Weight::zero()
     }
 }