Update to latest Substrate master (#863)

* Begin to update to latest Substrate master

* Fix compilation

* Remove `Balances` from `OnKilledAccount`

* Update cli/src/command.rs

Co-Authored-By: Cecile Tonglet <cecile@parity.io>

* Change gossip name

* Change again

Co-authored-by: Cecile Tonglet <cecile.tonglet@cecton.com>
This commit is contained in:
Bastian Köcher
2020-02-28 12:32:16 +01:00
committed by GitHub
parent 1401eeba3f
commit 8a38b7af3c
15 changed files with 1253 additions and 1213 deletions
+2 -2
View File
@@ -939,7 +939,7 @@ mod tests {
type ModuleToIndex = ();
type AccountData = balances::AccountData<u128>;
type OnNewAccount = ();
type OnReapAccount = ();
type OnKilledAccount = ();
}
parameter_types! {
@@ -1118,7 +1118,7 @@ mod tests {
// stashes are the index.
let session_keys: Vec<_> = authority_keys.iter().enumerate()
.map(|(i, _k)| (i as u64, UintAuthorityId(i as u64)))
.map(|(i, _k)| (i as u64, i as u64, UintAuthorityId(i as u64)))
.collect();
let authorities: Vec<_> = authority_keys.iter().map(|k| ValidatorId::from(k.public())).collect();