aboutsummaryrefslogtreecommitdiffstats
path: root/vm.cpp
diff options
context:
space:
mode:
authorCJentzsch <jentzsch.software@gmail.com>2015-01-13 22:47:36 +0800
committerCJentzsch <jentzsch.software@gmail.com>2015-01-13 22:47:36 +0800
commit108388c4401ce16609bfc23c4dcb6b3e09638e02 (patch)
tree6489941b4c772ef8c80f0310d8c7a0bda5d9c966 /vm.cpp
parent22d738b9955389a5cea73e60fde09b9dc681c91d (diff)
downloaddexon-solidity-108388c4401ce16609bfc23c4dcb6b3e09638e02.tar
dexon-solidity-108388c4401ce16609bfc23c4dcb6b3e09638e02.tar.gz
dexon-solidity-108388c4401ce16609bfc23c4dcb6b3e09638e02.tar.bz2
dexon-solidity-108388c4401ce16609bfc23c4dcb6b3e09638e02.tar.lz
dexon-solidity-108388c4401ce16609bfc23c4dcb6b3e09638e02.tar.xz
dexon-solidity-108388c4401ce16609bfc23c4dcb6b3e09638e02.tar.zst
dexon-solidity-108388c4401ce16609bfc23c4dcb6b3e09638e02.zip
fix callcreates imoport
Diffstat (limited to 'vm.cpp')
-rw-r--r--vm.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/vm.cpp b/vm.cpp
index 8b8c75a0..8af752ca 100644
--- a/vm.cpp
+++ b/vm.cpp
@@ -237,8 +237,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.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);
}
}
@@ -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);
}