Prepare stuff for Kusama (i.e. disable most things) (#362)

* Prepare stuff for Kusama (i.e. disable most things)

* Fix service (hopefully)

* Remove curated grandpa.

* Block unwanted transactions a cleaner way.

* Add feature for restricting tx types

* Cleanups

* Make blocktime 1/10th of normal

* Fix ordering in construct_runtime

* Restore original timing

* Revert name change
This commit is contained in:
Gavin Wood
2019-08-13 20:36:27 +02:00
committed by GitHub
parent 10fc88f6b1
commit 7bd46ffbcb
9 changed files with 151 additions and 197 deletions
+4 -3
View File
@@ -25,9 +25,9 @@ use std::ops::Deref;
use chain_spec::ChainSpec;
use futures::Future;
use tokio::runtime::Runtime;
use service::Service as BareService;
use service::{Service as BareService, Error as ServiceError};
use std::sync::Arc;
use log::info;
use log::{info, error};
use structopt::StructOpt;
pub use service::{
@@ -127,7 +127,7 @@ fn run_until_exit<T, C, W>(
worker: W,
) -> error::Result<()>
where
T: Deref<Target=BareService<C>> + Future<Item = (), Error = ()> + Send + 'static,
T: Deref<Target=BareService<C>> + Future<Item = (), Error = ServiceError> + Send + 'static,
C: service::Components,
BareService<C>: PolkadotService,
W: Worker,
@@ -143,6 +143,7 @@ fn run_until_exit<T, C, W>(
let _telemetry = service.telemetry();
let work = worker.work(&*service, Arc::new(executor));
let service = service.map_err(|err| error!("Error while running Service: {}", err));
let _ = runtime.block_on(service.select(work));
exit_send.fire();