diff options
| author | winsvega <winsvega@mail.ru> | 2015-04-13 21:33:42 +0800 |
|---|---|---|
| committer | winsvega <winsvega@mail.ru> | 2015-04-16 21:46:40 +0800 |
| commit | b040e23463041e40f98514a23a4eac7ce863fa08 (patch) | |
| tree | c840e49325fce8f5969eca468749acfc977b4c40 /TestHelper.cpp | |
| parent | c867e185bf1bf2d813bc8123d904c6a9bd7bde90 (diff) | |
| download | dexon-solidity-b040e23463041e40f98514a23a4eac7ce863fa08.tar dexon-solidity-b040e23463041e40f98514a23a4eac7ce863fa08.tar.gz dexon-solidity-b040e23463041e40f98514a23a4eac7ce863fa08.tar.bz2 dexon-solidity-b040e23463041e40f98514a23a4eac7ce863fa08.tar.lz dexon-solidity-b040e23463041e40f98514a23a4eac7ce863fa08.tar.xz dexon-solidity-b040e23463041e40f98514a23a4eac7ce863fa08.tar.zst dexon-solidity-b040e23463041e40f98514a23a4eac7ce863fa08.zip | |
All Fields Hex: block tests
Diffstat (limited to 'TestHelper.cpp')
| -rw-r--r-- | TestHelper.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/TestHelper.cpp b/TestHelper.cpp index a689a40b..882bb5a9 100644 --- a/TestHelper.cpp +++ b/TestHelper.cpp @@ -132,10 +132,14 @@ json_spirit::mObject& ImportTest::makeAllFieldsHex(json_spirit::mObject& _o) 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) @@ -145,6 +149,7 @@ json_spirit::mObject& ImportTest::makeAllFieldsHex(json_spirit::mObject& _o) else continue; <<<<<<< HEAD +<<<<<<< HEAD _o[key] = (str.substr(0, 2) == "0x") ? str : "0x" + toHex(toCompactBigEndian(toInt(str))); ======= _o[key] = (str.substr(0, 2) == "0x" || @@ -156,6 +161,9 @@ json_spirit::mObject& ImportTest::makeAllFieldsHex(json_spirit::mObject& _o) 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; } |