Skip to content

feat: add Acala compatible workspace #309

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

Closed
mattsse wants to merge 3 commits into from
Closed

feat: add Acala compatible workspace #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
930178a
feat: strip workspace
mattsse Aug 31, 2021
5fc7cd0
fix: drop tryfrom bound
mattsse Aug 31, 2021
a7255f3
Revert "feat: strip workspace"
mattsse Aug 31, 2021
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
1 change: 0 additions & 1 deletion pallets/asset-index/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ use frame_support::{
assert_ok,
dispatch::UnfilteredDispatchable,
sp_runtime::{traits::AccountIdConversion, FixedPointNumber},
sp_std::convert::TryFrom,
traits::{Currency as _, EnsureOrigin, Get},
};
use frame_system::RawOrigin;
Expand Down
4 changes: 2 additions & 2 deletions pallets/asset-index/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ pub mod pallet {
ArithmeticError, FixedPointNumber,
},
sp_std::{
convert::{TryFrom, TryInto},
convert::TryInto,
prelude::*,
result::Result,
},
Expand Down Expand Up @@ -99,7 +99,7 @@ pub mod pallet {
/// Type that handles cross chain transfers
type RemoteAssetManager: RemoteAssetManager<Self::AccountId, Self::AssetId, Self::Balance>;
/// Type used to identify assets
type AssetId: Parameter + Member + Copy + MaybeSerializeDeserialize + TryFrom<u8>;
type AssetId: Parameter + Member + Copy + MaybeSerializeDeserialize ;

/// The native asset id
#[pallet::constant]
Expand Down
3 changes: 1 addition & 2 deletions pallets/price-feed/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ pub mod pallet {
use frame_support::{
pallet_prelude::*,
sp_runtime::{traits::CheckedDiv, FixedPointNumber, FixedPointOperand},
sp_std::convert::TryFrom,
traits::{Get, Time},
};
use frame_system::pallet_prelude::*;
Expand Down Expand Up @@ -82,7 +81,7 @@ pub mod pallet {
type SelfAssetId: Get<Self::AssetId>;

/// Type used to identify the assets.
type AssetId: Parameter + Member + MaybeSerializeDeserialize + TryFrom<u8>;
type AssetId: Parameter + Member + MaybeSerializeDeserialize ;

/// Type to keep track of timestamped values
type Time: Time;
Expand Down
4 changes: 2 additions & 2 deletions pallets/remote-asset-manager/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pub mod pallet {
dispatch::DispatchResultWithPostInfo,
pallet_prelude::*,
sp_runtime::traits::{AccountIdConversion, AtLeast32BitUnsigned, Convert, Saturating, StaticLookup, Zero},
sp_std::{self, convert::TryFrom, mem, prelude::*},
sp_std::{self, mem, prelude::*},
traits::Get,
transactional,
};
Expand Down Expand Up @@ -80,7 +80,7 @@ pub mod pallet {
+ Into<u128>;

/// Asset Id that is used to identify different kinds of assets.
type AssetId: Parameter + Member + Copy + MaybeSerializeDeserialize + TryFrom<u8>;
type AssetId: Parameter + Member + Copy + MaybeSerializeDeserialize ;

/// Convert a `T::AssetId` to its relative `MultiLocation` identifier.
type AssetIdConvert: Convert<Self::AssetId, Option<MultiLocation>>;
Expand Down
2 changes: 1 addition & 1 deletion pallets/saft-registry/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

use frame_benchmarking::benchmarks;
use frame_support::{
assert_ok, dispatch::UnfilteredDispatchable, sp_runtime::traits::Zero, sp_std::convert::TryFrom,
assert_ok, dispatch::UnfilteredDispatchable, sp_runtime::traits::Zero
traits::EnsureOrigin,
};
use xcm::v0::Junction;
Expand Down
4 changes: 2 additions & 2 deletions pallets/saft-registry/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pub mod pallet {
traits::{AtLeast32BitUnsigned, CheckedAdd, One, Saturating, Zero},
ArithmeticError,
},
sp_std::{self, convert::TryFrom, prelude::*, result::Result},
sp_std::{self, prelude::*, result::Result},
transactional,
};
use frame_system::pallet_prelude::*;
Expand All @@ -41,7 +41,7 @@ pub mod pallet {
type AdminOrigin: EnsureOrigin<Self::Origin>;
type AssetRecorder: AssetRecorder<Self::AccountId, Self::AssetId, Self::Balance>;
type Balance: Parameter + Member + AtLeast32BitUnsigned + Default + Copy;
type AssetId: Parameter + Member + Copy + TryFrom<u8>;
type AssetId: Parameter + Member + Copy ;
type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
/// The weight for this pallet's extrinsics.
type WeightInfo: WeightInfo;
Expand Down