From 6e97308f27789b553a014adc9afd68c9fddc2e39 Mon Sep 17 00:00:00 2001 From: winsvega Date: Thu, 16 Apr 2015 02:03:26 +0300 Subject: [PATCH] All fields Hex: style --- TestHelper.cpp | 14 +++++++------- transaction.cpp | 2 +- ttTransactionTestFiller.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/TestHelper.cpp b/TestHelper.cpp index 85e455000..92a8258ac 100644 --- a/TestHelper.cpp +++ b/TestHelper.cpp @@ -121,18 +121,18 @@ ImportTest::ImportTest(json_spirit::mObject& _o, bool isFiller): json_spirit::mObject& ImportTest::makeAllFieldsHex(json_spirit::mObject& _o) { - static const std::string hashes[] = {"bloom" , "coinbase", "hash", "mixHash", "parentHash", "receiptTrie", - "stateRoot", "transactionsTrie", "uncleHash", "currentCoinbase", - "previousHash", "to", "address", "caller", "origin", "secretKey"}; + static const set hashes {"bloom" , "coinbase", "hash", "mixHash", "parentHash", "receiptTrie", + "stateRoot", "transactionsTrie", "uncleHash", "currentCoinbase", + "previousHash", "to", "address", "caller", "origin", "secretKey"}; - for (json_spirit::mObject::iterator it = _o.begin(); it != _o.end(); it++) + for (auto& i: _o) { - std::string key = (*it).first; - if (std::find(std::begin(hashes), std::end(hashes), key) != std::end(hashes)) + std::string key = i.first; + if (hashes.count(key)) continue; std::string str; - json_spirit::mValue value = (*it).second; + json_spirit::mValue value = i.second; if (value.type() == json_spirit::int_type) str = toString(value.get_int()); diff --git a/transaction.cpp b/transaction.cpp index d38be07fe..e73d10cdf 100644 --- a/transaction.cpp +++ b/transaction.cpp @@ -39,7 +39,7 @@ void doTransactionTests(json_spirit::mValue& _v, bool _fillin) if (_fillin) { BOOST_REQUIRE(o.count("transaction") > 0); - mObject tObj = o["transaction"].get_obj(); + mObject tObj = o["transaction"].get_obj(); //Construct Rlp of the given transaction RLPStream rlpStream = createRLPStreamFromTransactionFields(tObj); diff --git a/ttTransactionTestFiller.json b/ttTransactionTestFiller.json index 1dcc0f94e..436d00f18 100644 --- a/ttTransactionTestFiller.json +++ b/ttTransactionTestFiller.json @@ -176,7 +176,7 @@ }, "SenderTest" : { - "//" : "sender 0f65fe9276bc9a24ae7083ae28e2660ef72df99e", + "senderExpect" : "sender 0f65fe9276bc9a24ae7083ae28e2660ef72df99e", "expect" : "valid", "transaction" : {