Skip to content

Commit 74a6240

Browse files
franciscoaguirrefranciscoaguirre
committed
fix: conflicts
1 parent 015e867 commit 74a6240

File tree

8 files changed

+0
-745
lines changed

8 files changed

+0
-745
lines changed

‎cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs

-4
Original file line numberDiff line numberDiff line change
@@ -1563,12 +1563,8 @@ impl_runtime_apis! {
15631563
fn dispatch_benchmark(
15641564
config: frame_benchmarking::BenchmarkConfig
15651565
) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, alloc::string::String> {
1566-
<<<<<<< HEAD
1567-
use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError};
1568-
=======
15691566
use frame_benchmarking::{BenchmarkBatch, BenchmarkError};
15701567
use frame_support::assert_ok;
1571-
>>>>>>> c4b8ec12 (Use non-native token to benchmark xcm on asset hub (#7893))
15721568
use sp_storage::TrackedStorageKey;
15731569

15741570
use frame_system_benchmarking::Pallet as SystemBench;

‎cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_xcm.rs

-166
Large diffs are not rendered by default.

‎cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs

-103
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,10 @@
1717
//! Autogenerated weights for `pallet_xcm_benchmarks::fungible`
1818
//!
1919
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
20-
<<<<<<< HEAD
21-
//! DATE: 2024-10-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
22-
//! WORST CASE MAP SIZE: `1000000`
23-
//! HOSTNAME: `runner-wmcgzesc-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
24-
//! WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-rococo-dev"), DB CACHE: 1024
25-
=======
2620
//! DATE: 2025-03-12, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
2721
//! WORST CASE MAP SIZE: `1000000`
2822
//! HOSTNAME: `dd489642b81c`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
2923
//! WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
30-
>>>>>>> c4b8ec12 (Use non-native token to benchmark xcm on asset hub (#7893))
3124
3225
// Executed Command:
3326
// target/production/polkadot-parachain
@@ -67,21 +60,12 @@ impl<T: frame_system::Config> WeightInfo<T> {
6760
// Proof: `AssetsFreezer::Freezes` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
6861
pub fn withdraw_asset() -> Weight {
6962
// Proof Size summary in bytes:
70-
<<<<<<< HEAD
71-
// Measured: `101`
72-
// Estimated: `3593`
73-
// Minimum execution time: 33_878_000 picoseconds.
74-
Weight::from_parts(34_766_000, 3593)
75-
.saturating_add(T::DbWeight::get().reads(1))
76-
.saturating_add(T::DbWeight::get().writes(1))
77-
=======
7863
// Measured: `493`
7964
// Estimated: `3675`
8065
// Minimum execution time: 56_861_000 picoseconds.
8166
Weight::from_parts(58_296_000, 3675)
8267
.saturating_add(T::DbWeight::get().reads(5))
8368
.saturating_add(T::DbWeight::get().writes(5))
84-
>>>>>>> c4b8ec12 (Use non-native token to benchmark xcm on asset hub (#7893))
8569
}
8670
// Storage: `Assets::Asset` (r:1 w:1)
8771
// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
@@ -93,21 +77,12 @@ impl<T: frame_system::Config> WeightInfo<T> {
9377
// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
9478
pub fn transfer_asset() -> Weight {
9579
// Proof Size summary in bytes:
96-
<<<<<<< HEAD
97-
// Measured: `101`
98-
// Estimated: `6196`
99-
// Minimum execution time: 42_776_000 picoseconds.
100-
Weight::from_parts(43_643_000, 6196)
101-
.saturating_add(T::DbWeight::get().reads(2))
102-
.saturating_add(T::DbWeight::get().writes(2))
103-
=======
10480
// Measured: `392`
10581
// Estimated: `6208`
10682
// Minimum execution time: 51_788_000 picoseconds.
10783
Weight::from_parts(53_051_000, 6208)
10884
.saturating_add(T::DbWeight::get().reads(5))
10985
.saturating_add(T::DbWeight::get().writes(4))
110-
>>>>>>> c4b8ec12 (Use non-native token to benchmark xcm on asset hub (#7893))
11186
}
11287
// Storage: `Assets::Asset` (r:1 w:1)
11388
// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
@@ -133,33 +108,19 @@ impl<T: frame_system::Config> WeightInfo<T> {
133108
// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
134109
pub fn transfer_reserve_asset() -> Weight {
135110
// Proof Size summary in bytes:
136-
<<<<<<< HEAD
137-
// Measured: `246`
138-
// Estimated: `8799`
139-
// Minimum execution time: 104_654_000 picoseconds.
140-
Weight::from_parts(106_518_000, 8799)
141-
.saturating_add(T::DbWeight::get().reads(10))
142-
.saturating_add(T::DbWeight::get().writes(5))
143-
=======
144111
// Measured: `567`
145112
// Estimated: `8799`
146113
// Minimum execution time: 127_591_000 picoseconds.
147114
Weight::from_parts(131_326_000, 8799)
148115
.saturating_add(T::DbWeight::get().reads(12))
149116
.saturating_add(T::DbWeight::get().writes(7))
150-
>>>>>>> c4b8ec12 (Use non-native token to benchmark xcm on asset hub (#7893))
151117
}
152118
pub fn reserve_asset_deposited() -> Weight {
153119
// Proof Size summary in bytes:
154120
// Measured: `0`
155121
// Estimated: `0`
156-
<<<<<<< HEAD
157-
// Minimum execution time: 1_183_000 picoseconds.
158-
Weight::from_parts(1_309_000, 0)
159-
=======
160122
// Minimum execution time: 1_310_000 picoseconds.
161123
Weight::from_parts(1_454_000, 0)
162-
>>>>>>> c4b8ec12 (Use non-native token to benchmark xcm on asset hub (#7893))
163124
}
164125
// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
165126
// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
@@ -181,29 +142,17 @@ impl<T: frame_system::Config> WeightInfo<T> {
181142
// Proof Size summary in bytes:
182143
// Measured: `246`
183144
// Estimated: `6196`
184-
<<<<<<< HEAD
185-
// Minimum execution time: 112_272_000 picoseconds.
186-
Weight::from_parts(114_853_000, 6196)
187-
.saturating_add(T::DbWeight::get().reads(9))
188-
.saturating_add(T::DbWeight::get().writes(4))
189-
=======
190145
// Minimum execution time: 108_706_000 picoseconds.
191146
Weight::from_parts(111_596_000, 6196)
192147
.saturating_add(T::DbWeight::get().reads(7))
193148
.saturating_add(T::DbWeight::get().writes(3))
194-
>>>>>>> c4b8ec12 (Use non-native token to benchmark xcm on asset hub (#7893))
195149
}
196150
pub fn receive_teleported_asset() -> Weight {
197151
// Proof Size summary in bytes:
198152
// Measured: `0`
199153
// Estimated: `0`
200-
<<<<<<< HEAD
201-
// Minimum execution time: 2_769_000 picoseconds.
202-
Weight::from_parts(2_916_000, 0)
203-
=======
204154
// Minimum execution time: 2_985_000 picoseconds.
205155
Weight::from_parts(3_195_000, 0)
206-
>>>>>>> c4b8ec12 (Use non-native token to benchmark xcm on asset hub (#7893))
207156
}
208157
// Storage: `Assets::Asset` (r:1 w:1)
209158
// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
@@ -213,61 +162,36 @@ impl<T: frame_system::Config> WeightInfo<T> {
213162
// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
214163
pub fn deposit_asset() -> Weight {
215164
// Proof Size summary in bytes:
216-
<<<<<<< HEAD
217-
// Measured: `0`
218-
// Estimated: `3593`
219-
// Minimum execution time: 26_145_000 picoseconds.
220-
Weight::from_parts(26_589_000, 3593)
221-
.saturating_add(T::DbWeight::get().reads(1))
222-
.saturating_add(T::DbWeight::get().writes(1))
223-
=======
224165
// Measured: `280`
225166
// Estimated: `3675`
226167
// Minimum execution time: 32_454_000 picoseconds.
227168
Weight::from_parts(33_452_000, 3675)
228169
.saturating_add(T::DbWeight::get().reads(3))
229170
.saturating_add(T::DbWeight::get().writes(3))
230-
>>>>>>> c4b8ec12 (Use non-native token to benchmark xcm on asset hub (#7893))
231171
}
232172
// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
233173
// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
234174
// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
235175
// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
236176
// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
237177
// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
238-
<<<<<<< HEAD
239-
// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
240-
// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
241-
// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
242-
// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
243-
// Storage: `System::Account` (r:2 w:2)
244-
=======
245178
// Storage: `Assets::Asset` (r:1 w:1)
246179
// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
247180
// Storage: `Assets::Account` (r:1 w:1)
248181
// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
249182
// Storage: `System::Account` (r:1 w:1)
250-
>>>>>>> c4b8ec12 (Use non-native token to benchmark xcm on asset hub (#7893))
251183
// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
252184
// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
253185
// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
254186
// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
255187
// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
256188
pub fn deposit_reserve_asset() -> Weight {
257189
// Proof Size summary in bytes:
258-
<<<<<<< HEAD
259-
// Measured: `145`
260-
// Estimated: `6196`
261-
// Minimum execution time: 85_446_000 picoseconds.
262-
Weight::from_parts(88_146_000, 6196)
263-
.saturating_add(T::DbWeight::get().reads(9))
264-
=======
265190
// Measured: `354`
266191
// Estimated: `3819`
267192
// Minimum execution time: 70_617_000 picoseconds.
268193
Weight::from_parts(72_500_000, 3819)
269194
.saturating_add(T::DbWeight::get().reads(8))
270-
>>>>>>> c4b8ec12 (Use non-native token to benchmark xcm on asset hub (#7893))
271195
.saturating_add(T::DbWeight::get().writes(4))
272196
}
273197
// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
@@ -276,38 +200,20 @@ impl<T: frame_system::Config> WeightInfo<T> {
276200
// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
277201
// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
278202
// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
279-
<<<<<<< HEAD
280-
// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
281-
// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
282-
// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
283-
// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
284-
// Storage: `System::Account` (r:1 w:1)
285-
// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
286-
=======
287203
// Storage: `Assets::Asset` (r:1 w:0)
288204
// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
289-
>>>>>>> c4b8ec12 (Use non-native token to benchmark xcm on asset hub (#7893))
290205
// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
291206
// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
292207
// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
293208
// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
294209
pub fn initiate_teleport() -> Weight {
295210
// Proof Size summary in bytes:
296-
<<<<<<< HEAD
297-
// Measured: `145`
298-
// Estimated: `3610`
299-
// Minimum execution time: 55_060_000 picoseconds.
300-
Weight::from_parts(56_120_000, 3610)
301-
.saturating_add(T::DbWeight::get().reads(8))
302-
.saturating_add(T::DbWeight::get().writes(3))
303-
=======
304211
// Measured: `354`
305212
// Estimated: `3819`
306213
// Minimum execution time: 52_909_000 picoseconds.
307214
Weight::from_parts(54_376_000, 3819)
308215
.saturating_add(T::DbWeight::get().reads(6))
309216
.saturating_add(T::DbWeight::get().writes(1))
310-
>>>>>>> c4b8ec12 (Use non-native token to benchmark xcm on asset hub (#7893))
311217
}
312218
// Storage: `Assets::Asset` (r:1 w:1)
313219
// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
@@ -331,20 +237,11 @@ impl<T: frame_system::Config> WeightInfo<T> {
331237
// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
332238
pub fn initiate_transfer() -> Weight {
333239
// Proof Size summary in bytes:
334-
<<<<<<< HEAD
335-
// Measured: `145`
336-
// Estimated: `6196`
337-
// Minimum execution time: 90_870_000 picoseconds.
338-
Weight::from_parts(93_455_000, 6196)
339-
.saturating_add(T::DbWeight::get().reads(9))
340-
.saturating_add(T::DbWeight::get().writes(4))
341-
=======
342240
// Measured: `354`
343241
// Estimated: `6196`
344242
// Minimum execution time: 87_524_000 picoseconds.
345243
Weight::from_parts(91_889_000, 6196)
346244
.saturating_add(T::DbWeight::get().reads(9))
347245
.saturating_add(T::DbWeight::get().writes(5))
348-
>>>>>>> c4b8ec12 (Use non-native token to benchmark xcm on asset hub (#7893))
349246
}
350247
}

‎cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs

-4
Original file line numberDiff line numberDiff line change
@@ -1743,12 +1743,8 @@ impl_runtime_apis! {
17431743
fn dispatch_benchmark(
17441744
config: frame_benchmarking::BenchmarkConfig
17451745
) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, alloc::string::String> {
1746-
<<<<<<< HEAD
1747-
use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError};
1748-
=======
17491746
use frame_benchmarking::{BenchmarkBatch, BenchmarkError};
17501747
use frame_support::assert_ok;
1751-
>>>>>>> c4b8ec12 (Use non-native token to benchmark xcm on asset hub (#7893))
17521748
use sp_storage::TrackedStorageKey;
17531749

17541750
use frame_system_benchmarking::Pallet as SystemBench;

0 commit comments

Comments
 (0)