mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-30 09:21:04 +00:00
Companion for 12109 (#5929)
* Update following `pallet-vesting` configurable `WithdrawReasons`
* Update lib.rs
* Update lib.rs
* Update lib.rs
* update lockfile for {"substrate"}
* fix warning
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: parity-processbot <>
This commit is contained in:
Generated
+179
-178
File diff suppressed because it is too large
Load Diff
@@ -717,7 +717,7 @@ mod tests {
|
|||||||
assert_err, assert_noop, assert_ok,
|
assert_err, assert_noop, assert_ok,
|
||||||
dispatch::{DispatchError::BadOrigin, GetDispatchInfo, Pays},
|
dispatch::{DispatchError::BadOrigin, GetDispatchInfo, Pays},
|
||||||
ord_parameter_types, parameter_types,
|
ord_parameter_types, parameter_types,
|
||||||
traits::{ExistenceRequirement, GenesisBuild},
|
traits::{ExistenceRequirement, GenesisBuild, WithdrawReasons},
|
||||||
};
|
};
|
||||||
use pallet_balances;
|
use pallet_balances;
|
||||||
use sp_runtime::{
|
use sp_runtime::{
|
||||||
@@ -790,6 +790,8 @@ mod tests {
|
|||||||
|
|
||||||
parameter_types! {
|
parameter_types! {
|
||||||
pub const MinVestedTransfer: u64 = 1;
|
pub const MinVestedTransfer: u64 = 1;
|
||||||
|
pub UnvestedFundsAllowedWithdrawReasons: WithdrawReasons =
|
||||||
|
WithdrawReasons::except(WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE);
|
||||||
}
|
}
|
||||||
|
|
||||||
impl pallet_vesting::Config for Test {
|
impl pallet_vesting::Config for Test {
|
||||||
@@ -798,6 +800,7 @@ mod tests {
|
|||||||
type BlockNumberToBalance = Identity;
|
type BlockNumberToBalance = Identity;
|
||||||
type MinVestedTransfer = MinVestedTransfer;
|
type MinVestedTransfer = MinVestedTransfer;
|
||||||
type WeightInfo = ();
|
type WeightInfo = ();
|
||||||
|
type UnvestedFundsAllowedWithdrawReasons = UnvestedFundsAllowedWithdrawReasons;
|
||||||
const MAX_VESTING_SCHEDULES: u32 = 28;
|
const MAX_VESTING_SCHEDULES: u32 = 28;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -474,8 +474,10 @@ mod tests {
|
|||||||
// or public keys. `u64` is used as the `AccountId` and no `Signature`s are required.
|
// or public keys. `u64` is used as the `AccountId` and no `Signature`s are required.
|
||||||
use crate::purchase;
|
use crate::purchase;
|
||||||
use frame_support::{
|
use frame_support::{
|
||||||
assert_noop, assert_ok, dispatch::DispatchError::BadOrigin, ord_parameter_types,
|
assert_noop, assert_ok,
|
||||||
parameter_types, traits::Currency,
|
dispatch::DispatchError::BadOrigin,
|
||||||
|
ord_parameter_types, parameter_types,
|
||||||
|
traits::{Currency, WithdrawReasons},
|
||||||
};
|
};
|
||||||
use pallet_balances::Error as BalancesError;
|
use pallet_balances::Error as BalancesError;
|
||||||
use sp_runtime::{
|
use sp_runtime::{
|
||||||
@@ -550,6 +552,8 @@ mod tests {
|
|||||||
|
|
||||||
parameter_types! {
|
parameter_types! {
|
||||||
pub const MinVestedTransfer: u64 = 1;
|
pub const MinVestedTransfer: u64 = 1;
|
||||||
|
pub UnvestedFundsAllowedWithdrawReasons: WithdrawReasons =
|
||||||
|
WithdrawReasons::except(WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE);
|
||||||
}
|
}
|
||||||
|
|
||||||
impl pallet_vesting::Config for Test {
|
impl pallet_vesting::Config for Test {
|
||||||
@@ -558,6 +562,7 @@ mod tests {
|
|||||||
type BlockNumberToBalance = Identity;
|
type BlockNumberToBalance = Identity;
|
||||||
type MinVestedTransfer = MinVestedTransfer;
|
type MinVestedTransfer = MinVestedTransfer;
|
||||||
type WeightInfo = ();
|
type WeightInfo = ();
|
||||||
|
type UnvestedFundsAllowedWithdrawReasons = UnvestedFundsAllowedWithdrawReasons;
|
||||||
const MAX_VESTING_SCHEDULES: u32 = 28;
|
const MAX_VESTING_SCHEDULES: u32 = 28;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ use frame_support::{
|
|||||||
construct_runtime, parameter_types,
|
construct_runtime, parameter_types,
|
||||||
traits::{
|
traits::{
|
||||||
ConstU32, Contains, EitherOf, EitherOfDiverse, InstanceFilter, KeyOwnerProofSystem,
|
ConstU32, Contains, EitherOf, EitherOfDiverse, InstanceFilter, KeyOwnerProofSystem,
|
||||||
LockIdentifier, PrivilegeCmp,
|
LockIdentifier, PrivilegeCmp, WithdrawReasons,
|
||||||
},
|
},
|
||||||
weights::ConstantMultiplier,
|
weights::ConstantMultiplier,
|
||||||
PalletId, RuntimeDebug,
|
PalletId, RuntimeDebug,
|
||||||
@@ -931,6 +931,8 @@ impl pallet_society::Config for Runtime {
|
|||||||
|
|
||||||
parameter_types! {
|
parameter_types! {
|
||||||
pub const MinVestedTransfer: Balance = 100 * CENTS;
|
pub const MinVestedTransfer: Balance = 100 * CENTS;
|
||||||
|
pub UnvestedFundsAllowedWithdrawReasons: WithdrawReasons =
|
||||||
|
WithdrawReasons::except(WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE);
|
||||||
}
|
}
|
||||||
|
|
||||||
impl pallet_vesting::Config for Runtime {
|
impl pallet_vesting::Config for Runtime {
|
||||||
@@ -939,6 +941,7 @@ impl pallet_vesting::Config for Runtime {
|
|||||||
type BlockNumberToBalance = ConvertInto;
|
type BlockNumberToBalance = ConvertInto;
|
||||||
type MinVestedTransfer = MinVestedTransfer;
|
type MinVestedTransfer = MinVestedTransfer;
|
||||||
type WeightInfo = weights::pallet_vesting::WeightInfo<Runtime>;
|
type WeightInfo = weights::pallet_vesting::WeightInfo<Runtime>;
|
||||||
|
type UnvestedFundsAllowedWithdrawReasons = UnvestedFundsAllowedWithdrawReasons;
|
||||||
const MAX_VESTING_SCHEDULES: u32 = 28;
|
const MAX_VESTING_SCHEDULES: u32 = 28;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ use frame_support::{
|
|||||||
construct_runtime, parameter_types,
|
construct_runtime, parameter_types,
|
||||||
traits::{
|
traits::{
|
||||||
ConstU32, EitherOfDiverse, InstanceFilter, KeyOwnerProofSystem, LockIdentifier,
|
ConstU32, EitherOfDiverse, InstanceFilter, KeyOwnerProofSystem, LockIdentifier,
|
||||||
PrivilegeCmp,
|
PrivilegeCmp, WithdrawReasons,
|
||||||
},
|
},
|
||||||
weights::ConstantMultiplier,
|
weights::ConstantMultiplier,
|
||||||
PalletId, RuntimeDebug,
|
PalletId, RuntimeDebug,
|
||||||
@@ -992,6 +992,8 @@ impl claims::Config for Runtime {
|
|||||||
|
|
||||||
parameter_types! {
|
parameter_types! {
|
||||||
pub const MinVestedTransfer: Balance = 1 * DOLLARS;
|
pub const MinVestedTransfer: Balance = 1 * DOLLARS;
|
||||||
|
pub UnvestedFundsAllowedWithdrawReasons: WithdrawReasons =
|
||||||
|
WithdrawReasons::except(WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE);
|
||||||
}
|
}
|
||||||
|
|
||||||
impl pallet_vesting::Config for Runtime {
|
impl pallet_vesting::Config for Runtime {
|
||||||
@@ -1000,6 +1002,7 @@ impl pallet_vesting::Config for Runtime {
|
|||||||
type BlockNumberToBalance = ConvertInto;
|
type BlockNumberToBalance = ConvertInto;
|
||||||
type MinVestedTransfer = MinVestedTransfer;
|
type MinVestedTransfer = MinVestedTransfer;
|
||||||
type WeightInfo = weights::pallet_vesting::WeightInfo<Runtime>;
|
type WeightInfo = weights::pallet_vesting::WeightInfo<Runtime>;
|
||||||
|
type UnvestedFundsAllowedWithdrawReasons = UnvestedFundsAllowedWithdrawReasons;
|
||||||
const MAX_VESTING_SCHEDULES: u32 = 28;
|
const MAX_VESTING_SCHEDULES: u32 = 28;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ use frame_support::{
|
|||||||
construct_runtime, parameter_types,
|
construct_runtime, parameter_types,
|
||||||
traits::{
|
traits::{
|
||||||
Contains, EitherOfDiverse, InstanceFilter, KeyOwnerProofSystem, LockIdentifier,
|
Contains, EitherOfDiverse, InstanceFilter, KeyOwnerProofSystem, LockIdentifier,
|
||||||
PrivilegeCmp,
|
PrivilegeCmp, WithdrawReasons,
|
||||||
},
|
},
|
||||||
weights::ConstantMultiplier,
|
weights::ConstantMultiplier,
|
||||||
PalletId, RuntimeDebug,
|
PalletId, RuntimeDebug,
|
||||||
@@ -857,6 +857,8 @@ impl pallet_society::Config for Runtime {
|
|||||||
|
|
||||||
parameter_types! {
|
parameter_types! {
|
||||||
pub const MinVestedTransfer: Balance = 100 * CENTS;
|
pub const MinVestedTransfer: Balance = 100 * CENTS;
|
||||||
|
pub UnvestedFundsAllowedWithdrawReasons: WithdrawReasons =
|
||||||
|
WithdrawReasons::except(WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE);
|
||||||
}
|
}
|
||||||
|
|
||||||
impl pallet_vesting::Config for Runtime {
|
impl pallet_vesting::Config for Runtime {
|
||||||
@@ -865,6 +867,7 @@ impl pallet_vesting::Config for Runtime {
|
|||||||
type BlockNumberToBalance = ConvertInto;
|
type BlockNumberToBalance = ConvertInto;
|
||||||
type MinVestedTransfer = MinVestedTransfer;
|
type MinVestedTransfer = MinVestedTransfer;
|
||||||
type WeightInfo = weights::pallet_vesting::WeightInfo<Runtime>;
|
type WeightInfo = weights::pallet_vesting::WeightInfo<Runtime>;
|
||||||
|
type UnvestedFundsAllowedWithdrawReasons = UnvestedFundsAllowedWithdrawReasons;
|
||||||
const MAX_VESTING_SCHEDULES: u32 = 28;
|
const MAX_VESTING_SCHEDULES: u32 = 28;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ use beefy_primitives::crypto::AuthorityId as BeefyId;
|
|||||||
use frame_election_provider_support::{onchain, SequentialPhragmen};
|
use frame_election_provider_support::{onchain, SequentialPhragmen};
|
||||||
use frame_support::{
|
use frame_support::{
|
||||||
construct_runtime, parameter_types,
|
construct_runtime, parameter_types,
|
||||||
traits::{Everything, KeyOwnerProofSystem},
|
traits::{Everything, KeyOwnerProofSystem, WithdrawReasons},
|
||||||
};
|
};
|
||||||
use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId};
|
use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId};
|
||||||
use pallet_session::historical as session_historical;
|
use pallet_session::historical as session_historical;
|
||||||
@@ -455,6 +455,8 @@ impl claims::Config for Runtime {
|
|||||||
|
|
||||||
parameter_types! {
|
parameter_types! {
|
||||||
pub storage MinVestedTransfer: Balance = 100 * DOLLARS;
|
pub storage MinVestedTransfer: Balance = 100 * DOLLARS;
|
||||||
|
pub UnvestedFundsAllowedWithdrawReasons: WithdrawReasons =
|
||||||
|
WithdrawReasons::except(WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE);
|
||||||
}
|
}
|
||||||
|
|
||||||
impl pallet_vesting::Config for Runtime {
|
impl pallet_vesting::Config for Runtime {
|
||||||
@@ -463,6 +465,7 @@ impl pallet_vesting::Config for Runtime {
|
|||||||
type BlockNumberToBalance = ConvertInto;
|
type BlockNumberToBalance = ConvertInto;
|
||||||
type MinVestedTransfer = MinVestedTransfer;
|
type MinVestedTransfer = MinVestedTransfer;
|
||||||
type WeightInfo = ();
|
type WeightInfo = ();
|
||||||
|
type UnvestedFundsAllowedWithdrawReasons = UnvestedFundsAllowedWithdrawReasons;
|
||||||
const MAX_VESTING_SCHEDULES: u32 = 28;
|
const MAX_VESTING_SCHEDULES: u32 = 28;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ use beefy_primitives::crypto::AuthorityId as BeefyId;
|
|||||||
use frame_election_provider_support::{onchain, SequentialPhragmen};
|
use frame_election_provider_support::{onchain, SequentialPhragmen};
|
||||||
use frame_support::{
|
use frame_support::{
|
||||||
construct_runtime, parameter_types,
|
construct_runtime, parameter_types,
|
||||||
traits::{ConstU32, InstanceFilter, KeyOwnerProofSystem},
|
traits::{ConstU32, InstanceFilter, KeyOwnerProofSystem, WithdrawReasons},
|
||||||
weights::ConstantMultiplier,
|
weights::ConstantMultiplier,
|
||||||
PalletId,
|
PalletId,
|
||||||
};
|
};
|
||||||
@@ -712,6 +712,8 @@ impl pallet_recovery::Config for Runtime {
|
|||||||
|
|
||||||
parameter_types! {
|
parameter_types! {
|
||||||
pub const MinVestedTransfer: Balance = 100 * CENTS;
|
pub const MinVestedTransfer: Balance = 100 * CENTS;
|
||||||
|
pub UnvestedFundsAllowedWithdrawReasons: WithdrawReasons =
|
||||||
|
WithdrawReasons::except(WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE);
|
||||||
}
|
}
|
||||||
|
|
||||||
impl pallet_vesting::Config for Runtime {
|
impl pallet_vesting::Config for Runtime {
|
||||||
@@ -720,6 +722,7 @@ impl pallet_vesting::Config for Runtime {
|
|||||||
type BlockNumberToBalance = ConvertInto;
|
type BlockNumberToBalance = ConvertInto;
|
||||||
type MinVestedTransfer = MinVestedTransfer;
|
type MinVestedTransfer = MinVestedTransfer;
|
||||||
type WeightInfo = weights::pallet_vesting::WeightInfo<Runtime>;
|
type WeightInfo = weights::pallet_vesting::WeightInfo<Runtime>;
|
||||||
|
type UnvestedFundsAllowedWithdrawReasons = UnvestedFundsAllowedWithdrawReasons;
|
||||||
const MAX_VESTING_SCHEDULES: u32 = 28;
|
const MAX_VESTING_SCHEDULES: u32 = 28;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user