Expose BlockOrigin and clean up the API.

substrate/client/src/client.rs

@@ -454,6 +454,7 @@ mod tests {
 	use keyring::Keyring;
 	use primitives::block::Extrinsic as PrimitiveExtrinsic;
 	use test_client::{self, TestClient};
+	use test_client::client::BlockOrigin;
 	use test_client::runtime as test_runtime;
 	use test_client::runtime::{UncheckedTransaction, Transaction};
 
@@ -485,7 +486,7 @@ mod tests {
 
 		let builder = client.new_block().unwrap();
 
-		client.import_own_block(builder).unwrap();
+		client.justify_and_import(BlockOrigin::Own, builder.bake().unwrap()).unwrap();
 
 		assert_eq!(client.info().unwrap().chain.best_number, 1);
 		assert_eq!(client.using_environment(|| test_runtime::system::latest_block_hash()).unwrap(), client.block_hash(1).unwrap().unwrap());
@@ -514,7 +515,7 @@ mod tests {
 			nonce: 0
 		}.signed()).unwrap();
 
-		client.import_own_block(builder).unwrap();
+		client.justify_and_import(BlockOrigin::Own, builder.bake().unwrap()).unwrap();
 
 		assert_eq!(client.info().unwrap().chain.best_number, 1);
 		assert!(client.state_at(&BlockId::Number(1)).unwrap() != client.state_at(&BlockId::Number(0)).unwrap());

substrate/client/src/genesis.rs

@@ -42,15 +42,16 @@ mod tests {
 	use codec::{Slicable, Joiner};
 	use runtime_support::Hashable;
 	use keyring::Keyring;
-	use test_runtime::genesismap::{GenesisConfig, additional_storage_with_genesis};
 	use executor::WasmExecutor;
 	use state_machine::{execute, OverlayedChanges};
 	use state_machine::backend::InMemory;
-	use test_runtime::{self, Hash, Block, BlockNumber, Header, Digest, Transaction,
+	use test_client;
+	use test_client::runtime::genesismap::{GenesisConfig, additional_storage_with_genesis};
+	use test_client::runtime::{Hash, Block, BlockNumber, Header, Digest, Transaction,
 		UncheckedTransaction};
 	use ed25519::{Public, Pair};
 
-	native_executor_instance!(Executor, test_runtime::api::dispatch, include_bytes!("../../test-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.compact.wasm"));
+	native_executor_instance!(Executor, test_client::runtime::api::dispatch, include_bytes!("../../test-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.compact.wasm"));
 
 	fn construct_block(backend: &InMemory, number: BlockNumber, parent_hash: Hash, state_root: Hash, txs: Vec<Transaction>) -> (Vec<u8>, Hash) {
 		use triehash::ordered_trie_root;

substrate/network/src/test/mod.rs

@@ -163,7 +163,7 @@ impl Peer {
 			edit_block(&mut builder);
 			let block = builder.bake().unwrap();
 			trace!("Generating {}, (#{})", primitives::block::HeaderHash::from(block.header.blake2_256()), block.header.number);
-			self.client.import_file_block(block).unwrap();
+			self.client.justify_and_import(client::BlockOrigin::File, block).unwrap();
 		}
 	}
 

substrate/rpc/src/chain/tests.rs

@@ -16,6 +16,7 @@
 
 use super::*;
 use jsonrpc_macros::pubsub;
+use client::BlockOrigin;
 use test_client::{self, TestClient};
 
 #[test]
@@ -63,7 +64,7 @@ fn should_notify_about_latest_block() {
 		assert_eq!(core.run(id), Ok(Ok(SubscriptionId::Number(0))));
 
 		let builder = api.client.new_block().unwrap();
-		api.client.import_own_block(builder).unwrap();
+		api.client.justify_and_import(BlockOrigin::Own, builder.bake().unwrap()).unwrap();
 	}
 
 	// assert notification send to transport

substrate/test-client/src/client_ext.rs

@@ -18,7 +18,6 @@
 
 use codec::Slicable;
 use client::{self, Client};
-use client::block_builder::BlockBuilder;
 use keyring::Keyring;
 use runtime_support::Hashable;
 use runtime::genesismap::{GenesisConfig, additional_storage_with_genesis};
@@ -31,11 +30,8 @@ pub trait TestClient {
 	/// Crates new client instance for tests.
 	fn new_for_tests() -> Self;
 
-	/// Bakes the block from the builder, fake-justifies it and imports to the chain.
-	fn import_own_block(&self, builder: BlockBuilder<Backend, Executor>) -> client::error::Result<()>;
-
-	/// Imports pre-baked block with `BlockOrigin::File`
-	fn import_file_block(&self, block: block::Block) -> client::error::Result<()>;
+	/// Justify and import block to the chain.
+	fn justify_and_import(&self, origin: client::BlockOrigin, block: block::Block) -> client::error::Result<()>;
 
 	/// Returns hash of the genesis block.
 	fn genesis_hash(&self) -> block::HeaderHash;
@@ -46,20 +42,10 @@ impl TestClient for Client<Backend, Executor> {
 		client::new_in_mem(NativeExecutor::new(), prepare_genesis).unwrap()
 	}
 
-	fn import_own_block(&self, builder: BlockBuilder<Backend, Executor>) -> client::error::Result<()> {
-		let block = builder.bake()?;
-
-		let justification = fake_justify(&block.header);
-		let justified = self.check_justification(block.header, justification)?;
-		self.import_block(client::BlockOrigin::Own, justified, Some(block.transactions))?;
-
-		Ok(())
-	}
-
-	fn import_file_block(&self, block: block::Block) -> client::error::Result<()> {
+	fn justify_and_import(&self, origin: client::BlockOrigin, block: block::Block) -> client::error::Result<()> {
 		let justification = fake_justify(&block.header);
 		let justified = self.check_justification(block.header, justification)?;
-		self.import_block(client::BlockOrigin::File, justified, Some(block.transactions))?;
+		self.import_block(origin, justified, Some(block.transactions))?;
 
 		Ok(())
 	}

substrate/test-client/src/lib.rs

@@ -19,14 +19,14 @@
 #![warn(missing_docs)]
 
 extern crate substrate_bft as bft;
-extern crate substrate_client as client;
 extern crate substrate_codec as codec;
 extern crate substrate_keyring as keyring;
 extern crate substrate_primitives as primitives;
 extern crate substrate_runtime_support as runtime_support;
 #[macro_use] extern crate substrate_executor as executor;
 
 pub extern crate substrate_test_runtime as runtime;
+pub extern crate substrate_client as client;
 
 mod client_ext;