pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-20 05:51:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Companion for substrate #7159 (#1747)

Browse Source 
* Companion for paritytech/substrate#7159

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* update WithdrawReason in xcm

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* "Update Substrate"

Co-authored-by: parity-processbot <>
This commit is contained in:
Qinxuan Chen
2020-10-29 20:35:58 +08:00
committed by GitHub
parent 724321cd2d
commit 39db0688de
4 changed files with 146 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/runtime/common/src/crowdfund.rs
+4 -4
View File
@@ -69,7 +69,7 @@
use frame_support::{
decl_module, decl_storage, decl_event, decl_error, storage::child, ensure,
traits::{
Currency, Get, OnUnbalanced, WithdrawReason, ExistenceRequirement::AllowDeath
Currency, Get, OnUnbalanced, WithdrawReasons, ExistenceRequirement::AllowDeath
},
};
use frame_system::ensure_signed;
@@ -273,7 +273,7 @@ decl_module! {
ensure!(end > <frame_system::Module<T>>::block_number(), Error::<T>::CannotEndInPast);
let deposit = T::SubmissionDeposit::get();
let transfer = WithdrawReason::Transfer.into();
let transfer = WithdrawReasons::TRANSFER;
let imb = T::Currency::withdraw(&owner, deposit, transfer, AllowDeath)?;
let index = FundCount::get();
@@ -455,7 +455,7 @@ decl_module! {
// Avoid using transfer to ensure we don't pay any fees.
let fund_account = &Self::fund_account_id(index);
let transfer = WithdrawReason::Transfer.into();
let transfer = WithdrawReasons::TRANSFER;
let imbalance = T::Currency::withdraw(fund_account, balance, transfer, AllowDeath)?;
let _ = T::Currency::resolve_into_existing(&who, imbalance);
@@ -485,7 +485,7 @@ decl_module! {
let account = Self::fund_account_id(index);
// Avoid using transfer to ensure we don't pay any fees.
let transfer = WithdrawReason::Transfer.into();
let transfer = WithdrawReasons::TRANSFER;
let imbalance = T::Currency::withdraw(&account, fund.deposit, transfer, AllowDeath)?;
let _ = T::Currency::resolve_into_existing(&fund.owner, imbalance);
polkadot/runtime/common/src/slots.rs
+3 -3
View File
@@ -25,7 +25,7 @@ use sp_runtime::traits::{
use codec::{Encode, Decode, Codec};
use frame_support::{
decl_module, decl_storage, decl_event, decl_error, ensure, dispatch::DispatchResult,
traits::{Currency, ReservableCurrency, WithdrawReason, ExistenceRequirement, Get, Randomness},
traits::{Currency, ReservableCurrency, WithdrawReasons, ExistenceRequirement, Get, Randomness},
weights::{DispatchClass, Weight},
};
use primitives::v1::{
@@ -630,7 +630,7 @@ impl<T: Trait> Module<T> {
if T::Currency::withdraw(
&bidder.who,
amount,
WithdrawReason::Fee.into(),
WithdrawReasons::FEE,
ExistenceRequirement::AllowDeath
).is_err() {
continue;
@@ -667,7 +667,7 @@ impl<T: Trait> Module<T> {
if T::Currency::withdraw(
&para_id.into_account(),
additional,
WithdrawReason::Fee.into(),
WithdrawReasons::FEE,
ExistenceRequirement::AllowDeath
).is_err() {
continue;