Revert "Update to latest substrate (#504)" (#505)

This reverts commit 8fb635b5e5.

polkadot/runtime/src/crowdfund.rs

@@ -207,7 +207,7 @@ decl_module! {
 			let imb = T::Currency::withdraw(
 				&owner,
 				deposit,
-				WithdrawReason::Transfer.into(),
+				WithdrawReason::Transfer,
 				ExistenceRequirement::AllowDeath,
 			)?;
 
@@ -378,7 +378,7 @@ decl_module! {
 			let _ = T::Currency::resolve_into_existing(&who, T::Currency::withdraw(
 				&Self::fund_account_id(index),
 				balance,
-				WithdrawReason::Transfer.into(),
+				WithdrawReason::Transfer,
 				ExistenceRequirement::AllowDeath
 			)?);
 
@@ -407,14 +407,14 @@ decl_module! {
 			let _ = T::Currency::resolve_into_existing(&fund.owner, T::Currency::withdraw(
 				&account,
 				fund.deposit,
-				WithdrawReason::Transfer.into(),
+				WithdrawReason::Transfer,
 				ExistenceRequirement::AllowDeath
 			)?);
 
 			T::OrphanedFunds::on_unbalanced(T::Currency::withdraw(
 				&account,
 				fund.raised,
-				WithdrawReason::Transfer.into(),
+				WithdrawReason::Transfer,
 				ExistenceRequirement::AllowDeath
 			)?);
 

polkadot/runtime/src/lib.rs

@@ -58,7 +58,6 @@ use srml_support::{
 };
 use im_online::sr25519::AuthorityId as ImOnlineId;
 use system::offchain::TransactionSubmitter;
-use srml_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
 
 #[cfg(feature = "std")]
 pub use staking::StakerStatus;
@@ -541,7 +540,7 @@ impl nicks::Trait for Runtime {
 	type Currency = Balances;
 	type ReservationFee = ReservationFee;
 	type Slashed = Treasury;
-	type ForceOrigin = collective::EnsureMember<AccountId, CouncilCollective>;
+	type KillOrigin = collective::EnsureMember<AccountId, CouncilCollective>;
 	type MinLength = MinLength;
 	type MaxLength = MaxLength;
 }
@@ -743,14 +742,4 @@ impl_runtime_apis! {
 			System::account_nonce(account)
 		}
 	}
-
-	impl srml_transaction_payment_rpc_runtime_api::TransactionPaymentApi<
-		Block,
-		Balance,
-		UncheckedExtrinsic,
-	> for Runtime {
-		fn query_info(uxt: UncheckedExtrinsic, len: u32) -> RuntimeDispatchInfo<Balance> {
-			TransactionPayment::query_info(uxt, len)
-		}
-	}
 }

polkadot/runtime/src/parachains.rs

@@ -94,7 +94,7 @@ impl<AccountId, T: Currency<AccountId>> ParachainCurrency<AccountId> for T where
 		let _ = T::withdraw(
 			&para_account,
 			amount.into(),
-			WithdrawReason::Fee.into(),
+			WithdrawReason::Fee,
 			ExistenceRequirement::KeepAlive,
 		)?;
 

polkadot/runtime/src/slots.rs

@@ -506,7 +506,7 @@ impl<T: Trait> Module<T> {
 					if T::Currency::withdraw(
 						&bidder.who,
 						amount,
-						WithdrawReason::Fee.into(),
+						WithdrawReason::Fee,
 						ExistenceRequirement::AllowDeath
 					).is_err() {
 						continue;
@@ -543,7 +543,7 @@ impl<T: Trait> Module<T> {
 						if T::Currency::withdraw(
 							&para_id.into_account(),
 							additional,
-							WithdrawReason::Fee.into(),
+							WithdrawReason::Fee,
 							ExistenceRequirement::AllowDeath
 						).is_err() {
 							continue;