Companion for #6986 (#2416)

* refactor: apply substrate/pull/13610

* Added `origin` to config for `universal_origin` benchmark

* update lockfile for {"polkadot", "substrate"}

* Update

---------

Co-authored-by: William Freudenberger <w.freude@icloud.com>
Co-authored-by: parity-processbot <>
Co-authored-by: Bastian Köcher <info@kchr.de>
This commit is contained in:
Branislav Kontur
2023-04-04 11:32:03 +02:00
committed by GitHub
parent 697f0cd1d8
commit 53c6b8d71a
8 changed files with 264 additions and 264 deletions
Generated
+256 -256
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -2,7 +2,7 @@ use crate::impls::AccountIdOf;
use core::{marker::PhantomData, ops::ControlFlow}; use core::{marker::PhantomData, ops::ControlFlow};
use frame_support::{ use frame_support::{
log, log,
traits::{fungibles::Inspect, tokens::BalanceConversion, ContainsPair}, traits::{fungibles::Inspect, tokens::ConversionToAssetBalance, ContainsPair},
weights::Weight, weights::Weight,
}; };
use sp_runtime::traits::Get; use sp_runtime::traits::Get;
@@ -96,7 +96,7 @@ impl<CurrencyBalance, Runtime, WeightToFee, BalanceConverter, AssetInstance>
where where
Runtime: pallet_assets::Config<AssetInstance>, Runtime: pallet_assets::Config<AssetInstance>,
WeightToFee: frame_support::weights::WeightToFee<Balance = CurrencyBalance>, WeightToFee: frame_support::weights::WeightToFee<Balance = CurrencyBalance>,
BalanceConverter: BalanceConversion< BalanceConverter: ConversionToAssetBalance<
CurrencyBalance, CurrencyBalance,
<Runtime as pallet_assets::Config<AssetInstance>>::AssetId, <Runtime as pallet_assets::Config<AssetInstance>>::AssetId,
<Runtime as pallet_assets::Config<AssetInstance>>::Balance, <Runtime as pallet_assets::Config<AssetInstance>>::Balance,
@@ -1113,7 +1113,7 @@ impl_runtime_apis! {
Err(BenchmarkError::Skip) Err(BenchmarkError::Skip)
} }
fn universal_alias() -> Result<Junction, BenchmarkError> { fn universal_alias() -> Result<(MultiLocation, Junction), BenchmarkError> {
Err(BenchmarkError::Skip) Err(BenchmarkError::Skip)
} }
@@ -1010,7 +1010,7 @@ impl_runtime_apis! {
Err(BenchmarkError::Skip) Err(BenchmarkError::Skip)
} }
fn universal_alias() -> Result<Junction, BenchmarkError> { fn universal_alias() -> Result<(MultiLocation, Junction), BenchmarkError> {
Err(BenchmarkError::Skip) Err(BenchmarkError::Skip)
} }
@@ -1124,7 +1124,7 @@ impl_runtime_apis! {
Err(BenchmarkError::Skip) Err(BenchmarkError::Skip)
} }
fn universal_alias() -> Result<Junction, BenchmarkError> { fn universal_alias() -> Result<(MultiLocation, Junction), BenchmarkError> {
Err(BenchmarkError::Skip) Err(BenchmarkError::Skip)
} }
@@ -687,7 +687,7 @@ impl_runtime_apis! {
Err(BenchmarkError::Skip) Err(BenchmarkError::Skip)
} }
fn universal_alias() -> Result<Junction, BenchmarkError> { fn universal_alias() -> Result<(MultiLocation, Junction), BenchmarkError> {
Err(BenchmarkError::Skip) Err(BenchmarkError::Skip)
} }
@@ -687,7 +687,7 @@ impl_runtime_apis! {
Err(BenchmarkError::Skip) Err(BenchmarkError::Skip)
} }
fn universal_alias() -> Result<Junction, BenchmarkError> { fn universal_alias() -> Result<(MultiLocation, Junction), BenchmarkError> {
Err(BenchmarkError::Skip) Err(BenchmarkError::Skip)
} }
@@ -737,7 +737,7 @@ impl_runtime_apis! {
Err(BenchmarkError::Skip) Err(BenchmarkError::Skip)
} }
fn universal_alias() -> Result<Junction, BenchmarkError> { fn universal_alias() -> Result<(MultiLocation, Junction), BenchmarkError> {
Err(BenchmarkError::Skip) Err(BenchmarkError::Skip)
} }