From 56b7865f1f5b4886e32201df71a46de89b2fa0a8 Mon Sep 17 00:00:00 2001
From: NikVolf <nikvolf@gmail.com>
Date: Thu, 10 Nov 2016 20:31:25 +0300
Subject: [PATCH] proper tests layout

---
 test-data/src/block.rs             | 10 ++++++++++
 verification/src/chain_verifier.rs | 22 +++++++++++++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/test-data/src/block.rs b/test-data/src/block.rs
index 87bfc6c4..d49ffbaa 100644
--- a/test-data/src/block.rs
+++ b/test-data/src/block.rs
@@ -325,6 +325,11 @@ impl<F> TransactionInputBuilder<F> where F: Invoke<chain::TransactionInput> {
 		}
 	}
 
+	pub fn signature(mut self, sig: &'static str) -> Self {
+		self.signature = sig.into();
+		self
+	}
+
 	pub fn hash(mut self, hash: H256) -> Self {
 		let mut output = self.output.unwrap_or(chain::OutPoint { hash: hash.clone(), index: 0 });
 		output.hash = hash;
@@ -376,6 +381,11 @@ impl<F> TransactionOutputBuilder<F> where F: Invoke<chain::TransactionOutput> {
 		self
 	}
 
+	pub fn signature(mut self, sig: &'static str) -> Self {
+		self.signature = sig.into();
+		self
+	}
+
 	pub fn build(self) -> F::Result {
 		self.callback.invoke(
 			chain::TransactionOutput {
diff --git a/verification/src/chain_verifier.rs b/verification/src/chain_verifier.rs
index 21da2ce0..afca4c21 100644
--- a/verification/src/chain_verifier.rs
+++ b/verification/src/chain_verifier.rs
@@ -163,7 +163,7 @@ impl Verify for ChainVerifier {
 
 		// verify transactions (except coinbase)
 		for (idx, transaction) in block.transactions().iter().skip(1).enumerate() {
-			try!(self.verify_transaction(block, transaction).map_err(|e| Error::Transaction(idx, e)));
+			try!(self.verify_transaction(block, transaction).map_err(|e| Error::Transaction(idx+1, e)));
 		}
 
 		// todo: pre-process projected block number once verification is parallel!
@@ -254,7 +254,7 @@ mod tests {
 		let verifier = ChainVerifier::new(Arc::new(storage));
 
 		let should_be = Err(Error::Transaction(
-			0,
+			1,
 			TransactionError::Inconclusive("c997a5e56e104102fa209c6a852dd90660a20b2d9c352423edce25857fcd3704".into())
 		));
 		assert_eq!(should_be, verifier.verify(&b170));
@@ -266,14 +266,27 @@ mod tests {
 		let path = RandomTempPath::create_dir();
 		let storage = Storage::new(path.as_path()).unwrap();
 
-		let genesis = test_data::genesis();
+		let genesis = test_data::block_builder()
+			.transaction()
+				.coinbase()
+				.output()
+					.value(50)
+					.signature("410411db93e1dcdb8a016b49840f8c53bc1eb68a382e97b1482ecad7b148a6909a5cb2e0eaddfb84ccf9744464f82e160bfa9b8b64f9d4c03f999b8643f656b412a3ac")
+					.build()
+				.build()
+			.merkled_header().build()
+			.build();
+
 		storage.insert_block(&genesis).unwrap();
 		let genesis_coinbase = genesis.transactions()[0].hash();
 
 		let block = test_data::block_builder()
 			.transaction().coinbase().build()
 			.transaction()
-				.input().hash(genesis_coinbase.clone()).build()
+				.input()
+					.hash(genesis_coinbase.clone())
+					.signature("483045022052ffc1929a2d8bd365c6a2a4e3421711b4b1e1b8781698ca9075807b4227abcb0221009984107ddb9e3813782b095d0d84361ed4c76e5edaf6561d252ae162c2341cfb01")
+					.build()
 				.build()
 			.merkled_header().parent(genesis.hash()).build()
 			.build();
@@ -286,6 +299,5 @@ mod tests {
 		));
 
 		assert_eq!(expected, verifier.verify(&block));
-
 	}
 }