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
+2 -2
View File
@@ -30,7 +30,7 @@ use primitives::v1::{
};
use runtime_common::{
SlowAdjustingFeeUpdate,
impls::{CurrencyToVoteHandler, ToAuthor},
impls::ToAuthor,
BlockHashCount, MaximumBlockWeight, AvailableBlockRatio, MaximumBlockLength,
BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, MaximumExtrinsicWeight,
};
@@ -560,7 +560,7 @@ impl pallet_im_online::Trait for Runtime {
impl pallet_staking::Trait for Runtime {
type Currency = Balances;
type UnixTime = Timestamp;
type CurrencyToVote = CurrencyToVoteHandler<Self>;
type CurrencyToVote = frame_support::traits::U128CurrencyToVote;
type RewardRemainder = ();
type Event = Event;
type Slash = ();