More patches.

Author: shaunxw

Cargo.dev.toml

@@ -77,10 +77,29 @@ frame-support-procedural-tools = { git = "https://github.com/paritytech//substra
 frame-support-procedural = { git = "https://github.com/paritytech//substrate", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
 sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
 sp-storage = { git = "https://github.com/paritytech//substrate", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sp-block-builder = { git = "https://github.com/paritytech//substrate", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sp-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sp-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sc-block-builder = { git = "https://github.com/paritytech//substrate", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sc-network = { git = "https://github.com/paritytech//substrate", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sc-network-gossip = { git = "https://github.com/paritytech//substrate", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sc-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sc-consensus-epochs = { git = "https://github.com/paritytech//substrate", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sc-consensus = { git = "https://github.com/paritytech//substrate", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sc-consensus-uncles = { git = "https://github.com/paritytech//substrate", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sc-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sc-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sc-chain-spec = { git = "https://github.com/paritytech//substrate", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
 
 [patch."https://github.com/paritytech/polkadot"]
 xcm = { git = "https://github.com/paritytech//polkadot", rev = "550d84a8fccb491130160bd16a6b6a4657b7090a" }
 xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "550d84a8fccb491130160bd16a6b6a4657b7090a" }
+polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "550d84a8fccb491130160bd16a6b6a4657b7090a" }
 
 [patch."https://github.com/paritytech/cumulus"]
 cumulus-primitives = { git = "https://github.com/paritytech//cumulus", rev = "05bcb211330ee51d097bebaecb45bd7848807f88" }

xtokens/src/lib.rs

@@ -48,8 +48,8 @@ impl Into<MultiLocation> for XCurrencyId {
 	}
 }
 
-pub trait Trait: frame_system::Trait {
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+pub trait Config: frame_system::Config {
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	type Balance: Parameter + Member + AtLeast32BitUnsigned + Default + Copy + MaybeSerializeDeserialize + Into<u128>;
 
@@ -67,13 +67,13 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as XTokens {}
+	trait Store for Module<T: Config> as XTokens {}
 }
 
 decl_event! {
 	pub enum Event<T> where
-		<T as frame_system::Trait>::AccountId,
-		<T as Trait>::Balance,
+		<T as frame_system::Config>::AccountId,
+		<T as Config>::Balance,
 		XCurrencyId = XCurrencyId,
 		NetworkId = NetworkId,
 	{
@@ -86,7 +86,7 @@ decl_event! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		fn deposit_event() = default;
 
 		/// Transfer relay chain tokens to relay chain.
@@ -140,7 +140,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	fn do_transfer_to_relay_chain(dest: &T::AccountId, amount: T::Balance) -> Xcm {
 		Xcm::WithdrawAsset {
 			assets: vec![MultiAsset::ConcreteFungible {