Merge branch 'develop' into p2p

Conflicts:
	libp2p/Host.cpp
	libwebthree/WebThree.h

1 files changed, 9 insertions, 8 deletions

diff --git a/vm.cpp b/vm.cpp
index 6ae95f25..7afd9de1 100644
--- a/vm.cpp
+++ b/vm.cpp
@@ -232,13 +232,13 @@ void FakeExtVM::importCallCreates(mArray& _callcreates)
 	for (mValue& v: _callcreates)
 	{
 		auto tx = v.get_obj();
-		BOOST_REQUIRE(tx.count("data") > 0);
-		BOOST_REQUIRE(tx.count("value") > 0);
-		BOOST_REQUIRE(tx.count("destination") > 0);
-		BOOST_REQUIRE(tx.count("gasLimit") > 0);
+		assert(tx.count("data") > 0);
+		assert(tx.count("value") > 0);
+		assert(tx.count("destination") > 0);
+		assert(tx.count("gasLimit") > 0);
 		Transaction t = tx["destination"].get_str().empty() ?
-			Transaction(toInt(tx["value"]), 0, toInt(tx["gasLimit"]), data.toBytes()) :
-			Transaction(toInt(tx["value"]), 0, toInt(tx["gasLimit"]), Address(tx["destination"].get_str()), data.toBytes());
+			Transaction(toInt(tx["value"]), 0, toInt(tx["gasLimit"]), fromHex(tx["data"].get_str())) :
+			Transaction(toInt(tx["value"]), 0, toInt(tx["gasLimit"]), Address(tx["destination"].get_str()), fromHex(tx["data"].get_str()));
 		callcreates.push_back(t);
 	}
 }
@@ -345,7 +345,7 @@ void doVMTests(json_spirit::mValue& v, bool _fillin)
 			output = vm->go(fev, fev.simpleTrace()).toBytes();
 			gas = vm->gas();
 		}
-		catch (VMException const& _e)
+		catch (VMException const&)
 		{
 			cnote << "Safe VM Exception";
 			vmExceptionOccured = true;
@@ -448,7 +448,8 @@ void doVMTests(json_spirit::mValue& v, bool _fillin)
 				}
 
 				checkAddresses<std::map<Address, std::tuple<u256, u256, std::map<u256, u256>, bytes> > >(test.addresses, fev.addresses);
-				BOOST_CHECK(test.callcreates == fev.callcreates);
+
+				checkCallCreates(fev.callcreates, test.callcreates);
 
 				checkLog(fev.sub.logs, test.sub.logs);
 			}