Merge pull request #49 from wangjj9219/polkadot-v1.1.0

update polkadot v1.1.0
nutsfinance · Oct 12, 2023 · 5b6bdb1 · 5b6bdb1
2 parents 4a4af72 + d6f16cd
commit 5b6bdb1
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 30 deletions.
diff --git a/lib/stable-asset/Cargo.toml b/lib/stable-asset/Cargo.toml
@@ -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"]

diff --git a/lib/stable-asset/src/lib.rs b/lib/stable-asset/src/lib.rs
@@ -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},
@@ -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::*;
 
@@ -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},

diff --git a/lib/stable-asset/src/mock.rs b/lib/stable-asset/src/mock.rs
@@ -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},
@@ -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>;

diff --git a/lib/stable-asset/src/tests.rs b/lib/stable-asset/src/tests.rs
@@ -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;