aboutsummaryrefslogtreecommitdiffstats
path: root/vm.cpp
diff options
context:
space:
mode:
authorChristoph Jentzsch <jentzsch.software@gmail.com>2014-11-06 01:30:38 +0800
committerChristoph Jentzsch <jentzsch.software@gmail.com>2014-11-06 01:30:38 +0800
commit6b6bb65eb8bdca8754d334510fc6938ff4b1ef5c (patch)
treed2775998cd0051a5e53a4f7528be3487667a77c6 /vm.cpp
parent26f4637205d91ba6bb3db4b70b51d9e8b2b41b8e (diff)
downloaddexon-solidity-6b6bb65eb8bdca8754d334510fc6938ff4b1ef5c.tar
dexon-solidity-6b6bb65eb8bdca8754d334510fc6938ff4b1ef5c.tar.gz
dexon-solidity-6b6bb65eb8bdca8754d334510fc6938ff4b1ef5c.tar.bz2
dexon-solidity-6b6bb65eb8bdca8754d334510fc6938ff4b1ef5c.tar.lz
dexon-solidity-6b6bb65eb8bdca8754d334510fc6938ff4b1ef5c.tar.xz
dexon-solidity-6b6bb65eb8bdca8754d334510fc6938ff4b1ef5c.tar.zst
dexon-solidity-6b6bb65eb8bdca8754d334510fc6938ff4b1ef5c.zip
Update transactions, style fix
Diffstat (limited to 'vm.cpp')
-rw-r--r--vm.cpp14
1 files changed, 2 insertions, 12 deletions
diff --git a/vm.cpp b/vm.cpp
index b9df6af2..0457d7bb 100644
--- a/vm.cpp
+++ b/vm.cpp
@@ -232,8 +232,8 @@ void FakeExtVM::importCallCreates(mArray& _callcreates)
BOOST_REQUIRE(tx.count("destination") > 0);
BOOST_REQUIRE(tx.count("gasLimit") > 0);
Transaction t = tx["destination"].get_str().empty() ?
- Transaction(toInt(tx["value"]), 0, toInt(tx["gasLimit"]), data) :
- Transaction(toInt(tx["value"]), 0, toInt(tx["gasLimit"]), Address(tx["destination"].get_str()), data);
+ 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());
callcreates.push_back(t);
}
}
@@ -423,16 +423,6 @@ BOOST_AUTO_TEST_CASE(vmPushDupSwapTest)
dev::test::executeTests("vmPushDupSwapTest", "/VMTests", dev::test::doVMTests);
}
-BOOST_AUTO_TEST_CASE(vmNamecoin)
-{
- dev::test::executeTests("vmNamecoin", "/VMTests", dev::test::doVMTests);
-}
-
-//BOOST_AUTO_TEST_CASE(vmSystemOperationsTest)
-//{
-// dev::test::executeTests("vmSystemOperationsTest", "/VMTests", dev::test::doVMTests);
-//}
-
BOOST_AUTO_TEST_CASE(userDefinedFile)
{
if (boost::unit_test::framework::master_test_suite().argc == 2)