Skip to content

Commit e3832c5

Browse files
tlacloctlacloc
authored
Update dependencies to use Polkadot v1.0.0 (#19)
* 🚀 chore(afloat): update dependencies to use Polkadot v1.0.0 branch for frame-support, frame-system, frame-benchmarking, sp-core, sp-io, sp-runtime, and sp-std 🚀 chore(bitcoin-vaults): update dependencies to use Polkadot v1.0.0 branch for frame-support, frame-system, frame-benchmarking, sp-core, sp-io, sp-runtime, and sp-std 🚀 chore(confidential-docs): update dependencies to use Polkadot v1.0.0 branch for frame-support, frame-system, and frame-benchmarking 🔀 chore(Cargo.toml): update substrate dependencies to use polkadot-v1.0.0 branch for fruniques, fund-admin-records, and fund-admin pallets 🔀 chore(Cargo.toml): update dependencies to use polkadot-v1.0.0 branch for frame-support, frame-system, frame-benchmarking, sp-runtime, pallet-uniques, pallet-balances, pallet-timestamp, sp-core, sp-io, and pallet-balances in gated-marketplace, mapped-assets, and rbac pallets 🔀 chore(Cargo.toml): update substrate dependencies to use polkadot-v1.0.0 branch for frame-support, frame-system, frame-benchmarking, sp-std, sp-core, sp-io, and sp-runtime to align with the latest version of Substrate framework * 🔧 chore(migration.rs): fix indentation and formatting in log messages for better readability 🔧 chore(rust-toolchain.toml): update Rust toolchain channel to nightly-2023-10-01 for compatibility with dependencies and add rustfmt component * update format
1 parent fcaab50 commit e3832c5

File tree

29 files changed

+278
-275
lines changed

29 files changed

+278
-275
lines changed

‎Cargo.lock

+36-36
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pallets/afloat/Cargo.toml

+11-11
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@ serde = { version = "1.0.140", default-features = false, features = ["derive"] }
2121
scale-info = { version = "2.1.1", default-features = false, features = [
2222
"derive"
2323
] }
24-
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40", default-features = false }
25-
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40", default-features = false }
26-
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40", default-features = false, optional = true }
27-
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40", default-features = false }
28-
pallet-uniques = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40", default-features = false }
29-
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40", default-features = false }
30-
pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40", default-features = false }
24+
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
25+
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
26+
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
27+
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
28+
pallet-uniques = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
29+
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
30+
pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
3131
pallet-fruniques = { path = "../fruniques", default-features = false, version = "0.1.0-dev" }
3232
pallet-rbac = { path = "../rbac/", default-features = false, version = "4.0.0-dev" }
3333
pallet-gated-marketplace = { path = "../gated-marketplace/", default-features = false, version = "4.0.0-dev" }
3434
pallet-mapped-assets = { path = "../mapped-assets/", default-features = false, version = "4.0.0-dev" }
3535

3636
[dev-dependencies]
37-
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
38-
sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
39-
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
40-
sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
37+
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
38+
sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
39+
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
40+
sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
4141

4242
[features]
4343
default = ["std"]

‎pallets/afloat/src/functions.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ impl<T: Config> Pallet<T> {
6464
AfloatCollectionId::<T>::put(collection_id);
6565
Ok(())
6666
} else {
67-
return Err(Error::<T>::FailedToCreateFruniquesCollection.into())
67+
return Err(Error::<T>::FailedToCreateFruniquesCollection.into());
6868
}
6969
}
7070

@@ -461,8 +461,8 @@ impl<T: Config> Pallet<T> {
461461
);
462462
//ensure user has enough afloat balance
463463
ensure!(
464-
Self::do_get_afloat_balance(who.clone()) >=
465-
offer.price_per_credit * tax_credit_amount.into(),
464+
Self::do_get_afloat_balance(who.clone())
465+
>= offer.price_per_credit * tax_credit_amount.into(),
466466
Error::<T>::NotEnoughAfloatBalanceAvailable
467467
);
468468
let zero_balance: T::Balance = Zero::zero();
@@ -609,7 +609,7 @@ impl<T: Config> Pallet<T> {
609609
let tax_credit_amount_u32 = if let Ok(amount) = transaction.tax_credit_amount.try_into() {
610610
amount
611611
} else {
612-
return Err(Error::<T>::TaxCreditAmountOverflow.into())
612+
return Err(Error::<T>::TaxCreditAmountOverflow.into());
613613
};
614614

615615
let child_offer_id = pallet_gated_marketplace::Pallet::<T>::do_enlist_sell_offer(
@@ -713,7 +713,7 @@ impl<T: Config> Pallet<T> {
713713
<AfloatOffers<T>>::try_mutate(offer_id, |offer| -> DispatchResult {
714714
let offer = offer.as_mut().ok_or(Error::<T>::OfferNotFound)?;
715715
if transaction.tax_credit_amount > offer.tax_credit_amount_remaining {
716-
return Err(Error::<T>::Underflow.into())
716+
return Err(Error::<T>::Underflow.into());
717717
}
718718
offer.tax_credit_amount_remaining =
719719
offer.tax_credit_amount_remaining - transaction.tax_credit_amount;

0 commit comments

Comments
 (0)