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

All Fields Hex

Browse Source 
rebase + merge error fix
This commit is contained in:
winsvega 2015-04-14 00:44:31 +03:00
parent 721ee65195
commit d175996b3a
1 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
TestHelper.cpp
View File

@ -131,15 +131,7 @@ 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
std::string str; std::string str;
=======
string str;
>>>>>>> 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)
@ -148,22 +140,7 @@ json_spirit::mObject& ImportTest::makeAllFieldsHex(json_spirit::mObject& _o)
str = value.get_str(); str = value.get_str();
else continue; else continue;
<<<<<<< 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)));
=======
_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)));
>>>>>>> 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;
} }