Miner tests (#1597)

* Un-ignoring RPC test

* Additional tests for importing transactions

ethcore/src/client/test_client.rs

@@ -262,6 +262,7 @@ impl MiningBlockChainClient for TestBlockChainClient {
 		let mut db_result = get_temp_journal_db();
 		let mut db = db_result.take();
 		self.spec.ensure_db_good(db.as_hashdb_mut());
+
 		let last_hashes = vec![genesis_header.hash()];
 		OpenBlock::new(
 			engine.deref(),

ethcore/src/miner/miner.rs

@@ -615,7 +615,9 @@ impl MinerService for Miner {
 		let imported = {
 			// Be sure to release the lock before we call enable_and_prepare_sealing
 			let mut transaction_queue = self.transaction_queue.lock();
-			let import = self.add_transactions_to_queue(chain, vec![transaction], TransactionOrigin::Local, &mut transaction_queue).pop().unwrap();
+			let import = self.add_transactions_to_queue(
+				chain, vec![transaction], TransactionOrigin::Local, &mut transaction_queue
+			).pop().unwrap();
 
 			match import {
 				Ok(ref res) => {
@@ -834,10 +836,13 @@ impl MinerService for Miner {
 #[cfg(test)]
 mod tests {
 
+	use std::time::Duration;
 	use super::super::MinerService;
-	use super::Miner;
+	use super::*;
 	use util::*;
 	use client::{TestBlockChainClient, EachBlockWith};
+	use client::{TransactionImportResult};
+	use types::transaction::{Transaction, Action};
 	use block::*;
 	use spec::Spec;
 
@@ -872,4 +877,84 @@ mod tests {
 		// solution to original work submitted.
 		assert!(miner.submit_seal(&client, res.unwrap(), vec![]).is_ok());
 	}
+
+	fn miner() -> Miner {
+		Arc::try_unwrap(Miner::new(
+			MinerOptions {
+				new_work_notify: Vec::new(),
+				force_sealing: false,
+				reseal_on_external_tx: false,
+				reseal_on_own_tx: true,
+				reseal_min_period: Duration::from_secs(5),
+				tx_gas_limit: !U256::zero(),
+				tx_queue_size: 1024,
+				pending_set: PendingSet::AlwaysSealing,
+				work_queue_size: 5,
+				enable_resubmission: true,
+			},
+			GasPricer::new_fixed(0u64.into()),
+			Spec::new_test(),
+			None, // accounts provider
+		)).ok().expect("Miner was just created.")
+	}
+
+	#[test]
+	fn should_make_pending_block_when_importing_own_transaction() {
+		// given
+		let client = TestBlockChainClient::default();
+		let miner = miner();
+		let transaction = {
+			let keypair = KeyPair::create().unwrap();
+			Transaction {
+				action: Action::Create,
+				value: U256::zero(),
+				data: "3331600055".from_hex().unwrap(),
+				gas: U256::from(100_000),
+				gas_price: U256::zero(),
+				nonce: U256::zero(),
+			}.sign(keypair.secret())
+		};
+
+		// when
+		let res = miner.import_own_transaction(&client, transaction);
+
+		// then
+		assert_eq!(res.unwrap(), TransactionImportResult::Current);
+		assert_eq!(miner.all_transactions().len(), 1);
+		assert_eq!(miner.pending_transactions().len(), 1);
+		assert_eq!(miner.pending_transactions_hashes().len(), 1);
+		assert_eq!(miner.pending_receipts().len(), 1);
+		// This method will let us know if pending block was created (before calling that method)
+		assert_eq!(miner.enable_and_prepare_sealing(&client), false);
+	}
+
+	#[test]
+	fn should_import_external_transaction() {
+		// given
+		let client = TestBlockChainClient::default();
+		let miner = miner();
+		let transaction = {
+			let keypair = KeyPair::create().unwrap();
+			Transaction {
+				action: Action::Create,
+				value: U256::zero(),
+				data: "3331600055".from_hex().unwrap(),
+				gas: U256::from(100_000),
+				gas_price: U256::zero(),
+				nonce: U256::zero(),
+			}.sign(keypair.secret())
+		};
+
+		// when
+		let res = miner.import_external_transactions(&client, vec![transaction]).pop().unwrap();
+
+		// then
+		assert_eq!(res.unwrap(), TransactionImportResult::Current);
+		assert_eq!(miner.all_transactions().len(), 1);
+		assert_eq!(miner.pending_transactions_hashes().len(), 0);
+		assert_eq!(miner.pending_transactions().len(), 0);
+		assert_eq!(miner.pending_receipts().len(), 0);
+		// This method will let us know if pending block was created (before calling that method)
+		assert_eq!(miner.enable_and_prepare_sealing(&client), true);
+	}
 }

ethcore/src/miner/price_info.rs

@@ -77,7 +77,6 @@ impl PriceInfo {
 	}
 }
 
-//#[ignore]
 #[test]
 fn should_get_price_info() {
 	use std::sync::Arc;
@@ -88,9 +87,10 @@ fn should_get_price_info() {
 	init_log();
 	let done = Arc::new((Mutex::new(PriceInfo { ethusd: 0f32 }), Condvar::new()));
 	let rdone = done.clone();
+
 	PriceInfo::get(move |price| { let mut p = rdone.0.lock(); *p = price; rdone.1.notify_one(); }).unwrap();
 	let mut p = done.0.lock();
 	let t = done.1.wait_for(&mut p, Duration::from_millis(10000));
 	assert!(!t.timed_out());
 	assert!(p.ethusd != 0f32);
-}
+}