From 152f132b7b86da8be95dc52c5f964c6863936b76 Mon Sep 17 00:00:00 2001
From: Gav Wood <gavin@ethcore.io>
Date: Sat, 19 Mar 2016 14:10:32 +0100
Subject: [PATCH] Fix JSONRPC test utils.

---
 ethcore/src/json_tests/executive.rs | 20 +++++++++++---------
 ethcore/src/json_tests/state.rs     |  6 +++---
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/ethcore/src/json_tests/executive.rs b/ethcore/src/json_tests/executive.rs
index b08257a92..c0c8b3077 100644
--- a/ethcore/src/json_tests/executive.rs
+++ b/ethcore/src/json_tests/executive.rs
@@ -227,19 +227,21 @@ fn do_json_test_for(vm: &VMType, json_data: &[u8]) -> Vec<String> {
 		let out_of_gas = test.find("callcreates").map(|_calls| {
 		}).is_none();
 
-		let mut substate = Substate::new();
+		let mut substate = Substate::new(false);
 		let mut output = vec![];
 
 		// execute
 		let (res, callcreates) = {
-			let mut ex = TestExt::new(&mut state,
-									  &info,
-									  &engine,
-									  0,
-									  OriginInfo::from(&params),
-									  &mut substate,
-									  OutputPolicy::Return(BytesRef::Flexible(&mut output)),
-									  params.address.clone());
+			let mut ex = TestExt::new(
+				&mut state,
+				&info,
+				&engine,
+				0,
+				OriginInfo::from(&params),
+				&mut substate,
+				OutputPolicy::Return(BytesRef::Flexible(&mut output)),
+				params.address.clone()
+			);
 			let evm = engine.vm_factory().create();
 			let res = evm.exec(params, &mut ex);
 			(res, ex.callcreates)
diff --git a/ethcore/src/json_tests/state.rs b/ethcore/src/json_tests/state.rs
index f6b5751a7..4c001007a 100644
--- a/ethcore/src/json_tests/state.rs
+++ b/ethcore/src/json_tests/state.rs
@@ -69,7 +69,7 @@ pub fn json_chain_test(json_data: &[u8], era: ChainEra) -> Vec<String> {
 				let mut state = state_result.reference_mut();
 				state.populate_from(pre);
 				state.commit();
-				let res = state.apply(&env, engine.deref(), &t);
+				let res = state.apply(&env, engine.deref(), &t, false);
 
 				if fail_unless(state.root() == &post_state_root) {
 					println!("!!! {}: State mismatch (got: {}, expect: {}):", name, state.root(), post_state_root);
@@ -80,9 +80,9 @@ pub fn json_chain_test(json_data: &[u8], era: ChainEra) -> Vec<String> {
 				}
 
 				if let Ok(r) = res {
-					if fail_unless(logs == r.logs) {
+					if fail_unless(logs == r.receipt.logs) {
 						println!("!!! {}: Logs mismatch:", name);
-						println!("Got:\n{:?}", r.logs);
+						println!("Got:\n{:?}", r.receipt.logs);
 						println!("Expect:\n{:?}", logs);
 					}
 				}