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: block tests

Browse Source
This commit is contained in:
winsvega 2015-04-13 16:33:42 +03:00
parent c867e185bf
commit b040e23463
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
TestHelper.cpp
View File

@ -131,11 +131,15 @@ json_spirit::mObject& ImportTest::makeAllFieldsHex(json_spirit::mObject& _o)
if (std::find(std::begin(hashes), std::end(hashes), key) != std::end(hashes)) if (std::find(std::begin(hashes), std::end(hashes), key) != std::end(hashes))
continue; continue;
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
std::string str; std::string str;
======= =======
string str; string str;
>>>>>>> All Fields Hex: VMTests >>>>>>> All Fields Hex: VMTests
=======
std::string str;
>>>>>>> All Fields Hex: block tests
json_spirit::mValue value = (*it).second; json_spirit::mValue value = (*it).second;
if (value.type() == json_spirit::int_type) if (value.type() == json_spirit::int_type)
@ -144,6 +148,7 @@ json_spirit::mObject& ImportTest::makeAllFieldsHex(json_spirit::mObject& _o)
str = value.get_str(); str = value.get_str();
else continue; else continue;
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
_o[key] = (str.substr(0, 2) == "0x") ? str : "0x" + toHex(toCompactBigEndian(toInt(str))); _o[key] = (str.substr(0, 2) == "0x") ? str : "0x" + toHex(toCompactBigEndian(toInt(str)));
======= =======
@ -156,6 +161,9 @@ json_spirit::mObject& ImportTest::makeAllFieldsHex(json_spirit::mObject& _o)
str.find("f") != string::npos str.find("f") != string::npos
) ? str : "0x" + toHex(toCompactBigEndian(toInt(str))); ) ? str : "0x" + toHex(toCompactBigEndian(toInt(str)));
>>>>>>> All Fields Hex: VMTests >>>>>>> All Fields Hex: VMTests
=======
_o[key] = (str.substr(0, 2) == "0x") ? str : "0x" + toHex(toCompactBigEndian(toInt(str)));
>>>>>>> All Fields Hex: block tests
} }
return _o; return _o;
} }