Skip to content

feat: add weights v2 #403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wischli wants to merge 10 commits into from
Closed

feat: add weights v2 #403

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
34ca624
chore: bump deps
wischli Sep 6, 2022
7160779
wip: migrate pallets and runtimes
wischli Sep 6, 2022
be04423
chore: bump more versions
wischli Sep 6, 2022
a24e19a
wip: fix clients
wischli Sep 6, 2022
2f04b88
fix: runtime tomls
wischli Sep 7, 2022
a18bca5
style: ignore clippy in default weights
wischli Sep 7, 2022
9c48ae3
fix: client pt2
wischli Sep 7, 2022
89ba1e5
fix: runtimes, clippy
wischli Sep 7, 2022
6d6aad3
feat: switch pallet execution order
wischli Sep 7, 2022
a4cb4ed
tests: merge delegation from wf-2168-polkadot-v0.9.28
wischli Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
wip: migrate pallets and runtimes
  • Loading branch information
@wischli
wischli committed Sep 6, 2022
commit 71607799d31f26367010025b1ae053167b2e1cda
6 changes: 3 additions & 3 deletions pallets/attestation/src/access_control.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,12 @@ where
Default::default()
}
fn can_attest_weight(&self) -> Weight {
0
Weight::zero()
}
fn can_revoke_weight(&self) -> Weight {
0
Weight::zero()
}
fn can_remove_weight(&self) -> Weight {
0
Weight::zero()
}
}
64 changes: 32 additions & 32 deletions pallets/attestation/src/default_weights.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,59 +56,59 @@ pub trait WeightInfo {
pub struct SubstrateWeight<T>(PhantomData<T>);
impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
fn add() -> Weight {
(74_496_000_u64)
.saturating_add(T::DbWeight::get().reads(6_u64))
.saturating_add(T::DbWeight::get().writes(3_u64))
Weight::from_ref_time(74_496_000 as u64)
.saturating_add(T::DbWeight::get().reads(6 as u64))
.saturating_add(T::DbWeight::get().writes(3 as u64))
}
fn revoke() -> Weight {
(37_029_000_u64)
Weight::from_ref_time(37_029_000 as u64)
// Standard Error: 44_000
.saturating_add(6_325_000_u64)
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
.saturating_add(Weight::from_ref_time(6_325_000 as u64))
.saturating_add(T::DbWeight::get().reads(2 as u64))
.saturating_add(T::DbWeight::get().reads(1 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
fn remove() -> Weight {
(64_058_000_u64)
Weight::from_ref_time(64_058_000 as u64)
// Standard Error: 44_000
.saturating_add(6_317_000_u64)
.saturating_add(T::DbWeight::get().reads(4_u64))
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(3_u64))
.saturating_add(Weight::from_ref_time(6_317_000 as u64))
.saturating_add(T::DbWeight::get().reads(4 as u64))
.saturating_add(T::DbWeight::get().reads(1 as u64))
.saturating_add(T::DbWeight::get().writes(3 as u64))
}
fn reclaim_deposit() -> Weight {
(56_873_000_u64)
.saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(3_u64))
Weight::from_ref_time(56_873_000 as u64)
.saturating_add(T::DbWeight::get().reads(3 as u64))
.saturating_add(T::DbWeight::get().writes(3 as u64))
}
}

// For backwards compatibility and tests
impl WeightInfo for () {
fn add() -> Weight {
(74_496_000_u64)
.saturating_add(RocksDbWeight::get().reads(6_u64))
.saturating_add(RocksDbWeight::get().writes(3_u64))
Weight::from_ref_time(74_496_000 as u64)
.saturating_add(RocksDbWeight::get().reads(6 as u64))
.saturating_add(RocksDbWeight::get().writes(3 as u64))
}
fn revoke() -> Weight {
(37_029_000_u64)
Weight::from_ref_time(37_029_000 as u64)
// Standard Error: 44_000
.saturating_add(6_325_000_u64)
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
.saturating_add(Weight::from_ref_time(6_325_000 as u64))
.saturating_add(RocksDbWeight::get().reads(2 as u64))
.saturating_add(RocksDbWeight::get().reads(1 as u64))
.saturating_add(RocksDbWeight::get().writes(1 as u64))
}
fn remove() -> Weight {
(64_058_000_u64)
Weight::from_ref_time(64_058_000 as u64)
// Standard Error: 44_000
.saturating_add(6_317_000_u64)
.saturating_add(RocksDbWeight::get().reads(4_u64))
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(3_u64))
.saturating_add(Weight::from_ref_time(6_317_000 as u64))
.saturating_add(RocksDbWeight::get().reads(4 as u64))
.saturating_add(RocksDbWeight::get().reads(1 as u64))
.saturating_add(RocksDbWeight::get().writes(3 as u64))
}
fn reclaim_deposit() -> Weight {
(56_873_000_u64)
.saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(3_u64))
Weight::from_ref_time(56_873_000 as u64)
.saturating_add(RocksDbWeight::get().reads(3 as u64))
.saturating_add(RocksDbWeight::get().writes(3 as u64))
}
}
6 changes: 3 additions & 3 deletions pallets/attestation/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ pub mod pallet {
/// # </weight>
#[pallet::weight(
<T as pallet::Config>::WeightInfo::add()
.saturating_add(authorization.as_ref().map(|ac| ac.can_attest_weight()).unwrap_or(0))
.saturating_add(authorization.as_ref().map(|ac| ac.can_attest_weight()).unwrap_or(Weight::zero()))
)]
pub fn add(
origin: OriginFor<T>,
Expand Down Expand Up @@ -315,7 +315,7 @@ pub mod pallet {
/// # </weight>
#[pallet::weight(
<T as pallet::Config>::WeightInfo::revoke()
.saturating_add(authorization.as_ref().map(|ac| ac.can_revoke_weight()).unwrap_or(0))
.saturating_add(authorization.as_ref().map(|ac| ac.can_revoke_weight()).unwrap_or(Weight::zero()))
)]
pub fn revoke(
origin: OriginFor<T>,
Expand Down Expand Up @@ -374,7 +374,7 @@ pub mod pallet {
/// # </weight>
#[pallet::weight(
<T as pallet::Config>::WeightInfo::remove()
.saturating_add(authorization.as_ref().map(|ac| ac.can_remove_weight()).unwrap_or(0))
.saturating_add(authorization.as_ref().map(|ac| ac.can_remove_weight()).unwrap_or(Weight::zero()))
)]
pub fn remove(
origin: OriginFor<T>,
Expand Down
12 changes: 6 additions & 6 deletions pallets/attestation/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ where
_claim: &ClaimHashOf<T>,
) -> Result<Weight, DispatchError> {
if who == &self.0 {
Ok(0)
Ok(Weight::zero())
} else {
Err(DispatchError::Other("Unauthorized"))
}
Expand All @@ -105,7 +105,7 @@ where
authorization_id: &T::AuthorizationId,
) -> Result<Weight, DispatchError> {
if authorization_id == who {
Ok(0)
Ok(Weight::zero())
} else {
Err(DispatchError::Other("Unauthorized"))
}
Expand All @@ -119,7 +119,7 @@ where
authorization_id: &T::AuthorizationId,
) -> Result<Weight, DispatchError> {
if authorization_id == who {
Ok(0)
Ok(Weight::zero())
} else {
Err(DispatchError::Other("Unauthorized"))
}
Expand All @@ -130,13 +130,13 @@ where
}

fn can_attest_weight(&self) -> Weight {
0
Weight::zero()
}
fn can_revoke_weight(&self) -> Weight {
0
Weight::zero()
}
fn can_remove_weight(&self) -> Weight {
0
Weight::zero()
}
}

Expand Down
16 changes: 8 additions & 8 deletions pallets/ctype/src/default_weights.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,21 +56,21 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Storage: System Account (r:2 w:2)
// Storage: Ctype Ctypes (r:1 w:1)
fn add(l: u32, ) -> Weight {
(5_346_000_u64)
Weight::from_ref_time(5_346_000 as u64)
// Standard Error: 0
.saturating_add((2_000_u64).saturating_mul(l as Weight))
.saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(3_u64))
.saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(l as u64))
.saturating_add(T::DbWeight::get().reads(3 as u64))
.saturating_add(T::DbWeight::get().writes(3 as u64))
}
}

// For backwards compatibility and tests
impl WeightInfo for () {
fn add(l: u32, ) -> Weight {
(5_346_000_u64)
Weight::from_ref_time(5_346_000 as u64)
// Standard Error: 0
.saturating_add((2_000_u64).saturating_mul(l as Weight))
.saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(3_u64))
.saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(l as u64))
.saturating_add(RocksDbWeight::get().reads(3 as u64))
.saturating_add(RocksDbWeight::get().writes(3 as u64))
}
}
Loading