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
@@ -395,7 +395,7 @@ mod tests {
impl pallet_staking::Trait for Test {
type RewardRemainder = ();
type CurrencyToVote = ();
type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
type Event = ();
type Currency = pallet_balances::Module<Test>;
type Slash = ();