Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@alvicsam
alvicsam committed Jan 20, 2023
1 parent 1d18332 commit ecbedc6
Show file tree
Hide file tree
Showing 8 changed files with 192 additions and 208 deletions.
72 changes: 35 additions & 37 deletions runtime/kusama/src/weights/pallet_xcm.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,21 @@
//! Autogenerated weights for `pallet_xcm`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: 2022-12-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! HOSTNAME: `bm3`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
//! DATE: 2023-01-19, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! HOSTNAME: `runner-b3zmxxc-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
// Executed Command:
// /home/benchbot/cargo_target_dir/production/polkadot
// ./target/production/polkadot
// benchmark
// pallet
// --chain=kusama-dev
// --steps=50
// --repeat=20
// --pallet=pallet_xcm
// --extrinsic=*
// --execution=wasm
// --wasm-execution=compiled
// --heap-pages=4096
// --json-file=/var/lib/gitlab-runner/builds/zyw4fam_/0/parity/mirrors/polkadot/.git/.artifacts/bench.json
// --pallet=pallet_xcm
// --chain=kusama-dev
// --header=./file_header.txt
// --output=./runtime/kusama/src/weights/

Expand All @@ -52,33 +50,33 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
// Storage: Dmp DownwardMessageQueues (r:1 w:1)
// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
fn send() -> Weight {
// Minimum execution time: 36_474 nanoseconds.
Weight::from_ref_time(37_030_000)
// Minimum execution time: 38_170 nanoseconds.
Weight::from_ref_time(39_462_000)
.saturating_add(T::DbWeight::get().reads(5))
.saturating_add(T::DbWeight::get().writes(3))
}
fn teleport_assets() -> Weight {
// Minimum execution time: 28_147 nanoseconds.
Weight::from_ref_time(28_836_000)
// Minimum execution time: 27_920 nanoseconds.
Weight::from_ref_time(28_597_000)
}
fn reserve_transfer_assets() -> Weight {
// Minimum execution time: 28_469 nanoseconds.
Weight::from_ref_time(29_002_000)
// Minimum execution time: 27_122 nanoseconds.
Weight::from_ref_time(27_872_000)
}
fn execute() -> Weight {
// Minimum execution time: 15_637 nanoseconds.
Weight::from_ref_time(15_880_000)
// Minimum execution time: 15_494 nanoseconds.
Weight::from_ref_time(15_956_000)
}
// Storage: XcmPallet SupportedVersion (r:0 w:1)
fn force_xcm_version() -> Weight {
// Minimum execution time: 15_330 nanoseconds.
Weight::from_ref_time(15_817_000)
// Minimum execution time: 15_319 nanoseconds.
Weight::from_ref_time(15_695_000)
.saturating_add(T::DbWeight::get().writes(1))
}
// Storage: XcmPallet SafeXcmVersion (r:0 w:1)
fn force_default_xcm_version() -> Weight {
// Minimum execution time: 4_104 nanoseconds.
Weight::from_ref_time(4_365_000)
// Minimum execution time: 4_081 nanoseconds.
Weight::from_ref_time(4_308_000)
.saturating_add(T::DbWeight::get().writes(1))
}
// Storage: XcmPallet VersionNotifiers (r:1 w:1)
Expand All @@ -90,8 +88,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
// Storage: XcmPallet Queries (r:0 w:1)
fn force_subscribe_version_notify() -> Weight {
// Minimum execution time: 42_177 nanoseconds.
Weight::from_ref_time(42_657_000)
// Minimum execution time: 42_016 nanoseconds.
Weight::from_ref_time(43_224_000)
.saturating_add(T::DbWeight::get().reads(7))
.saturating_add(T::DbWeight::get().writes(6))
}
Expand All @@ -103,29 +101,29 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
// Storage: XcmPallet Queries (r:0 w:1)
fn force_unsubscribe_version_notify() -> Weight {
// Minimum execution time: 45_481 nanoseconds.
Weight::from_ref_time(45_960_000)
// Minimum execution time: 45_629 nanoseconds.
Weight::from_ref_time(46_776_000)
.saturating_add(T::DbWeight::get().reads(6))
.saturating_add(T::DbWeight::get().writes(5))
}
// Storage: XcmPallet SupportedVersion (r:4 w:2)
fn migrate_supported_version() -> Weight {
// Minimum execution time: 14_899 nanoseconds.
Weight::from_ref_time(15_452_000)
// Minimum execution time: 15_666 nanoseconds.
Weight::from_ref_time(16_400_000)
.saturating_add(T::DbWeight::get().reads(4))
.saturating_add(T::DbWeight::get().writes(2))
}
// Storage: XcmPallet VersionNotifiers (r:4 w:2)
fn migrate_version_notifiers() -> Weight {
// Minimum execution time: 14_759 nanoseconds.
Weight::from_ref_time(15_176_000)
// Minimum execution time: 15_683 nanoseconds.
Weight::from_ref_time(16_246_000)
.saturating_add(T::DbWeight::get().reads(4))
.saturating_add(T::DbWeight::get().writes(2))
}
// Storage: XcmPallet VersionNotifyTargets (r:5 w:0)
fn already_notified_target() -> Weight {
// Minimum execution time: 17_022 nanoseconds.
Weight::from_ref_time(17_468_000)
// Minimum execution time: 18_350 nanoseconds.
Weight::from_ref_time(18_957_000)
.saturating_add(T::DbWeight::get().reads(5))
}
// Storage: XcmPallet VersionNotifyTargets (r:2 w:1)
Expand All @@ -135,21 +133,21 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
// Storage: Dmp DownwardMessageQueues (r:1 w:1)
// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
fn notify_current_targets() -> Weight {
// Minimum execution time: 37_810 nanoseconds.
Weight::from_ref_time(38_198_000)
// Minimum execution time: 37_750 nanoseconds.
Weight::from_ref_time(39_042_000)
.saturating_add(T::DbWeight::get().reads(7))
.saturating_add(T::DbWeight::get().writes(4))
}
// Storage: XcmPallet VersionNotifyTargets (r:3 w:0)
fn notify_target_migration_fail() -> Weight {
// Minimum execution time: 7_440 nanoseconds.
Weight::from_ref_time(7_659_000)
// Minimum execution time: 8_115 nanoseconds.
Weight::from_ref_time(8_414_000)
.saturating_add(T::DbWeight::get().reads(3))
}
// Storage: XcmPallet VersionNotifyTargets (r:4 w:2)
fn migrate_version_notify_targets() -> Weight {
// Minimum execution time: 14_975 nanoseconds.
Weight::from_ref_time(15_479_000)
// Minimum execution time: 16_101 nanoseconds.
Weight::from_ref_time(16_477_000)
.saturating_add(T::DbWeight::get().reads(4))
.saturating_add(T::DbWeight::get().writes(2))
}
Expand All @@ -160,8 +158,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
// Storage: Dmp DownwardMessageQueues (r:1 w:1)
// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
fn migrate_and_notify_old_targets() -> Weight {
// Minimum execution time: 43_328 nanoseconds.
Weight::from_ref_time(44_054_000)
// Minimum execution time: 43_838 nanoseconds.
Weight::from_ref_time(45_093_000)
.saturating_add(T::DbWeight::get().reads(9))
.saturating_add(T::DbWeight::get().writes(5))
}
Expand Down
30 changes: 14 additions & 16 deletions runtime/kusama/src/weights/runtime_parachains_ump.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,23 @@
//! Autogenerated weights for `runtime_parachains::ump`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: 2023-01-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! HOSTNAME: `bm3`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
//! DATE: 2023-01-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! HOSTNAME: `runner-b3zmxxc-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
// Executed Command:
// /home/benchbot/cargo_target_dir/production/polkadot
// ./target/production/polkadot
// benchmark
// pallet
// --chain=kusama-dev
// --steps=50
// --repeat=20
// --pallet=runtime_parachains::ump
// --extrinsic=*
// --execution=wasm
// --wasm-execution=compiled
// --heap-pages=4096
// --json-file=/var/lib/gitlab-runner/builds/zyw4fam_/0/parity/mirrors/polkadot/.git/.artifacts/bench.json
// --pallet=runtime_parachains::ump
// --chain=kusama-dev
// --header=./file_header.txt
// --output=./runtime/kusama/src/weights/
// --output=./runtime/kusama/src/weights/runtime_parachains_ump.rs

#![cfg_attr(rustfmt, rustfmt_skip)]
#![allow(unused_parens)]
Expand All @@ -48,26 +46,26 @@ pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> runtime_parachains::ump::WeightInfo for WeightInfo<T> {
/// The range of component `s` is `[0, 51200]`.
fn process_upward_message(s: u32, ) -> Weight {
// Minimum execution time: 10_393 nanoseconds.
Weight::from_ref_time(2_845_995)
// Standard Error: 21
.saturating_add(Weight::from_ref_time(2_016).saturating_mul(s.into()))
// Minimum execution time: 10_960 nanoseconds.
Weight::from_ref_time(2_561_819)
// Standard Error: 16
.saturating_add(Weight::from_ref_time(2_389).saturating_mul(s.into()))
}
// Storage: Ump NeedsDispatch (r:1 w:1)
// Storage: Ump NextDispatchRoundStartWith (r:1 w:1)
// Storage: Ump RelayDispatchQueues (r:0 w:1)
// Storage: Ump RelayDispatchQueueSize (r:0 w:1)
fn clean_ump_after_outgoing() -> Weight {
// Minimum execution time: 9_686 nanoseconds.
Weight::from_ref_time(9_920_000)
// Minimum execution time: 9_367 nanoseconds.
Weight::from_ref_time(9_683_000)
.saturating_add(T::DbWeight::get().reads(2))
.saturating_add(T::DbWeight::get().writes(4))
}
// Storage: Ump Overweight (r:1 w:1)
// Storage: Ump CounterForOverweight (r:1 w:1)
fn service_overweight() -> Weight {
// Minimum execution time: 28_502 nanoseconds.
Weight::from_ref_time(28_900_000)
// Minimum execution time: 29_842 nanoseconds.
Weight::from_ref_time(30_766_000)
.saturating_add(T::DbWeight::get().reads(2))
.saturating_add(T::DbWeight::get().writes(2))
}
Expand Down
68 changes: 33 additions & 35 deletions runtime/polkadot/src/weights/pallet_xcm.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,21 @@
//! Autogenerated weights for `pallet_xcm`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: 2022-12-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! HOSTNAME: `bm3`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
//! DATE: 2023-01-19, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! HOSTNAME: `runner-b3zmxxc-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
// Executed Command:
// /home/benchbot/cargo_target_dir/production/polkadot
// ./target/production/polkadot
// benchmark
// pallet
// --chain=polkadot-dev
// --steps=50
// --repeat=20
// --pallet=pallet_xcm
// --extrinsic=*
// --execution=wasm
// --wasm-execution=compiled
// --heap-pages=4096
// --json-file=/var/lib/gitlab-runner/builds/zyw4fam_/0/parity/mirrors/polkadot/.git/.artifacts/bench.json
// --pallet=pallet_xcm
// --chain=polkadot-dev
// --header=./file_header.txt
// --output=./runtime/polkadot/src/weights/

Expand All @@ -53,18 +51,18 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
// Storage: Dmp DownwardMessageQueues (r:1 w:1)
// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
fn send() -> Weight {
// Minimum execution time: 35_717 nanoseconds.
Weight::from_ref_time(36_278_000)
// Minimum execution time: 36_836 nanoseconds.
Weight::from_ref_time(37_875_000)
.saturating_add(T::DbWeight::get().reads(6))
.saturating_add(T::DbWeight::get().writes(3))
}
fn teleport_assets() -> Weight {
// Minimum execution time: 28_865 nanoseconds.
Weight::from_ref_time(29_336_000)
// Minimum execution time: 30_705 nanoseconds.
Weight::from_ref_time(31_552_000)
}
fn reserve_transfer_assets() -> Weight {
// Minimum execution time: 27_531 nanoseconds.
Weight::from_ref_time(28_248_000)
// Minimum execution time: 29_372 nanoseconds.
Weight::from_ref_time(29_662_000)
}
// Storage: Benchmark Override (r:0 w:0)
fn execute() -> Weight {
Expand All @@ -73,14 +71,14 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
}
// Storage: XcmPallet SupportedVersion (r:0 w:1)
fn force_xcm_version() -> Weight {
// Minimum execution time: 15_205 nanoseconds.
Weight::from_ref_time(15_526_000)
// Minimum execution time: 15_536 nanoseconds.
Weight::from_ref_time(15_916_000)
.saturating_add(T::DbWeight::get().writes(1))
}
// Storage: XcmPallet SafeXcmVersion (r:0 w:1)
fn force_default_xcm_version() -> Weight {
// Minimum execution time: 4_336 nanoseconds.
Weight::from_ref_time(4_518_000)
// Minimum execution time: 4_121 nanoseconds.
Weight::from_ref_time(4_398_000)
.saturating_add(T::DbWeight::get().writes(1))
}
// Storage: XcmPallet VersionNotifiers (r:1 w:1)
Expand All @@ -93,8 +91,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
// Storage: XcmPallet Queries (r:0 w:1)
fn force_subscribe_version_notify() -> Weight {
// Minimum execution time: 41_446 nanoseconds.
Weight::from_ref_time(42_152_000)
// Minimum execution time: 42_352 nanoseconds.
Weight::from_ref_time(43_174_000)
.saturating_add(T::DbWeight::get().reads(8))
.saturating_add(T::DbWeight::get().writes(6))
}
Expand All @@ -107,29 +105,29 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
// Storage: XcmPallet Queries (r:0 w:1)
fn force_unsubscribe_version_notify() -> Weight {
// Minimum execution time: 44_944 nanoseconds.
Weight::from_ref_time(45_519_000)
// Minimum execution time: 45_231 nanoseconds.
Weight::from_ref_time(48_467_000)
.saturating_add(T::DbWeight::get().reads(7))
.saturating_add(T::DbWeight::get().writes(5))
}
// Storage: XcmPallet SupportedVersion (r:4 w:2)
fn migrate_supported_version() -> Weight {
// Minimum execution time: 15_254 nanoseconds.
Weight::from_ref_time(15_491_000)
// Minimum execution time: 15_806 nanoseconds.
Weight::from_ref_time(16_263_000)
.saturating_add(T::DbWeight::get().reads(4))
.saturating_add(T::DbWeight::get().writes(2))
}
// Storage: XcmPallet VersionNotifiers (r:4 w:2)
fn migrate_version_notifiers() -> Weight {
// Minimum execution time: 15_083 nanoseconds.
Weight::from_ref_time(15_298_000)
// Minimum execution time: 15_617 nanoseconds.
Weight::from_ref_time(16_077_000)
.saturating_add(T::DbWeight::get().reads(4))
.saturating_add(T::DbWeight::get().writes(2))
}
// Storage: XcmPallet VersionNotifyTargets (r:5 w:0)
fn already_notified_target() -> Weight {
// Minimum execution time: 17_889 nanoseconds.
Weight::from_ref_time(18_144_000)
// Minimum execution time: 18_741 nanoseconds.
Weight::from_ref_time(19_269_000)
.saturating_add(T::DbWeight::get().reads(5))
}
// Storage: XcmPallet VersionNotifyTargets (r:2 w:1)
Expand All @@ -140,21 +138,21 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
// Storage: Dmp DownwardMessageQueues (r:1 w:1)
// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
fn notify_current_targets() -> Weight {
// Minimum execution time: 37_255 nanoseconds.
Weight::from_ref_time(37_893_000)
// Minimum execution time: 38_065 nanoseconds.
Weight::from_ref_time(38_753_000)
.saturating_add(T::DbWeight::get().reads(8))
.saturating_add(T::DbWeight::get().writes(4))
}
// Storage: XcmPallet VersionNotifyTargets (r:3 w:0)
fn notify_target_migration_fail() -> Weight {
// Minimum execution time: 7_884 nanoseconds.
Weight::from_ref_time(8_111_000)
// Minimum execution time: 8_239 nanoseconds.
Weight::from_ref_time(8_461_000)
.saturating_add(T::DbWeight::get().reads(3))
}
// Storage: XcmPallet VersionNotifyTargets (r:4 w:2)
fn migrate_version_notify_targets() -> Weight {
// Minimum execution time: 15_853 nanoseconds.
Weight::from_ref_time(16_220_000)
// Minimum execution time: 15_998 nanoseconds.
Weight::from_ref_time(16_410_000)
.saturating_add(T::DbWeight::get().reads(4))
.saturating_add(T::DbWeight::get().writes(2))
}
Expand All @@ -166,8 +164,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
// Storage: Dmp DownwardMessageQueues (r:1 w:1)
// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
fn migrate_and_notify_old_targets() -> Weight {
// Minimum execution time: 43_836 nanoseconds.
Weight::from_ref_time(44_836_000)
// Minimum execution time: 44_143 nanoseconds.
Weight::from_ref_time(45_818_000)
.saturating_add(T::DbWeight::get().reads(10))
.saturating_add(T::DbWeight::get().writes(5))
}
Expand Down
Loading

0 comments on commit ecbedc6

Please sign in to comment.