Merge branch 'stateTests' into NewStateTests

Conflicts:
	test/TestHelper.cpp
	test/vm.cpp

1 files changed, 1 insertions, 6 deletions

diff --git a/stateOriginal.cpp b/stateOriginal.cpp
index e6b3ab95..8344894f 100644
--- a/stateOriginal.cpp
+++ b/stateOriginal.cpp
@@ -65,12 +65,7 @@ int stateTest()
 	// Inject a transaction to transfer funds from miner to me.
 	bytes tx;
 	{
-		Transaction t;
-		t.nonce = s.transactionsFrom(myMiner.address());
-		t.value = 1000;			// 1e3 wei.
-		t.type = eth::Transaction::MessageCall;
-		t.receiveAddress = me.address();
-		t.sign(myMiner.secret());
+		Transaction t(1000, 0, 0, me.address(), bytes(), s.transactionsFrom(myMiner.address()), myMiner.secret());
 		assert(t.sender() == myMiner.address());
 		tx = t.rlp();
 	}