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

style changes

Browse Source
This commit is contained in:
winsvega 2015-01-23 23:03:29 +03:00
parent f22f8ba2ef
commit ec85da431a
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
TestHelper.cpp
View File

@ -228,25 +228,19 @@ byte toByte(json_spirit::mValue const& _v)
return 0; return 0;
} }
bytes importByteArray(const std::string& str) bytes importByteArray(std::string const& _str)
{ {
bytes data; return fromHex(_str.substr(0, 2) == "0x" ? _str.substr(2) : _str);
if (str.find_first_of("0x") == 0)
data = fromHex(str.substr(2));
else
data = fromHex(str);
return data;
} }
bytes importData(json_spirit::mObject& _o) bytes importData(json_spirit::mObject& _o)
{ {
bytes data; bytes data;
if (_o["data"].type() == json_spirit::str_type) if (_o["data"].type() == json_spirit::str_type)
data = importByteArray(_o["data"].get_str()); data = importByteArray(_o["data"].get_str());
else else
for (auto const& j: _o["data"].get_array()) for (auto const& j: _o["data"].get_array())
data.push_back(toByte(j)); data.push_back(toByte(j));
return data; return data;
} }

2
TestHelper.h
View File

@ -68,7 +68,7 @@ u256 toInt(json_spirit::mValue const& _v);
byte toByte(json_spirit::mValue const& _v); byte toByte(json_spirit::mValue const& _v);
bytes importCode(json_spirit::mObject& _o); bytes importCode(json_spirit::mObject& _o);
bytes importData(json_spirit::mObject& _o); bytes importData(json_spirit::mObject& _o);
bytes importByteArray(const std::string& str); bytes importByteArray(std::string const& _str);
eth::LogEntries importLog(json_spirit::mArray& _o); eth::LogEntries importLog(json_spirit::mArray& _o);
json_spirit::mArray exportLog(eth::LogEntries _logs); json_spirit::mArray exportLog(eth::LogEntries _logs);
void checkOutput(bytes const& _output, json_spirit::mObject& _o); void checkOutput(bytes const& _output, json_spirit::mObject& _o);