Companion for substrate/pull/6896 (#1610)

* make polkadot work again,

* Fix build

* "Update Substrate"

Co-authored-by: parity-processbot <>
This commit is contained in:
Kian Paimani
2020-10-08 17:10:21 +02:00
committed by GitHub
parent c2941a2789
commit c5d041041f
9 changed files with 157 additions and 182 deletions
+7 -1
View File
@@ -45,7 +45,7 @@ pub use pallet_timestamp::Call as TimestampCall;
pub use pallet_balances::Call as BalancesCall;
/// Implementations of some helper traits passed into runtime modules as associated types.
pub use impls::{CurrencyToVoteHandler, ToAuthor};
pub use impls::ToAuthor;
pub type NegativeImbalance<T> = <pallet_balances::Module<T> as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
@@ -89,6 +89,12 @@ pub type SlowAdjustingFeeUpdate<R> = TargetedFeeAdjustment<
MinimumMultiplier
>;
/// The type used for currency conversion.
///
/// This must only be used as long as the balance type is u128.
pub type CurrencyToVote = frame_support::traits::U128CurrencyToVote;
static_assertions::assert_eq_size!(primitives::v1::Balance, u128);
/// A placeholder since there is currently no provided session key handler for parachain validator
/// keys.
pub struct ParachainSessionKeyPlaceholder<T>(sp_std::marker::PhantomData<T>);