Fixed a few authoring issues

Author: arkpar

Cargo.lock

@@ -335,15 +335,15 @@ mod tests {
 	fn native_big_block_import_succeeds() {
 		let mut t = new_test_ext();
 
-		let r = Executor::new().call(&mut t, COMPACT_CODE, "execute_block", &block1big().0, true).0;
+		let r = Executor::with_heap_pages(8).call(&mut t, COMPACT_CODE, "execute_block", &block1big().0, true).0;
 		assert!(r.is_ok());
 	}
 
 	#[test]
 	fn native_big_block_import_fails_on_fallback() {
 		let mut t = new_test_ext();
 
-		let r = Executor::new().call(&mut t, COMPACT_CODE, "execute_block", &block1big().0, false).0;
+		let r = Executor::with_heap_pages(8).call(&mut t, COMPACT_CODE, "execute_block", &block1big().0, false).0;
 		assert!(!r.is_ok());
 	}
 

demo/executor/src/lib.rs

@@ -198,7 +198,7 @@ impl<P: LocalPolkadotApi + Send + Sync + 'static> Future for MessageProcessTask<
 					return Ok(async);
 				},
 				Ok(Async::Ready(None)) => return Ok(Async::Ready(())),
-				Ok(Async::NotReady) => (),
+				Ok(Async::NotReady) => return Ok(Async::NotReady),
 				Err(e) => debug!(target: "p_net", "Error getting consensus message: {:?}", e),
 			}
 		}

demo/runtime/wasm/target/wasm32-unknown-unknown/release/demo_runtime.compact.wasm

@@ -19,7 +19,6 @@ polkadot-executor = { path = "../executor" }
 polkadot-api = { path = "../api" }
 polkadot-transaction-pool = { path = "../transaction-pool" }
 polkadot-network = { path = "../network" }
-substrate-keystore = { path = "../../substrate/keystore" }
 substrate-runtime-io = { path = "../../substrate/runtime-io" }
 substrate-primitives = { path = "../../substrate/primitives" }
 substrate-network = { path = "../../substrate/network" }

demo/runtime/wasm/target/wasm32-unknown-unknown/release/demo_runtime.wasm

@@ -26,7 +26,6 @@ extern crate polkadot_api;
 extern crate polkadot_consensus as consensus;
 extern crate polkadot_transaction_pool as transaction_pool;
 extern crate polkadot_network;
-extern crate substrate_keystore as keystore;
 extern crate substrate_primitives as primitives;
 extern crate substrate_network as network;
 extern crate substrate_codec as codec;
@@ -46,7 +45,6 @@ use std::collections::HashMap;
 
 use codec::Slicable;
 use transaction_pool::TransactionPool;
-use keystore::Store as Keystore;
 use polkadot_api::{PolkadotApi, light::RemotePolkadotApiWrapper};
 use polkadot_primitives::{Block, BlockId, Hash};
 use polkadot_runtime::GenesisConfig;
@@ -168,14 +166,12 @@ pub fn new_light(config: Configuration<GenesisConfig>, executor: TaskExecutor)
 pub fn new_full(config: Configuration<GenesisConfig>, executor: TaskExecutor)
 	-> Result<Service<FullComponents<Factory>>, Error>
 {
-	let keystore_path = config.keystore_path.clone();
 	let is_validator = (config.roles & Role::AUTHORITY) == Role::AUTHORITY;
 	let service = service::Service::<FullComponents<Factory>>::new(config, executor.clone())?;
+	// Spin consensus service if configured
 	let consensus = if is_validator {
-		// Spin consensus service if configured
-		let keystore = Keystore::open(keystore_path.into())?;
 		// Load the first available key
-		let key = keystore.load(&keystore.contents()?[0], "")?;
+		let key = service.keystore().load(&service.keystore().contents()?[0], "")?;
 		info!("Using authority key {}", key.public());
 
 		let client = service.client();