Aura finalize (paritytech#695)

* Update substrate * Degrade structopt to 0.2.15 * Add finalize set * Add SessionTotalMissedBlocksCount in xsession * Utilize SessionTotalMissedBlocksCount in xgrandpa * Update substrate * Add warn log when failing to finalize * Only run Grandpa Observer model
chainx-org · Jun 17, 2019 · 18e7e7e · 18e7e7e
1 parent da9b6b0
commit 18e7e7e
Show file tree

Hide file tree

Showing 8 changed files with 650 additions and 611 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/src/lib.rs b/cli/src/lib.rs
@@ -207,7 +207,7 @@ fn init_logger_log4rs(spec: &str, params: ChainXParams) -> Result<(), String> {
     };
 
     if params.log_size == 0 {
-        return Err("the `--log-size` can't be 0".to_string())
+        return Err("the `--log-size` can't be 0".to_string());
     }
 
     let trigger = trigger::size::SizeTrigger::new(1024 * 1024 * params.log_size);

diff --git a/cli/src/service.rs b/cli/src/service.rs
@@ -181,6 +181,13 @@ construct_service_factory! {
                     name: Some(service.config.name.clone())
                 };
 
+                executor.spawn(grandpa::run_grandpa_observer(
+                    config,
+                    link_half,
+                    service.network(),
+                    service.on_exit(),
+                )?);
+/*
                 match config.local_key {
                     None => {
                         executor.spawn(grandpa::run_grandpa_observer(
@@ -207,6 +214,7 @@ construct_service_factory! {
                         executor.spawn(grandpa::run_grandpa_voter(grandpa_config)?);
                     },
                 }
+*/
 
                 Ok(service)
             }

diff --git a/runtime/wasm/Cargo.lock b/runtime/wasm/Cargo.lock
diff --git a/xrml/xbridge/sdot/src/mock.rs b/xrml/xbridge/sdot/src/mock.rs
@@ -2,9 +2,9 @@
 
 #![cfg(test)]
 
-use primitives::BuildStorage;
 use primitives::testing::{Digest, DigestItem, Header};
 use primitives::traits::{BlakeTwo256, IdentityLookup};
+use primitives::BuildStorage;
 use substrate_primitives::{Blake2Hasher, H256};
 use support::impl_outer_origin;