--- a/pallets/common/src/dispatch.rs +++ b/pallets/common/src/dispatch.rs @@ -19,7 +19,7 @@ // Read collection ::DbWeight::get().reads(1) // Dynamic dispatch? - + Weight::from_ref_time(6_000_000) + + Weight::from_parts(6_000_000, 0) // submit_logs is measured as part of collection pallets } --- a/pallets/common/src/lib.rs +++ b/pallets/common/src/lib.rs @@ -92,6 +92,7 @@ pub mod dispatch; pub mod erc; pub mod eth; +#[allow(missing_docs)] pub mod weights; /// Weight info. @@ -157,10 +158,12 @@ reads: u64, ) -> pallet_evm_coder_substrate::execution::Result<()> { self.recorder - .consume_gas(T::GasWeightMapping::weight_to_gas(Weight::from_ref_time( + .consume_gas(T::GasWeightMapping::weight_to_gas(Weight::from_parts( ::DbWeight::get() .read .saturating_mul(reads), + // TODO: measure proof + 0, ))) } @@ -170,10 +173,12 @@ writes: u64, ) -> pallet_evm_coder_substrate::execution::Result<()> { self.recorder - .consume_gas(T::GasWeightMapping::weight_to_gas(Weight::from_ref_time( + .consume_gas(T::GasWeightMapping::weight_to_gas(Weight::from_parts( ::DbWeight::get() .write .saturating_mul(writes), + // TODO: measure proof + 0, ))) } @@ -187,8 +192,10 @@ let reads = weight.read.saturating_mul(reads); let writes = weight.read.saturating_mul(writes); self.recorder - .consume_gas(T::GasWeightMapping::weight_to_gas(Weight::from_ref_time( + .consume_gas(T::GasWeightMapping::weight_to_gas(Weight::from_parts( reads.saturating_add(writes), + // TODO: measure proof + 0, ))) } --- a/pallets/evm-coder-substrate/src/execution.rs +++ b/pallets/evm-coder-substrate/src/execution.rs @@ -61,7 +61,7 @@ fn dispatch_info(&self) -> DispatchInfo { DispatchInfo { // ERC165 impl should be cheap - weight: Weight::from_ref_time(200), + weight: Weight::from_parts(200, 0), } } } @@ -77,10 +77,11 @@ Self { weight } } } +// TODO: use 2-dimensional weight after frontier upgrade impl From for DispatchInfo { fn from(weight: u64) -> Self { Self { - weight: Weight::from_ref_time(weight), + weight: Weight::from_parts(weight, 0), } } } --- a/pallets/evm-migration/src/lib.rs +++ b/pallets/evm-migration/src/lib.rs @@ -21,6 +21,7 @@ pub use pallet::*; #[cfg(feature = "runtime-benchmarks")] pub mod benchmarking; +#[allow(missing_docs)] pub mod weights; #[frame_support::pallet] --- a/pallets/unique/src/benchmarking.rs +++ b/pallets/unique/src/benchmarking.rs @@ -26,6 +26,11 @@ Config as CommonConfig, benchmarking::{create_data, create_u16_data}, }; +use up_data_structs::{ + CollectionId, CollectionMode, MAX_COLLECTION_NAME_LENGTH, MAX_TOKEN_PREFIX_LENGTH, + MAX_COLLECTION_DESCRIPTION_LENGTH, CollectionLimits, +}; +use pallet_common::erc::CrossAccountId; const SEED: u32 = 1; @@ -34,9 +39,9 @@ mode: CollectionMode, ) -> Result { ::Currency::deposit_creating(&owner, T::CollectionCreationPrice::get()); - let col_name = create_u16_data::(); - let col_desc = create_u16_data::(); - let token_prefix = create_data::(); + let col_name = create_u16_data::<{ MAX_COLLECTION_NAME_LENGTH }>(); + let col_desc = create_u16_data::<{ MAX_COLLECTION_DESCRIPTION_LENGTH }>(); + let token_prefix = create_data::<{ MAX_TOKEN_PREFIX_LENGTH }>(); >::create_collection( RawOrigin::Signed(owner).into(), col_name, @@ -54,9 +59,9 @@ benchmarks! { create_collection { - let col_name = create_u16_data::(); - let col_desc = create_u16_data::(); - let token_prefix = create_data::(); + let col_name = create_u16_data::<{MAX_COLLECTION_NAME_LENGTH}>(); + let col_desc = create_u16_data::<{MAX_COLLECTION_DESCRIPTION_LENGTH}>(); + let token_prefix = create_data::<{MAX_TOKEN_PREFIX_LENGTH}>(); let mode: CollectionMode = CollectionMode::NFT; let caller: T::AccountId = account("caller", 0, SEED); ::Currency::deposit_creating(&caller, T::CollectionCreationPrice::get()); --- a/pallets/unique/src/lib.rs +++ b/pallets/unique/src/lib.rs @@ -89,14 +89,11 @@ use frame_support::{ dispatch::DispatchResult, ensure, fail, - weights::{Weight}, - pallet_prelude::{*}, BoundedVec, storage::Key, }; - use frame_system::pallet_prelude::*; use scale_info::TypeInfo; - use frame_system::{self as system, ensure_signed, ensure_root}; + use frame_system::{ensure_signed, ensure_root}; use sp_std::{vec, vec::Vec}; use up_data_structs::{ MAX_COLLECTION_NAME_LENGTH, MAX_COLLECTION_DESCRIPTION_LENGTH, MAX_TOKEN_PREFIX_LENGTH, --- a/primitives/common/src/constants.rs +++ b/primitives/common/src/constants.rs @@ -64,9 +64,10 @@ /// by Operational extrinsics. pub const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75); /// We allow for 2 seconds of compute with a 6 second average block time. -pub const MAXIMUM_BLOCK_WEIGHT: Weight = - Weight::from_ref_time(WEIGHT_REF_TIME_PER_SECOND.saturating_div(2)) - .set_proof_size(MAX_POV_SIZE as u64); +pub const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_parts( + WEIGHT_REF_TIME_PER_SECOND.saturating_div(2), + MAX_POV_SIZE as u64, +); parameter_types! { pub const TransactionByteFee: Balance = 501 * MICROUNIQUE / 2; --- a/runtime/common/config/ethereum.rs +++ b/runtime/common/config/ethereum.rs @@ -28,7 +28,7 @@ pub const GasPerSecond: u64 = WritesPerSecond::get() * 20000; pub const WeightTimePerGas: u64 = WEIGHT_REF_TIME_PER_SECOND / GasPerSecond::get(); - pub const WeightPerGas: Weight = Weight::from_ref_time(WeightTimePerGas::get()); + pub const WeightPerGas: Weight = Weight::from_parts(WeightTimePerGas::get(), 0); } /// Limiting EVM execution to 50% of block for substrate users and management tasks --- a/runtime/common/mod.rs +++ b/runtime/common/mod.rs @@ -27,6 +27,7 @@ pub mod scheduler; pub mod sponsoring; +#[allow(missing_docs)] pub mod weights; #[cfg(test)] @@ -152,7 +153,7 @@ } #[cfg(feature = "runtime-benchmarks")] fn set_block_number(block: Self::BlockNumber) { - cumulus_pallet_parachain_system::RelaychainBlockNumberProvider::::set_block_number(block) + cumulus_pallet_parachain_system::RelaychainDataProvider::::set_block_number(block) } }