Update to latest Substrate (#340)

* Update Substrate

* Update Substrate again

* Integrate weight/fee stuff.

* Add new files.
This commit is contained in:
Bastian Köcher
2019-07-26 12:19:41 +02:00
committed by GitHub
parent 86e5b3d0bb
commit 4d5db52ca0
18 changed files with 971 additions and 854 deletions
+15 -15
View File
@@ -571,7 +571,7 @@ impl SharedTable {
#[cfg(test)]
mod tests {
use super::*;
use substrate_keyring::AuthorityKeyring;
use substrate_keyring::Ed25519Keyring;
use primitives::crypto::UncheckedInto;
use polkadot_primitives::parachain::{BlockData, ConsolidatedIngress};
use futures::future;
@@ -604,10 +604,10 @@ mod tests {
let para_id = ParaId::from(1);
let parent_hash = Default::default();
let local_key = Arc::new(AuthorityKeyring::Alice.pair());
let local_key = Arc::new(Ed25519Keyring::Alice.pair());
let local_id = local_key.public();
let validity_other_key = AuthorityKeyring::Bob.pair();
let validity_other_key = Ed25519Keyring::Bob.pair();
let validity_other = validity_other_key.public();
let validity_other_index = 1;
@@ -658,10 +658,10 @@ mod tests {
let para_id = ParaId::from(1);
let parent_hash = Default::default();
let local_key = Arc::new(AuthorityKeyring::Alice.pair());
let local_key = Arc::new(Ed25519Keyring::Alice.pair());
let local_id = local_key.public();
let validity_other_key = AuthorityKeyring::Bob.pair();
let validity_other_key = Ed25519Keyring::Bob.pair();
let validity_other = validity_other_key.public();
let validity_other_index = 1;
@@ -793,10 +793,10 @@ mod tests {
let para_id = ParaId::from(1);
let parent_hash = Default::default();
let local_key = Arc::new(AuthorityKeyring::Alice.pair());
let local_key = Arc::new(Ed25519Keyring::Alice.pair());
let local_id = local_key.public();
let validity_other_key = AuthorityKeyring::Bob.pair();
let validity_other_key = Ed25519Keyring::Bob.pair();
let validity_other = validity_other_key.public();
let validity_other_index = 1;
@@ -859,10 +859,10 @@ mod tests {
let extrinsic = Extrinsic { outgoing_messages: Vec::new() };
let parent_hash = Default::default();
let local_key = Arc::new(AuthorityKeyring::Alice.pair());
let local_key = Arc::new(Ed25519Keyring::Alice.pair());
let local_id = local_key.public();
let validity_other_key = AuthorityKeyring::Bob.pair();
let validity_other_key = Ed25519Keyring::Bob.pair();
let validity_other = validity_other_key.public();
groups.insert(para_id, GroupInfo {
@@ -911,18 +911,18 @@ mod tests {
fn index_mapping_from_authorities() {
let authorities_set: &[&[_]] = &[
&[],
&[AuthorityKeyring::Alice.pair().public()],
&[AuthorityKeyring::Alice.pair().public(), AuthorityKeyring::Bob.pair().public()],
&[AuthorityKeyring::Bob.pair().public(), AuthorityKeyring::Alice.pair().public()],
&[AuthorityKeyring::Alice.pair().public(), AuthorityKeyring::Bob.pair().public(), AuthorityKeyring::Charlie.pair().public()],
&[AuthorityKeyring::Charlie.pair().public(), AuthorityKeyring::Bob.pair().public(), AuthorityKeyring::Alice.pair().public()],
&[Ed25519Keyring::Alice.pair().public()],
&[Ed25519Keyring::Alice.pair().public(), Ed25519Keyring::Bob.pair().public()],
&[Ed25519Keyring::Bob.pair().public(), Ed25519Keyring::Alice.pair().public()],
&[Ed25519Keyring::Alice.pair().public(), Ed25519Keyring::Bob.pair().public(), Ed25519Keyring::Charlie.pair().public()],
&[Ed25519Keyring::Charlie.pair().public(), Ed25519Keyring::Bob.pair().public(), Ed25519Keyring::Alice.pair().public()],
];
for authorities in authorities_set {
let shared_table = SharedTable::new(
authorities,
HashMap::new(),
Arc::new(AuthorityKeyring::Alice.pair()),
Arc::new(Ed25519Keyring::Alice.pair()),
Default::default(),
ExtrinsicStore::new_in_memory(),
None,