cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved code export to export function in ImportHelper

Browse Source
This commit is contained in:
Christoph Jentzsch 2014-11-05 20:21:33 +01:00
parent 6b6bb65eb8
commit 1d156a5726
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
TestHelper.cpp
View File

@ -27,7 +27,7 @@
#include <libethereum/Client.h> #include <libethereum/Client.h>
#include <liblll/Compiler.h> #include <liblll/Compiler.h>
//#define FILL_TESTS #define FILL_TESTS
using namespace std; using namespace std;
using namespace dev::eth; using namespace dev::eth;
@ -118,7 +118,6 @@ void ImportTest::importState(json_spirit::mObject& _o, State& _state)
if (code.size()) if (code.size())
{ {
_state.m_cache[address] = Account(toInt(o["balance"]), Account::ContractConception); _state.m_cache[address] = Account(toInt(o["balance"]), Account::ContractConception);
i.second.get_obj()["code"] = "0x" + toHex(code); //preperation for export
_state.m_cache[address].setCode(bytesConstRef(&code)); _state.m_cache[address].setCode(bytesConstRef(&code));
} }
else else
@ -175,6 +174,29 @@ void ImportTest::exportTest(bytes _output, State& _statePost)
postState[toString(a.first)] = o; postState[toString(a.first)] = o;
} }
m_TestObject["post"] = json_spirit::mValue(postState); m_TestObject["post"] = json_spirit::mValue(postState);
// export pre state
json_spirit::mObject preState;
for (auto const& a: m_statePre.addresses())
{
if (genesis.count(a.first))
continue;
json_spirit::mObject o;
o["balance"] = toString(m_statePre.balance(a.first));
o["nonce"] = toString(m_statePre.transactionsFrom(a.first));
{
json_spirit::mObject store;
for (auto const& s: m_statePre.storage(a.first))
store["0x"+toHex(toCompactBigEndian(s.first))] = "0x"+toHex(toCompactBigEndian(s.second));
o["storage"] = store;
}
o["code"] = "0x" + toHex(m_statePre.code(a.first));
preState[toString(a.first)] = o;
}
m_TestObject["pre"] = json_spirit::mValue(preState);
} }
u256 toInt(json_spirit::mValue const& _v) u256 toInt(json_spirit::mValue const& _v)