diff options
author | winsvega <winsvega@mail.ru> | 2015-01-24 04:03:29 +0800 |
---|---|---|
committer | winsvega <winsvega@mail.ru> | 2015-01-24 04:03:29 +0800 |
commit | ec85da431a924779495c3c3b10978e5999778a46 (patch) | |
tree | 1373db3ba449a84c402d6a1fc1eb1daa26232fb8 /TestHelper.cpp | |
parent | f22f8ba2ef2c25fac39657baef21d619e1686864 (diff) | |
download | dexon-solidity-ec85da431a924779495c3c3b10978e5999778a46.tar dexon-solidity-ec85da431a924779495c3c3b10978e5999778a46.tar.gz dexon-solidity-ec85da431a924779495c3c3b10978e5999778a46.tar.bz2 dexon-solidity-ec85da431a924779495c3c3b10978e5999778a46.tar.lz dexon-solidity-ec85da431a924779495c3c3b10978e5999778a46.tar.xz dexon-solidity-ec85da431a924779495c3c3b10978e5999778a46.tar.zst dexon-solidity-ec85da431a924779495c3c3b10978e5999778a46.zip |
style changes
Diffstat (limited to 'TestHelper.cpp')
-rw-r--r-- | TestHelper.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/TestHelper.cpp b/TestHelper.cpp index 8c7345df..5a579702 100644 --- a/TestHelper.cpp +++ b/TestHelper.cpp @@ -228,25 +228,19 @@ byte toByte(json_spirit::mValue const& _v) return 0; } -bytes importByteArray(const std::string& str) +bytes importByteArray(std::string const& _str) { - bytes data; - if (str.find_first_of("0x") == 0) - data = fromHex(str.substr(2)); - else - data = fromHex(str); - return data; + return fromHex(_str.substr(0, 2) == "0x" ? _str.substr(2) : _str); } bytes importData(json_spirit::mObject& _o) { bytes data; if (_o["data"].type() == json_spirit::str_type) - data = importByteArray(_o["data"].get_str()); + data = importByteArray(_o["data"].get_str()); else for (auto const& j: _o["data"].get_array()) data.push_back(toByte(j)); - return data; } |