From 91ccc1b7ab56af5ecb94b0c9741067db0e5c8443 Mon Sep 17 00:00:00 2001 From: winsvega Date: Tue, 6 Jan 2015 01:39:02 +0300 Subject: Transaction Tests transaction tests Transaction Test Work In Progress transaction test work in progress work in progress. check for transaction is valid Transaction Tests Work In Progress compiler error fix --- TestHelper.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'TestHelper.cpp') diff --git a/TestHelper.cpp b/TestHelper.cpp index ea848c7c..1b854162 100644 --- a/TestHelper.cpp +++ b/TestHelper.cpp @@ -228,14 +228,21 @@ byte toByte(json_spirit::mValue const& _v) return 0; } +bytes importByteArray(const std::string& str) +{ + bytes data; + 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 data; if (_o["data"].type() == json_spirit::str_type) - if (_o["data"].get_str().find_first_of("0x") == 0) - data = fromHex(_o["data"].get_str().substr(2)); - else - data = fromHex(_o["data"].get_str()); + data = importByteArray(_o["data"].get_str()); else for (auto const& j: _o["data"].get_array()) data.push_back(toByte(j)); -- cgit v1.2.3