Companion for: Substrate#13869 (#2631)

* Companion for: Substrate#13869

https://github.com/paritytech/substrate/pull/13869

* Fix

* Warning

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

---------

Co-authored-by: parity-processbot <>
This commit is contained in:
Bastian Köcher
2023-05-25 01:19:28 +02:00
committed by GitHub
parent 3caca86966
commit 490ab62a6d
19 changed files with 284 additions and 290 deletions
+264 -259
View File
File diff suppressed because it is too large Load Diff
@@ -190,7 +190,7 @@ impl pallet_balances::Config for TestRuntime {
type MaxLocks = ConstU32<50>; type MaxLocks = ConstU32<50>;
type MaxReserves = ConstU32<50>; type MaxReserves = ConstU32<50>;
type ReserveIdentifier = [u8; 8]; type ReserveIdentifier = [u8; 8];
type HoldIdentifier = (); type RuntimeHoldReason = RuntimeHoldReason;
type FreezeIdentifier = (); type FreezeIdentifier = ();
type MaxHolds = ConstU32<0>; type MaxHolds = ConstU32<0>;
type MaxFreezes = ConstU32<0>; type MaxFreezes = ConstU32<0>;
+1 -1
View File
@@ -133,7 +133,7 @@ impl pallet_balances::Config for TestRuntime {
type WeightInfo = (); type WeightInfo = ();
type MaxReserves = (); type MaxReserves = ();
type ReserveIdentifier = (); type ReserveIdentifier = ();
type HoldIdentifier = (); type RuntimeHoldReason = RuntimeHoldReason;
type FreezeIdentifier = (); type FreezeIdentifier = ();
type MaxHolds = ConstU32<0>; type MaxHolds = ConstU32<0>;
type MaxFreezes = ConstU32<0>; type MaxFreezes = ConstU32<0>;
+1 -1
View File
@@ -102,7 +102,7 @@ impl pallet_balances::Config for TestRuntime {
type WeightInfo = (); type WeightInfo = ();
type MaxReserves = ConstU32<1>; type MaxReserves = ConstU32<1>;
type ReserveIdentifier = [u8; 8]; type ReserveIdentifier = [u8; 8];
type HoldIdentifier = (); type RuntimeHoldReason = RuntimeHoldReason;
type FreezeIdentifier = (); type FreezeIdentifier = ();
type MaxHolds = ConstU32<0>; type MaxHolds = ConstU32<0>;
type MaxFreezes = ConstU32<0>; type MaxFreezes = ConstU32<0>;
@@ -96,7 +96,7 @@ impl pallet_balances::Config for Test {
type MaxLocks = (); type MaxLocks = ();
type MaxReserves = MaxReserves; type MaxReserves = MaxReserves;
type ReserveIdentifier = [u8; 8]; type ReserveIdentifier = [u8; 8];
type HoldIdentifier = (); type RuntimeHoldReason = RuntimeHoldReason;
type FreezeIdentifier = (); type FreezeIdentifier = ();
type MaxHolds = ConstU32<0>; type MaxHolds = ConstU32<0>;
type MaxFreezes = ConstU32<0>; type MaxFreezes = ConstU32<0>;
+1 -1
View File
@@ -100,7 +100,7 @@ impl pallet_balances::Config for Test {
type MaxLocks = (); type MaxLocks = ();
type MaxReserves = MaxReserves; type MaxReserves = MaxReserves;
type ReserveIdentifier = [u8; 8]; type ReserveIdentifier = [u8; 8];
type HoldIdentifier = (); type RuntimeHoldReason = RuntimeHoldReason;
type FreezeIdentifier = (); type FreezeIdentifier = ();
type MaxHolds = ConstU32<0>; type MaxHolds = ConstU32<0>;
type MaxFreezes = ConstU32<0>; type MaxFreezes = ConstU32<0>;
@@ -340,7 +340,7 @@ impl pallet_balances::Config for Runtime {
type WeightInfo = pallet_balances::weights::SubstrateWeight<Runtime>; type WeightInfo = pallet_balances::weights::SubstrateWeight<Runtime>;
type MaxReserves = ConstU32<50>; type MaxReserves = ConstU32<50>;
type ReserveIdentifier = [u8; 8]; type ReserveIdentifier = [u8; 8];
type HoldIdentifier = (); type RuntimeHoldReason = RuntimeHoldReason;
type FreezeIdentifier = (); type FreezeIdentifier = ();
type MaxHolds = ConstU32<0>; type MaxHolds = ConstU32<0>;
type MaxFreezes = ConstU32<0>; type MaxFreezes = ConstU32<0>;
+1 -1
View File
@@ -197,7 +197,7 @@ mod tests {
type WeightInfo = (); type WeightInfo = ();
type MaxReserves = MaxReserves; type MaxReserves = MaxReserves;
type ReserveIdentifier = [u8; 8]; type ReserveIdentifier = [u8; 8];
type HoldIdentifier = (); type RuntimeHoldReason = RuntimeHoldReason;
type FreezeIdentifier = (); type FreezeIdentifier = ();
type MaxHolds = ConstU32<1>; type MaxHolds = ConstU32<1>;
type MaxFreezes = ConstU32<1>; type MaxFreezes = ConstU32<1>;
@@ -205,7 +205,7 @@ impl pallet_balances::Config for Runtime {
type WeightInfo = weights::pallet_balances::WeightInfo<Runtime>; type WeightInfo = weights::pallet_balances::WeightInfo<Runtime>;
type MaxReserves = ConstU32<50>; type MaxReserves = ConstU32<50>;
type ReserveIdentifier = [u8; 8]; type ReserveIdentifier = [u8; 8];
type HoldIdentifier = (); type RuntimeHoldReason = RuntimeHoldReason;
type FreezeIdentifier = (); type FreezeIdentifier = ();
type MaxHolds = ConstU32<0>; type MaxHolds = ConstU32<0>;
type MaxFreezes = ConstU32<0>; type MaxFreezes = ConstU32<0>;
@@ -220,7 +220,7 @@ impl pallet_balances::Config for Runtime {
type WeightInfo = weights::pallet_balances::WeightInfo<Runtime>; type WeightInfo = weights::pallet_balances::WeightInfo<Runtime>;
type MaxReserves = ConstU32<50>; type MaxReserves = ConstU32<50>;
type ReserveIdentifier = [u8; 8]; type ReserveIdentifier = [u8; 8];
type HoldIdentifier = (); type RuntimeHoldReason = RuntimeHoldReason;
type FreezeIdentifier = (); type FreezeIdentifier = ();
type MaxHolds = ConstU32<0>; type MaxHolds = ConstU32<0>;
type MaxFreezes = ConstU32<0>; type MaxFreezes = ConstU32<0>;
@@ -68,7 +68,6 @@ use parachains_common::{
Index, Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT, Index, Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT,
NORMAL_DISPATCH_RATIO, SLOT_DURATION, NORMAL_DISPATCH_RATIO, SLOT_DURATION,
}; };
use scale_info::TypeInfo;
use xcm_config::{ use xcm_config::{
ForeignAssetsConvertedConcreteId, TrustBackedAssetsConvertedConcreteId, WestendLocation, ForeignAssetsConvertedConcreteId, TrustBackedAssetsConvertedConcreteId, WestendLocation,
XcmConfig, XcmOriginToTransactDispatchOrigin, XcmConfig, XcmOriginToTransactDispatchOrigin,
@@ -180,15 +179,6 @@ parameter_types! {
pub const ExistentialDeposit: Balance = EXISTENTIAL_DEPOSIT; pub const ExistentialDeposit: Balance = EXISTENTIAL_DEPOSIT;
} }
/// A reason for placing a hold on funds.
#[derive(
Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, MaxEncodedLen, Debug, TypeInfo,
)]
pub enum HoldReason {
/// Used by the NFT Fractionalization Pallet.
NftFractionalization,
}
impl pallet_balances::Config for Runtime { impl pallet_balances::Config for Runtime {
type MaxLocks = ConstU32<50>; type MaxLocks = ConstU32<50>;
/// The type for recording an account's balance. /// The type for recording an account's balance.
@@ -201,7 +191,7 @@ impl pallet_balances::Config for Runtime {
type WeightInfo = weights::pallet_balances::WeightInfo<Runtime>; type WeightInfo = weights::pallet_balances::WeightInfo<Runtime>;
type MaxReserves = ConstU32<50>; type MaxReserves = ConstU32<50>;
type ReserveIdentifier = [u8; 8]; type ReserveIdentifier = [u8; 8];
type HoldIdentifier = HoldReason; type RuntimeHoldReason = RuntimeHoldReason;
type FreezeIdentifier = (); type FreezeIdentifier = ();
type MaxHolds = ConstU32<1>; type MaxHolds = ConstU32<1>;
type MaxFreezes = ConstU32<0>; type MaxFreezes = ConstU32<0>;
@@ -640,7 +630,6 @@ parameter_types! {
pub const NftFractionalizationPalletId: PalletId = PalletId(*b"fraction"); pub const NftFractionalizationPalletId: PalletId = PalletId(*b"fraction");
pub NewAssetSymbol: BoundedVec<u8, AssetsStringLimit> = (*b"FRAC").to_vec().try_into().unwrap(); pub NewAssetSymbol: BoundedVec<u8, AssetsStringLimit> = (*b"FRAC").to_vec().try_into().unwrap();
pub NewAssetName: BoundedVec<u8, AssetsStringLimit> = (*b"Frac").to_vec().try_into().unwrap(); pub NewAssetName: BoundedVec<u8, AssetsStringLimit> = (*b"Frac").to_vec().try_into().unwrap();
pub const NftFractionalizationHoldReason: HoldReason = HoldReason::NftFractionalization;
} }
impl pallet_nft_fractionalization::Config for Runtime { impl pallet_nft_fractionalization::Config for Runtime {
@@ -658,7 +647,7 @@ impl pallet_nft_fractionalization::Config for Runtime {
type Nfts = Nfts; type Nfts = Nfts;
type PalletId = NftFractionalizationPalletId; type PalletId = NftFractionalizationPalletId;
type WeightInfo = pallet_nft_fractionalization::weights::SubstrateWeight<Runtime>; type WeightInfo = pallet_nft_fractionalization::weights::SubstrateWeight<Runtime>;
type HoldReason = NftFractionalizationHoldReason; type RuntimeHoldReason = RuntimeHoldReason;
#[cfg(feature = "runtime-benchmarks")] #[cfg(feature = "runtime-benchmarks")]
type BenchmarkHelper = (); type BenchmarkHelper = ();
} }
@@ -747,7 +736,7 @@ construct_runtime!(
Uniques: pallet_uniques::{Pallet, Call, Storage, Event<T>} = 51, Uniques: pallet_uniques::{Pallet, Call, Storage, Event<T>} = 51,
Nfts: pallet_nfts::{Pallet, Call, Storage, Event<T>} = 52, Nfts: pallet_nfts::{Pallet, Call, Storage, Event<T>} = 52,
ForeignAssets: pallet_assets::<Instance2>::{Pallet, Call, Storage, Event<T>} = 53, ForeignAssets: pallet_assets::<Instance2>::{Pallet, Call, Storage, Event<T>} = 53,
NftFractionalization: pallet_nft_fractionalization::{Pallet, Call, Storage, Event<T>} = 54, NftFractionalization: pallet_nft_fractionalization::{Pallet, Call, Storage, Event<T>, HoldReason} = 54,
} }
); );
@@ -246,7 +246,7 @@ impl pallet_balances::Config for Runtime {
type MaxLocks = ConstU32<50>; type MaxLocks = ConstU32<50>;
type MaxReserves = ConstU32<50>; type MaxReserves = ConstU32<50>;
type ReserveIdentifier = [u8; 8]; type ReserveIdentifier = [u8; 8];
type HoldIdentifier = (); type RuntimeHoldReason = RuntimeHoldReason;
type FreezeIdentifier = (); type FreezeIdentifier = ();
type MaxHolds = ConstU32<0>; type MaxHolds = ConstU32<0>;
type MaxFreezes = ConstU32<0>; type MaxFreezes = ConstU32<0>;
@@ -246,7 +246,7 @@ impl pallet_balances::Config for Runtime {
type MaxLocks = ConstU32<50>; type MaxLocks = ConstU32<50>;
type MaxReserves = ConstU32<50>; type MaxReserves = ConstU32<50>;
type ReserveIdentifier = [u8; 8]; type ReserveIdentifier = [u8; 8];
type HoldIdentifier = (); type RuntimeHoldReason = RuntimeHoldReason;
type FreezeIdentifier = (); type FreezeIdentifier = ();
type MaxHolds = ConstU32<0>; type MaxHolds = ConstU32<0>;
type MaxFreezes = ConstU32<0>; type MaxFreezes = ConstU32<0>;
@@ -261,7 +261,7 @@ impl pallet_balances::Config for Runtime {
type MaxLocks = ConstU32<50>; type MaxLocks = ConstU32<50>;
type MaxReserves = ConstU32<50>; type MaxReserves = ConstU32<50>;
type ReserveIdentifier = [u8; 8]; type ReserveIdentifier = [u8; 8];
type HoldIdentifier = (); type RuntimeHoldReason = RuntimeHoldReason;
type FreezeIdentifier = (); type FreezeIdentifier = ();
type MaxHolds = ConstU32<0>; type MaxHolds = ConstU32<0>;
type MaxFreezes = ConstU32<0>; type MaxFreezes = ConstU32<0>;
@@ -208,7 +208,7 @@ impl pallet_balances::Config for Runtime {
type WeightInfo = weights::pallet_balances::WeightInfo<Runtime>; type WeightInfo = weights::pallet_balances::WeightInfo<Runtime>;
type MaxReserves = ConstU32<50>; type MaxReserves = ConstU32<50>;
type ReserveIdentifier = [u8; 8]; type ReserveIdentifier = [u8; 8];
type HoldIdentifier = (); type RuntimeHoldReason = RuntimeHoldReason;
type FreezeIdentifier = (); type FreezeIdentifier = ();
type MaxHolds = ConstU32<0>; type MaxHolds = ConstU32<0>;
type MaxFreezes = ConstU32<0>; type MaxFreezes = ConstU32<0>;
@@ -213,7 +213,7 @@ impl pallet_balances::Config for Runtime {
type WeightInfo = pallet_balances::weights::SubstrateWeight<Runtime>; type WeightInfo = pallet_balances::weights::SubstrateWeight<Runtime>;
type MaxReserves = ConstU32<50>; type MaxReserves = ConstU32<50>;
type ReserveIdentifier = [u8; 8]; type ReserveIdentifier = [u8; 8];
type HoldIdentifier = (); type RuntimeHoldReason = RuntimeHoldReason;
type FreezeIdentifier = (); type FreezeIdentifier = ();
type MaxHolds = ConstU32<0>; type MaxHolds = ConstU32<0>;
type MaxFreezes = ConstU32<0>; type MaxFreezes = ConstU32<0>;
@@ -384,7 +384,7 @@ impl pallet_balances::Config for Runtime {
type WeightInfo = pallet_balances::weights::SubstrateWeight<Runtime>; type WeightInfo = pallet_balances::weights::SubstrateWeight<Runtime>;
type MaxReserves = ConstU32<50>; type MaxReserves = ConstU32<50>;
type ReserveIdentifier = [u8; 8]; type ReserveIdentifier = [u8; 8];
type HoldIdentifier = (); type RuntimeHoldReason = RuntimeHoldReason;
type FreezeIdentifier = (); type FreezeIdentifier = ();
type MaxHolds = ConstU32<0>; type MaxHolds = ConstU32<0>;
type MaxFreezes = ConstU32<0>; type MaxFreezes = ConstU32<0>;
@@ -237,7 +237,7 @@ impl pallet_balances::Config for Runtime {
type MaxLocks = ConstU32<50>; type MaxLocks = ConstU32<50>;
type MaxReserves = ConstU32<50>; type MaxReserves = ConstU32<50>;
type ReserveIdentifier = [u8; 8]; type ReserveIdentifier = [u8; 8];
type HoldIdentifier = (); type RuntimeHoldReason = RuntimeHoldReason;
type FreezeIdentifier = (); type FreezeIdentifier = ();
type MaxHolds = ConstU32<0>; type MaxHolds = ConstU32<0>;
type MaxFreezes = ConstU32<0>; type MaxFreezes = ConstU32<0>;
+1 -1
View File
@@ -244,7 +244,7 @@ impl pallet_balances::Config for Runtime {
type MaxLocks = (); type MaxLocks = ();
type MaxReserves = MaxReserves; type MaxReserves = MaxReserves;
type ReserveIdentifier = [u8; 8]; type ReserveIdentifier = [u8; 8];
type HoldIdentifier = (); type RuntimeHoldReason = RuntimeHoldReason;
type FreezeIdentifier = (); type FreezeIdentifier = ();
type MaxHolds = ConstU32<0>; type MaxHolds = ConstU32<0>;
type MaxFreezes = ConstU32<0>; type MaxFreezes = ConstU32<0>;