Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update polkadot v1.1.0 #49

Merged
merged 2 commits into from
Oct 12, 2023
Merged

update polkadot v1.1.0 #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24c8375
update polkadot v1.1.0
wangjj9219 Oct 12, 2023
d6f16cd
format
wangjj9219 Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions lib/stable-asset/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,45 +17,45 @@ scale-info = { version = "2.9.0", default-features = false, features = ["derive"

[dependencies.frame-support]
default-features = false
git = "https://github.com/paritytech/substrate"
branch = "polkadot-v1.0.0"
git = "https://github.com/paritytech/polkadot-sdk"
branch = "release-polkadot-v1.1.0"

[dependencies.frame-system]
default-features = false
git = "https://github.com/paritytech/substrate"
branch = "polkadot-v1.0.0"
git = "https://github.com/paritytech/polkadot-sdk"
branch = "release-polkadot-v1.1.0"

[dependencies.sp-core]
default-features = false
git = "https://github.com/paritytech/substrate"
branch = "polkadot-v1.0.0"
git = "https://github.com/paritytech/polkadot-sdk"
branch = "release-polkadot-v1.1.0"

[dev-dependencies]
serde = { version = "1.0.101" }

[dev-dependencies.sp-core]
default-features = false
git = "https://github.com/paritytech/substrate"
branch = "polkadot-v1.0.0"
git = "https://github.com/paritytech/polkadot-sdk"
branch = "release-polkadot-v1.1.0"

[dev-dependencies.sp-io]
default-features = false
git = "https://github.com/paritytech/substrate"
branch = "polkadot-v1.0.0"
git = "https://github.com/paritytech/polkadot-sdk"
branch = "release-polkadot-v1.1.0"

[dependencies.sp-std]
default-features = false
git = "https://github.com/paritytech/substrate"
branch = "polkadot-v1.0.0"
git = "https://github.com/paritytech/polkadot-sdk"
branch = "release-polkadot-v1.1.0"

[dependencies.sp-runtime]
default-features = false
git = "https://github.com/paritytech/substrate"
branch = "polkadot-v1.0.0"
git = "https://github.com/paritytech/polkadot-sdk"
branch = "release-polkadot-v1.1.0"

[dev-dependencies.pallet-balances]
git = "https://github.com/paritytech/substrate"
branch = "polkadot-v1.0.0"
git = "https://github.com/paritytech/polkadot-sdk"
branch = "release-polkadot-v1.1.0"

[features]
default = ["std"]
Expand Down
14 changes: 5 additions & 9 deletions lib/stable-asset/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ mod tests;
pub mod weights;

use crate::traits::StableAsset;
use codec::{Decode, Encode};
use frame_support::{
codec::{Decode, Encode},
dispatch::{DispatchError, DispatchResult},
dispatch::DispatchResult,
ensure,
traits::{
fungibles::{Inspect, Mutate},
Expand All @@ -48,7 +48,7 @@ use scale_info::TypeInfo;
use sp_core::U512;
use sp_runtime::{
traits::{AccountIdConversion, CheckedAdd, CheckedDiv, CheckedMul, CheckedSub, One, Zero},
SaturatedConversion,
DispatchError, SaturatedConversion,
};
use sp_std::prelude::*;

Expand Down Expand Up @@ -301,13 +301,9 @@ pub mod pallet {
use super::{PoolTokenIndex, StableAssetPoolId, StableAssetPoolInfo};
use crate::traits::{StableAsset, ValidateAssetId};
use crate::WeightInfo;
use codec::Codec;
use frame_support::traits::tokens::fungibles;
use frame_support::{
dispatch::{Codec, DispatchResult},
pallet_prelude::*,
traits::EnsureOrigin,
PalletId,
};
use frame_support::{dispatch::DispatchResult, pallet_prelude::*, traits::EnsureOrigin, PalletId};
use frame_system::pallet_prelude::*;
use sp_runtime::{
traits::{CheckedAdd, CheckedDiv, CheckedMul, CheckedSub, One, Zero},
Expand Down
4 changes: 2 additions & 2 deletions lib/stable-asset/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

use crate as stable_asset;
use frame_support::{
dispatch::{DispatchError, DispatchResult},
dispatch::DispatchResult,
parameter_types,
traits::{
fungibles::{Dust, Inspect, Mutate, Unbalanced},
Expand All @@ -30,7 +30,7 @@ use frame_system::RawOrigin;
use sp_core::H256;
use sp_runtime::{
traits::{BlakeTwo256, IdentityLookup},
BuildStorage,
BuildStorage, DispatchError,
};

type Block = frame_system::mocking::MockBlock<Test>;
Expand Down
5 changes: 2 additions & 3 deletions lib/stable-asset/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ use crate::{
mock::*, Error, MintResult, RedeemMultiResult, RedeemProportionResult, RedeemSingleResult, StableAssetPoolInfo,
SwapResult,
};
use frame_support::assert_noop;
use frame_support::assert_ok;
use frame_support::dispatch::DispatchError;
use frame_support::traits::fungibles::{Inspect, Mutate};
use frame_support::{assert_noop, assert_ok};
use sp_runtime::DispatchError;

pub const BALANCE_OFF: u128 = 1;

Expand Down