cerc-io/solidity
16
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

All Fields Hex: VMTests

Browse Source
This commit is contained in:
winsvega 2015-04-10 02:13:54 +03:00
parent bfa1e9b7b9
commit 10245ce4b3
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
TestHelper.cpp
View File

@ -126,15 +126,23 @@ json_spirit::mObject& ImportTest::makeAllFieldsHex(json_spirit::mObject& _o)
if (key == "to")
continue;
string str = (*it).second.get_str();
string str;
json_spirit::mValue value = (*it).second;
if (value.type() == json_spirit::int_type)
str = toString(value.get_int());
else if (value.type() == json_spirit::str_type)
str = value.get_str();
else continue;
_o[key] = (str.substr(0, 2) == "0x" ||
str.find("a") != string::npos ||
str.find("b") != string::npos ||
str.find("c") != string::npos ||
str.find("d") != string::npos ||
str.find("e") != string::npos ||
str.find("f") != string::npos
) ? str : "0x" + toHex(toCompactBigEndian(toInt(str)));
str.find("a") != string::npos ||
str.find("b") != string::npos ||
str.find("c") != string::npos ||
str.find("d") != string::npos ||
str.find("e") != string::npos ||
str.find("f") != string::npos
) ? str : "0x" + toHex(toCompactBigEndian(toInt(str)));
}
return _o;
}

2
vm.cpp
View File

@ -85,7 +85,7 @@ void FakeExtVM::reset(u256 _myBalance, u256 _myNonce, map<u256, u256> const& _st
void FakeExtVM::push(mObject& o, string const& _n, u256 _v)
{
o[_n] = toString(_v);
o[_n] = "0x" + toHex(toCompactBigEndian(_v));
}
void FakeExtVM::push(mArray& a, u256 _v)