diff options
| author | winsvega <winsvega@mail.ru> | 2015-04-14 05:44:31 +0800 |
|---|---|---|
| committer | winsvega <winsvega@mail.ru> | 2015-04-16 21:46:40 +0800 |
| commit | d175996b3a6ffd5a16efb6a4ad83b5e88fa1bab7 (patch) | |
| tree | e7c4e321d3dc7c2c4596ffd7c75557bb5f281ec5 /TestHelper.cpp | |
| parent | 721ee6519572b13ea62660cd19f481f5a9bb052f (diff) | |
| download | dexon-solidity-d175996b3a6ffd5a16efb6a4ad83b5e88fa1bab7.tar.gz dexon-solidity-d175996b3a6ffd5a16efb6a4ad83b5e88fa1bab7.tar.zst dexon-solidity-d175996b3a6ffd5a16efb6a4ad83b5e88fa1bab7.zip | |
All Fields Hex
rebase + merge error fix
Diffstat (limited to 'TestHelper.cpp')
| -rw-r--r-- | TestHelper.cpp | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/TestHelper.cpp b/TestHelper.cpp index 120a4e16..85e45500 100644 --- a/TestHelper.cpp +++ b/TestHelper.cpp @@ -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)) continue; -<<<<<<< HEAD -<<<<<<< HEAD std::string str; -======= - string str; ->>>>>>> All Fields Hex: VMTests -======= - std::string str; ->>>>>>> All Fields Hex: block tests json_spirit::mValue value = (*it).second; if (value.type() == json_spirit::int_type) @@ -148,22 +140,7 @@ json_spirit::mObject& ImportTest::makeAllFieldsHex(json_spirit::mObject& _o) str = value.get_str(); 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.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; } |