pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-10 07:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

asset-conversion pallet: Generalise integrity test (#14289)

Browse Source 
* integrity test was only working for u32 asset ids.

* cargo fmt

* Update frame/asset-conversion/src/lib.rs

Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

---------

Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
This commit is contained in:
Squirrel
2023-06-02 13:54:01 +01:00
committed by GitHub
parent 50d5b94225
commit 28afa48006
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/asset-conversion/src/lib.rs
+19 -19
View File
@@ -201,7 +201,7 @@ pub mod pallet {
type WeightInfo: WeightInfo;
/// The benchmarks need a way to create asset ids from u32s.
#[cfg(feature = "runtime-benchmarks")]
#[cfg(any(test, feature = "runtime-benchmarks"))]
type BenchmarkHelper: BenchmarkHelper<Self::AssetId>;
}
@@ -352,24 +352,24 @@ pub mod pallet {
#[pallet::hooks]
impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {
fn integrity_test() {
sp_std::if_std! {
sp_io::TestExternalities::new_empty().execute_with(|| {
// ensure that the `AccountId` is set properly and doesn't generate the same
// pool account for different pool ids.
let native = T::MultiAssetIdConverter::get_native();
// Decode the asset ids from bytes.
let asset_1 = T::MultiAssetIdConverter::into_multiasset_id(&T::AssetId::decode(&mut vec![0u8, 0, 0, 1].as_slice()).unwrap());
let asset_2 = T::MultiAssetIdConverter::into_multiasset_id(&T::AssetId::decode(&mut vec![255u8, 255, 255, 255].as_slice()).unwrap());
assert!(asset_1 != asset_2, "unfortunatly decoded to be the same asset.");
let pool_account_1 = Self::get_pool_account(&(native.clone(), asset_1));
let pool_account_2 = Self::get_pool_account(&(native, asset_2));
assert!(sp_std::mem::size_of::<T::AccountId>() >= sp_std::mem::size_of::<u128>());
assert!(
pool_account_1 != pool_account_2,
"AccountId should be set at least to u128"
);
});
}
#[cfg(test)]
sp_io::TestExternalities::new_empty().execute_with(|| {
// ensure that the `AccountId` is set properly and doesn't generate the same
// pool account for different pool ids.
let native = T::MultiAssetIdConverter::get_native();
let asset_1 =
T::MultiAssetIdConverter::into_multiasset_id(&T::BenchmarkHelper::asset_id(1));
let asset_2 =
T::MultiAssetIdConverter::into_multiasset_id(&T::BenchmarkHelper::asset_id(2));
assert!(asset_1 != asset_2, "must return different assets for different ids.");
let pool_account_1 = Self::get_pool_account(&(native.clone(), asset_1));
let pool_account_2 = Self::get_pool_account(&(native, asset_2));
assert!(sp_std::mem::size_of::<T::AccountId>() >= sp_std::mem::size_of::<u128>());
assert!(
pool_account_1 != pool_account_2,
"AccountId should be set at least to u128"
);
});
}
}
substrate/frame/asset-conversion/src/mock.rs
+1 -1
View File
@@ -178,7 +178,7 @@ impl Config for Test {
type MultiAssetId = NativeOrAssetId<u32>;
type MultiAssetIdConverter = NativeOrAssetIdConverter<u32>;
#[cfg(feature = "runtime-benchmarks")]
#[cfg(any(test, feature = "runtime-benchmarks"))]
type BenchmarkHelper = ();
}
substrate/frame/asset-conversion/src/types.rs
+2 -2
View File
@@ -50,13 +50,13 @@ pub trait MultiAssetIdConverter<MultiAssetId, AssetId> {
}
/// Benchmark Helper
#[cfg(feature = "runtime-benchmarks")]
#[cfg(any(test, feature = "runtime-benchmarks"))]
pub trait BenchmarkHelper<AssetId> {
/// Returns an asset id from a given integer.
fn asset_id(asset_id: u32) -> AssetId;
}
#[cfg(feature = "runtime-benchmarks")]
#[cfg(any(test, feature = "runtime-benchmarks"))]
impl<AssetId> BenchmarkHelper<AssetId> for ()
where
AssetId: From<u32>,