diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d387039c..6117e1bc5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -547,6 +547,12 @@ if (MSVC) else () # HACK : because these need to come first, before any warning demotion string (APPEND CMAKE_CXX_FLAGS " -Wall -Wdeprecated") + if (is_clang OR (is_gcc AND NOT unity)) + # gcc flags many more instances with `-Wshadow` than clang. Many incouous + # shadowings are flagged in unity mode. Only turn on gcc warnings in nonunity + # builds + string (APPEND CMAKE_CXX_FLAGS " -Wshadow") + endif() # not MSVC target_compile_options (common INTERFACE diff --git a/src/ripple/app/ledger/Ledger.cpp b/src/ripple/app/ledger/Ledger.cpp index b82a3c7a7..56ab06360 100644 --- a/src/ripple/app/ledger/Ledger.cpp +++ b/src/ripple/app/ledger/Ledger.cpp @@ -196,11 +196,13 @@ Ledger::Ledger ( static auto const id = calcAccountID( generateKeyPair(KeyType::secp256k1, generateSeed("masterpassphrase")).first); - auto const sle = std::make_shared(keylet::account(id)); - sle->setFieldU32 (sfSequence, 1); - sle->setAccountID (sfAccount, id); - sle->setFieldAmount (sfBalance, info_.drops); - rawInsert(sle); + { + auto const sle = std::make_shared(keylet::account(id)); + sle->setFieldU32(sfSequence, 1); + sle->setAccountID(sfAccount, id); + sle->setFieldAmount(sfBalance, info_.drops); + rawInsert(sle); + } if (! amendments.empty()) { diff --git a/src/ripple/app/ledger/impl/LedgerMaster.cpp b/src/ripple/app/ledger/impl/LedgerMaster.cpp index ef7867a1b..275e88299 100644 --- a/src/ripple/app/ledger/impl/LedgerMaster.cpp +++ b/src/ripple/app/ledger/impl/LedgerMaster.cpp @@ -981,8 +981,8 @@ LedgerMaster::consensusBuilt( // If we still don't know the sequence, get it if (v.second.ledgerSeq_ == 0) { - if (auto ledger = getLedgerByHash (v.first)) - v.second.ledgerSeq_ = ledger->info().seq; + if (auto l = getLedgerByHash (v.first)) + v.second.ledgerSeq_ = l->info().seq; } if (v.second.ledgerSeq_ > maxSeq) @@ -1464,11 +1464,10 @@ LedgerMaster::walkHashBySeq ( // Try to acquire the complete ledger if (!ledger) { - auto const ledger = app_.getInboundLedgers().acquire ( - *refHash, refIndex, InboundLedger::Reason::GENERIC); - if (ledger) + if (auto const l = app_.getInboundLedgers().acquire ( + *refHash, refIndex, InboundLedger::Reason::GENERIC)) { - ledgerHash = hashOfSeq(*ledger, index, m_journal); + ledgerHash = hashOfSeq(*l, index, m_journal); assert (ledgerHash); } } @@ -1755,7 +1754,7 @@ void LedgerMaster::doAdvance (ScopedLockType& sl) InboundLedger::Reason reason = InboundLedger::Reason::HISTORY; boost::optional missing; { - ScopedLockType sl(mCompleteLock); + ScopedLockType sll(mCompleteLock); missing = prevMissing(mCompleteLedgers, mPubLedger->info().seq, app_.getNodeStore().earliestSeq()); diff --git a/src/ripple/app/misc/impl/TxQ.cpp b/src/ripple/app/misc/impl/TxQ.cpp index 778980204..2d3029af4 100644 --- a/src/ripple/app/misc/impl/TxQ.cpp +++ b/src/ripple/app/misc/impl/TxQ.cpp @@ -507,9 +507,9 @@ TxQ::tryClearAccountQueue(Application& app, OpenView& view, auto const totalFeeLevelPaid = std::accumulate(beginTxIter, endTxIter, feeLevelPaid, - [](auto const& total, auto const& tx) + [](auto const& total, auto const& txn) { - return total + tx.second.feeLevel; + return total + txn.second.feeLevel; }); // This transaction did not pay enough, so fall back to the normal process. @@ -1084,12 +1084,12 @@ TxQ::apply(Application& app, OpenView& view, auto endTotal = std::accumulate(endAccount.transactions.begin(), endAccount.transactions.end(), std::pair(0, 0), - [&](auto const& total, auto const& tx) + [&](auto const& total, auto const& txn) { // Check for overflow. - auto next = tx.second.feeLevel / + auto next = txn.second.feeLevel / endAccount.transactions.size(); - auto mod = tx.second.feeLevel % + auto mod = txn.second.feeLevel % endAccount.transactions.size(); if (total.first >= max - next || total.second >= max - mod) diff --git a/src/ripple/app/misc/impl/ValidatorList.cpp b/src/ripple/app/misc/impl/ValidatorList.cpp index 626c99763..6350feac5 100644 --- a/src/ripple/app/misc/impl/ValidatorList.cpp +++ b/src/ripple/app/misc/impl/ValidatorList.cpp @@ -301,8 +301,8 @@ ValidatorList::applyList ( continue; } - auto const result = validatorManifests_.applyManifest (std::move(*m)); - if (result == ManifestDisposition::invalid) + if (auto const r = validatorManifests_.applyManifest (std::move(*m)); + r == ManifestDisposition::invalid) { JLOG (j_.warn()) << "List for " << strHex(pubKey) << @@ -526,8 +526,8 @@ ValidatorList::getJson() const PublicKey local; Json::Value& jLocalStaticKeys = (res[jss::local_static_keys] = Json::arrayValue); - auto it = publisherLists_.find(local); - if (it != publisherLists_.end()) + if (auto it = publisherLists_.find(local); + it != publisherLists_.end()) { for (auto const& key : it->second.list) jLocalStaticKeys.append( diff --git a/src/ripple/app/paths/PathState.cpp b/src/ripple/app/paths/PathState.cpp index 2aab1c769..2202b7285 100644 --- a/src/ripple/app/paths/PathState.cpp +++ b/src/ripple/app/paths/PathState.cpp @@ -176,7 +176,7 @@ TER PathState::pushNode ( // TODO(tom): if pathIsEmpty, we probably don't need to do ANYTHING below. // Indeed, we might just not even call pushNode in the first place! - auto const& backNode = pathIsEmpty ? path::Node () : nodes_.back (); + auto const& backNodeOuter = pathIsEmpty ? path::Node () : nodes_.back (); // true, iff node is a ripple account. false, iff node is an offer node. const bool hasAccount = (iType & STPathElement::typeAccount); @@ -197,7 +197,7 @@ TER PathState::pushNode ( node.uFlags = iType; node.issue_.currency = hasCurrency ? - currency : backNode.issue_.currency; + currency : backNodeOuter.issue_.currency; // TODO(tom): we can probably just return immediately whenever we hit an // error in these next pages. @@ -263,7 +263,7 @@ TER PathState::pushNode ( node.issue_.currency, isXRP(node.issue_.currency) ? xrpAccount() : account); - // Note: backNode may no longer be the immediately previous node. + // Note: backNodeOuter may no longer be the immediately previous node. } if (resultCode == tesSUCCESS && !nodes_.empty ()) @@ -360,10 +360,10 @@ TER PathState::pushNode ( node.issue_.account = issuer; else if (isXRP (node.issue_.currency)) node.issue_.account = xrpAccount(); - else if (isXRP (backNode.issue_.account)) - node.issue_.account = backNode.account_; + else if (isXRP (backNodeOuter.issue_.account)) + node.issue_.account = backNodeOuter.account_; else - node.issue_.account = backNode.issue_.account; + node.issue_.account = backNodeOuter.issue_.account; node.saRevDeliver = STAmount (node.issue_); node.saFwdDeliver = node.saRevDeliver; @@ -375,7 +375,7 @@ TER PathState::pushNode ( resultCode = temBAD_PATH; } - else if (backNode.issue_ == node.issue_) + else if (backNodeOuter.issue_ == node.issue_) { JLOG (j_.debug()) << "pushNode: bad path: offer to same currency and issuer"; @@ -387,8 +387,8 @@ TER PathState::pushNode ( // Insert intermediary issuer account if needed. resultCode = pushImpliedNodes ( xrpAccount(), // Rippling, but offers don't have an account. - backNode.issue_.currency, - backNode.issue_.account); + backNodeOuter.issue_.currency, + backNodeOuter.issue_.account); } if (resultCode == tesSUCCESS) diff --git a/src/ripple/app/paths/cursor/RippleLiquidity.cpp b/src/ripple/app/paths/cursor/RippleLiquidity.cpp index dfa719768..9fd9b4e5e 100644 --- a/src/ripple/app/paths/cursor/RippleLiquidity.cpp +++ b/src/ripple/app/paths/cursor/RippleLiquidity.cpp @@ -136,10 +136,10 @@ void rippleLiquidity ( if (!uRateMax || uRate <= uRateMax) { // current actual = current request * (quality out / quality in). - auto numerator = multiplyRound (saCur, qualityOut, true); + auto n = multiplyRound (saCur, qualityOut, true); // True means "round up" to get best flow. - STAmount saCurIn = divideRound (numerator, qualityIn, true); + STAmount saCurIn = divideRound (n, qualityIn, true); JLOG (rippleCalc.j_.trace()) << "rippleLiquidity:" diff --git a/src/ripple/app/paths/impl/FlowDebugInfo.h b/src/ripple/app/paths/impl/FlowDebugInfo.h index f0a2b0d3b..8343140dd 100644 --- a/src/ripple/app/paths/impl/FlowDebugInfo.h +++ b/src/ripple/app/paths/impl/FlowDebugInfo.h @@ -89,11 +89,11 @@ struct FlowDebugInfo } void - pushLiquiditySrc (EitherAmount const& in, EitherAmount const& out) + pushLiquiditySrc (EitherAmount const& eIn, EitherAmount const& eOut) { assert(!liquiditySrcIn.empty()); - liquiditySrcIn.back().push_back(in); - liquiditySrcOut.back().push_back(out); + liquiditySrcIn.back().push_back(eIn); + liquiditySrcOut.back().push_back(eOut); } void diff --git a/src/ripple/app/paths/impl/PaySteps.cpp b/src/ripple/app/paths/impl/PaySteps.cpp index edaac72ed..d2335ef5b 100644 --- a/src/ripple/app/paths/impl/PaySteps.cpp +++ b/src/ripple/app/paths/impl/PaySteps.cpp @@ -641,8 +641,8 @@ toStrandV2 ( return std::make_pair(xrpAccount(), xrpAccount()); }; - auto curAccount = src; - auto curIssue = [&] { + auto curAcc = src; + auto curIss = [&] { auto& currency = sendMaxIssue ? sendMaxIssue->currency : deliver.currency; if (isXRP(currency)) @@ -653,28 +653,28 @@ toStrandV2 ( for (auto const& s : result) { auto const accts = stepAccts(*s); - if (accts.first != curAccount) + if (accts.first != curAcc) return false; if (auto const b = s->bookStepBook()) { - if (curIssue != b->in) + if (curIss != b->in) return false; - curIssue = b->out; + curIss = b->out; } else { - curIssue.account = accts.second; + curIss.account = accts.second; } - curAccount = accts.second; + curAcc = accts.second; } - if (curAccount != dst) + if (curAcc != dst) return false; - if (curIssue.currency != deliver.currency) + if (curIss.currency != deliver.currency) return false; - if (curIssue.account != deliver.account && - curIssue.account != dst) + if (curIss.account != deliver.account && + curIss.account != dst) return false; return true; }; diff --git a/src/ripple/app/tx/impl/DepositPreauth.cpp b/src/ripple/app/tx/impl/DepositPreauth.cpp index a604222fa..233530b0b 100644 --- a/src/ripple/app/tx/impl/DepositPreauth.cpp +++ b/src/ripple/app/tx/impl/DepositPreauth.cpp @@ -110,10 +110,10 @@ DepositPreauth::preclaim(PreclaimContext const& ctx) TER DepositPreauth::doApply () { - auto const sleOwner = view().peek (keylet::account (account_)); - if (ctx_.tx.isFieldPresent (sfAuthorize)) { + auto const sleOwner = view().peek (keylet::account (account_)); + // A preauth counts against the reserve of the issuing account, but we // check the starting balance because we want to allow dipping into the // reserve to pay fees. diff --git a/src/ripple/basics/impl/Archive.cpp b/src/ripple/basics/impl/Archive.cpp index 632d87953..2adfed676 100644 --- a/src/ripple/basics/impl/Archive.cpp +++ b/src/ripple/basics/impl/Archive.cpp @@ -36,9 +36,9 @@ extractTarLz4( using archive_ptr = std::unique_ptr; archive_ptr ar {archive_read_new(), - [](struct archive* ar) + [](struct archive* a) { - archive_read_free(ar); + archive_read_free(a); }}; if (!ar) Throw("Failed to allocate archive"); @@ -57,9 +57,9 @@ extractTarLz4( } archive_ptr aw {archive_write_disk_new(), - [](struct archive* aw) + [](struct archive* a) { - archive_write_free(aw); + archive_write_free(a); }}; if (!aw) Throw("Failed to allocate archive"); diff --git a/src/ripple/basics/qalloc.h b/src/ripple/basics/qalloc.h index 271f3cc63..3bdc60f45 100644 --- a/src/ripple/basics/qalloc.h +++ b/src/ripple/basics/qalloc.h @@ -189,11 +189,11 @@ qalloc_impl<_>::block::allocate( { align = std::max(align, std::alignment_of::value); - auto pad = [](void const* p, std::size_t align) + auto pad = [](void const* p, std::size_t a) { auto const i = reinterpret_cast< std::uintptr_t>(p); - return (align - (i % align)) % align; + return (a - (i % a)) % a; }; auto const n0 = diff --git a/src/ripple/beast/container/detail/aged_unordered_container.h b/src/ripple/beast/container/detail/aged_unordered_container.h index 271045ee4..8b09db7ae 100644 --- a/src/ripple/beast/container/detail/aged_unordered_container.h +++ b/src/ripple/beast/container/detail/aged_unordered_container.h @@ -178,8 +178,8 @@ private: { } - ValueHash (Hash const& hash) - : beast::detail::empty_base_optimization (hash) + ValueHash (Hash const& h) + : beast::detail::empty_base_optimization (h) { } diff --git a/src/ripple/ledger/impl/PaymentSandbox.cpp b/src/ripple/ledger/impl/PaymentSandbox.cpp index ad44fdd0c..cb91d25f3 100644 --- a/src/ripple/ledger/impl/PaymentSandbox.cpp +++ b/src/ripple/ledger/impl/PaymentSandbox.cpp @@ -278,11 +278,11 @@ PaymentSandbox::apply (PaymentSandbox& to) std::map, STAmount> PaymentSandbox::balanceChanges (ReadView const& view) const { - using key = std::tuple; + using key_t = std::tuple; // Map of delta trust lines. As a special case, when both ends of the trust // line are the same currency, then it's delta currency for that issuer. To // get the change in XRP balance, Account == root, issuer == root, currency == XRP - std::map result; + std::map result; // populate a dictionary with low/high/currency/delta. This can be // compared with the other versions payment code. diff --git a/src/ripple/nodestore/impl/codec.h b/src/ripple/nodestore/impl/codec.h index 112063b63..4d9a23142 100644 --- a/src/ripple/nodestore/impl/codec.h +++ b/src/ripple/nodestore/impl/codec.h @@ -301,13 +301,7 @@ template void const* zero32() { - static std::array v = - [] - { - std::array v; - v.fill(0); - return v; - }(); + static std::array v{}; return v.data(); } @@ -319,7 +313,6 @@ nodeobject_compress (void const* in, using std::runtime_error; using namespace nudb::detail; - std::size_t type = 1; // Check for inner node v1 if (in_size == 525) { @@ -469,10 +462,12 @@ nodeobject_compress (void const* in, std::array::max> vi; + + constexpr std::size_t codecType = 1; auto const vn = write_varint( - vi.data(), type); + vi.data(), codecType); std::pair result; - switch(type) + switch(codecType) { // case 0 was uncompressed data; we always compress now. case 1: // lz4 @@ -495,7 +490,7 @@ nodeobject_compress (void const* in, default: Throw ( "nodeobject codec: unknown=" + - std::to_string(type)); + std::to_string(codecType)); }; return result; } diff --git a/src/ripple/peerfinder/impl/Livecache.h b/src/ripple/peerfinder/impl/Livecache.h index c32562679..1234f0dc6 100644 --- a/src/ripple/peerfinder/impl/Livecache.h +++ b/src/ripple/peerfinder/impl/Livecache.h @@ -538,14 +538,14 @@ Livecache ::hops_t::insert (Element& e) template void -Livecache ::hops_t::reinsert (Element& e, int hops) +Livecache ::hops_t::reinsert (Element& e, int numHops) { - assert (hops >= 0 && hops <= Tuning::maxHops + 1); + assert (numHops >= 0 && numHops <= Tuning::maxHops + 1); list_type& list (m_lists [e.endpoint.hops]); list.erase (list.iterator_to (e)); --m_hist [e.endpoint.hops]; - e.endpoint.hops = hops; + e.endpoint.hops = numHops; insert (e); } diff --git a/src/ripple/peerfinder/impl/Logic.h b/src/ripple/peerfinder/impl/Logic.h index bec455397..86634999f 100644 --- a/src/ripple/peerfinder/impl/Logic.h +++ b/src/ripple/peerfinder/impl/Logic.h @@ -830,12 +830,13 @@ public: void remove (SlotImp::ptr const& slot) { - auto const iter = slots_.find ( - slot->remote_endpoint ()); - // The slot must exist in the table - assert (iter != slots_.end ()); - // Remove from slot by IP table - slots_.erase (iter); + { + auto const iter = slots_.find(slot->remote_endpoint()); + // The slot must exist in the table + assert(iter != slots_.end()); + // Remove from slot by IP table + slots_.erase(iter); + } // Remove the key if present if (slot->public_key () != boost::none) { diff --git a/src/ripple/peerfinder/impl/StoreSqdb.h b/src/ripple/peerfinder/impl/StoreSqdb.h index 243e84e24..12a40568b 100644 --- a/src/ripple/peerfinder/impl/StoreSqdb.h +++ b/src/ripple/peerfinder/impl/StoreSqdb.h @@ -296,7 +296,7 @@ public: } { - int const version (currentSchemaVersion); + int const v(currentSchemaVersion); m_session << "INSERT OR REPLACE INTO SchemaVersion (" " name " @@ -304,7 +304,7 @@ public: ") VALUES ( " " 'PeerFinder', :version " ");" - , soci::use (version); + , soci::use (v); } tr.commit (); diff --git a/src/ripple/peerfinder/sim/Predicates.h b/src/ripple/peerfinder/sim/Predicates.h index fab20cb83..562519149 100644 --- a/src/ripple/peerfinder/sim/Predicates.h +++ b/src/ripple/peerfinder/sim/Predicates.h @@ -30,8 +30,8 @@ template class is_remote_node_pred { public: - is_remote_node_pred (Node const& node) - : node (node) + is_remote_node_pred (Node const& n) + : node (n) { } template bool operator() (Link const& l) const diff --git a/src/ripple/protocol/impl/STTx.cpp b/src/ripple/protocol/impl/STTx.cpp index 961a010f8..c96d93d99 100644 --- a/src/ripple/protocol/impl/STTx.cpp +++ b/src/ripple/protocol/impl/STTx.cpp @@ -119,15 +119,15 @@ STTx::getMentionedAccounts () const for (auto const& it : *this) { - if (auto sa = dynamic_cast (&it)) + if (auto sacc = dynamic_cast (&it)) { - assert(! sa->isDefault()); - if (! sa->isDefault()) - list.insert(sa->value()); + assert(! sacc->isDefault()); + if (! sacc->isDefault()) + list.insert(sacc->value()); } - else if (auto sa = dynamic_cast (&it)) + else if (auto samt = dynamic_cast (&it)) { - auto const& issuer = sa->getIssuer (); + auto const& issuer = samt->getIssuer (); if (! isXRP (issuer)) list.insert(issuer); } diff --git a/src/ripple/rpc/handlers/GatewayBalances.cpp b/src/ripple/rpc/handlers/GatewayBalances.cpp index 3e3f3e0ff..5d2f93c23 100644 --- a/src/ripple/rpc/handlers/GatewayBalances.cpp +++ b/src/ripple/rpc/handlers/GatewayBalances.cpp @@ -202,9 +202,8 @@ Json::Value doGatewayBalances (RPC::Context& context) result [jss::obligations] = std::move (j); } - auto populate = []( + auto populateResult = [&result]( std::map > const& array, - Json::Value& result, Json::StaticString const& name) { if (!array.empty()) @@ -226,9 +225,9 @@ Json::Value doGatewayBalances (RPC::Context& context) } }; - populate (hotBalances, result, jss::balances); - populate (frozenBalances, result, jss::frozen_balances); - populate (assets, result, jss::assets); + populateResult (hotBalances, jss::balances); + populateResult (frozenBalances, jss::frozen_balances); + populateResult (assets, jss::assets); return result; } diff --git a/src/ripple/rpc/impl/ServerHandlerImp.cpp b/src/ripple/rpc/impl/ServerHandlerImp.cpp index 71a588f3e..3ca3c965d 100644 --- a/src/ripple/rpc/impl/ServerHandlerImp.cpp +++ b/src/ripple/rpc/impl/ServerHandlerImp.cpp @@ -247,9 +247,9 @@ build_map(boost::beast::http::fields const& h) auto key (e.name_string().to_string()); // TODO Replace with safe C++14 version std::transform (key.begin(), key.end(), key.begin(), - [](auto c) + [](auto kc) { - return ::tolower(static_cast(c)); + return ::tolower(static_cast(kc)); }); c [key] = e.value().to_string(); } diff --git a/src/ripple/server/impl/BaseHTTPPeer.h b/src/ripple/server/impl/BaseHTTPPeer.h index 2fbae782e..4b1e1a662 100644 --- a/src/ripple/server/impl/BaseHTTPPeer.h +++ b/src/ripple/server/impl/BaseHTTPPeer.h @@ -439,14 +439,14 @@ template void BaseHTTPPeer:: write( - void const* buffer, std::size_t bytes) + void const* buf, std::size_t bytes) { if(bytes == 0) return; if([&] { std::lock_guard lock(mutex_); - wq_.emplace_back(buffer, bytes); + wq_.emplace_back(buf, bytes); return wq_.size() == 1 && wq2_.size() == 0; }()) { diff --git a/src/ripple/server/impl/Port.cpp b/src/ripple/server/impl/Port.cpp index dee424079..ac7eeb14c 100644 --- a/src/ripple/server/impl/Port.cpp +++ b/src/ripple/server/impl/Port.cpp @@ -117,9 +117,9 @@ populate (Section const& section, std::string const& field, std::ostream& log, auto const& address = addr.first.address(); if (std::find_if (admin_ip.begin(), admin_ip.end(), - [&address] (beast::IP::Address const& ip) + [&address] (beast::IP::Address const& a) { - return address == ip; + return address == a; } ) != admin_ip.end()) { diff --git a/src/test/app/Escrow_test.cpp b/src/test/app/Escrow_test.cpp index dea507e53..5349b89b2 100644 --- a/src/test/app/Escrow_test.cpp +++ b/src/test/app/Escrow_test.cpp @@ -121,8 +121,8 @@ struct Escrow_test : public beast::unit_test::suite public: explicit - condition (Slice condition) - : value_ (strHex(condition)) + condition (Slice cond) + : value_ (strHex(cond)) { } diff --git a/src/test/app/Manifest_test.cpp b/src/test/app/Manifest_test.cpp index 0abb45cf0..de5e8bffe 100644 --- a/src/test/app/Manifest_test.cpp +++ b/src/test/app/Manifest_test.cpp @@ -235,7 +235,7 @@ public: std::vector result; result.reserve (32); cache.for_each_manifest ( - [&result](Manifest const& m) {result.push_back (&m);}); + [&result](Manifest const& man) {result.push_back (&man);}); return result; }; auto sort = diff --git a/src/test/app/Offer_test.cpp b/src/test/app/Offer_test.cpp index b494b90f7..1557594b4 100644 --- a/src/test/app/Offer_test.cpp +++ b/src/test/app/Offer_test.cpp @@ -274,10 +274,10 @@ public: for (int i=0;i<101;++i) env (offer (carol, USD (1), EUR (2))); - auto hasFeature = [](Env& env, uint256 const& f) + auto hasFeature = [](Env& e, uint256 const& f) { - return (env.app().config().features.find(f) != - env.app().config().features.end()); + return (e.app().config().features.find(f) != + e.app().config().features.end()); }; for (auto d : {-1, 1}) @@ -2321,10 +2321,12 @@ public: env.close(); - // Acct creates an offer. This is the heart of the test. - auto const acctOffer = t.offerAmount; - env (offer (acct, USD (acctOffer), XRP (acctOffer)), ter (t.tec)); - env.close(); + { + // Acct creates an offer. This is the heart of the test. + auto const acctOffer = t.offerAmount; + env(offer(acct, USD(acctOffer), XRP(acctOffer)), ter(t.tec)); + env.close(); + } std::uint32_t const acctOfferSeq = env.seq (acct) - 1; BEAST_EXPECT (env.balance (acct, USD.issue()) == t.balanceUsd); diff --git a/src/test/app/TrustAndBalance_test.cpp b/src/test/app/TrustAndBalance_test.cpp index 7234afad7..ab43bd1e8 100644 --- a/src/test/app/TrustAndBalance_test.cpp +++ b/src/test/app/TrustAndBalance_test.cpp @@ -267,15 +267,15 @@ class TrustAndBalance_test : public beast::unit_test::suite using namespace std::chrono_literals; BEAST_EXPECT(wsc->findMsg(5s, - [](auto const& jv) + [](auto const& jval) { - auto const& t = jv[jss::transaction]; + auto const& t = jval[jss::transaction]; return t[jss::TransactionType] == jss::Payment; })); BEAST_EXPECT(wsc->findMsg(5s, - [](auto const& jv) + [](auto const& jval) { - return jv[jss::type] == "ledgerClosed"; + return jval[jss::type] == "ledgerClosed"; })); BEAST_EXPECT(wsc->invoke("unsubscribe",jv)[jss::status] == "success"); @@ -473,9 +473,9 @@ class TrustAndBalance_test : public beast::unit_test::suite using namespace std::chrono_literals; BEAST_EXPECT(wsc->findMsg(2s, - [](auto const& jv) + [](auto const& jval) { - auto const& t = jv[jss::transaction]; + auto const& t = jval[jss::transaction]; return t[jss::TransactionType] == jss::Payment && t[sfInvoiceID.fieldName] == diff --git a/src/test/app/ValidatorList_test.cpp b/src/test/app/ValidatorList_test.cpp index 6422ff97a..21d2564d0 100644 --- a/src/test/app/ValidatorList_test.cpp +++ b/src/test/app/ValidatorList_test.cpp @@ -187,7 +187,7 @@ private: std::vector const emptyCfgPublishers; auto const localSigningKeys = randomKeyPair(KeyType::secp256k1); - auto const localSigningPublic = localSigningKeys.first; + auto const localSigningPublicOuter = localSigningKeys.first; auto const localSigningSecret = localSigningKeys.second; auto const localMasterSecret = randomSecretKey(); auto const localMasterPublic = derivePublicKey( @@ -195,7 +195,7 @@ private: std::string const cfgManifest (makeManifestString ( localMasterPublic, localMasterSecret, - localSigningPublic, localSigningSecret, 1)); + localSigningPublicOuter, localSigningSecret, 1)); auto format = []( PublicKey const &publicKey, @@ -238,15 +238,15 @@ private: // load local validator key with or without manifest BEAST_EXPECT(trustedKeys->load ( - localSigningPublic, emptyCfgKeys, emptyCfgPublishers)); - BEAST_EXPECT(trustedKeys->listed (localSigningPublic)); + localSigningPublicOuter, emptyCfgKeys, emptyCfgPublishers)); + BEAST_EXPECT(trustedKeys->listed (localSigningPublicOuter)); manifests.applyManifest (*deserializeManifest(cfgManifest)); BEAST_EXPECT(trustedKeys->load ( - localSigningPublic, emptyCfgKeys, emptyCfgPublishers)); + localSigningPublicOuter, emptyCfgKeys, emptyCfgPublishers)); BEAST_EXPECT(trustedKeys->listed (localMasterPublic)); - BEAST_EXPECT(trustedKeys->listed (localSigningPublic)); + BEAST_EXPECT(trustedKeys->listed (localSigningPublicOuter)); } { // load should add validator keys from config @@ -327,10 +327,10 @@ private: manifests.applyManifest (*deserializeManifest(cfgManifest)); BEAST_EXPECT(trustedKeys->load ( - localSigningPublic, cfgKeys, emptyCfgPublishers)); + localSigningPublicOuter, cfgKeys, emptyCfgPublishers)); BEAST_EXPECT(trustedKeys->localPublicKey() == localMasterPublic); - BEAST_EXPECT(trustedKeys->listed (localSigningPublic)); + BEAST_EXPECT(trustedKeys->listed (localSigningPublicOuter)); BEAST_EXPECT(trustedKeys->listed (localMasterPublic)); for (auto const& n : configList) BEAST_EXPECT(trustedKeys->listed (n)); @@ -571,64 +571,64 @@ private: std::string const siteUri = "testUpdateTrusted.test"; - PublicKey emptyLocalKey; - ManifestCache manifests; + PublicKey emptyLocalKeyOuter; + ManifestCache manifestsOuter; jtx::Env env (*this); - auto trustedKeys = std::make_unique ( - manifests, manifests, env.timeKeeper(), env.journal); + auto trustedKeysOuter = std::make_unique ( + manifestsOuter, manifestsOuter, env.timeKeeper(), env.journal); - std::vector cfgPublishers; - hash_set activeValidators; + std::vector cfgPublishersOuter; + hash_set activeValidatorsOuter; - std::size_t const n = 40; + std::size_t const maxKeys = 40; { std::vector cfgKeys; - cfgKeys.reserve(n); + cfgKeys.reserve(maxKeys); hash_set unseenValidators; - while (cfgKeys.size () != n) + while (cfgKeys.size () != maxKeys) { auto const valKey = randomNode(); cfgKeys.push_back (toBase58( TokenType::NodePublic, valKey)); - if (cfgKeys.size () <= n - 5) - activeValidators.emplace (calcNodeID(valKey)); + if (cfgKeys.size () <= maxKeys - 5) + activeValidatorsOuter.emplace (calcNodeID(valKey)); else unseenValidators.emplace (calcNodeID(valKey)); } - BEAST_EXPECT(trustedKeys->load ( - emptyLocalKey, cfgKeys, cfgPublishers)); + BEAST_EXPECT(trustedKeysOuter->load ( + emptyLocalKeyOuter, cfgKeys, cfgPublishersOuter)); // updateTrusted should make all configured validators trusted // even if they are not active/seen TrustChanges changes = - trustedKeys->updateTrusted(activeValidators); + trustedKeysOuter->updateTrusted(activeValidatorsOuter); for (auto const& val : unseenValidators) - activeValidators.emplace (val); + activeValidatorsOuter.emplace (val); - BEAST_EXPECT(changes.added == activeValidators); + BEAST_EXPECT(changes.added == activeValidatorsOuter); BEAST_EXPECT(changes.removed.empty()); - BEAST_EXPECT(trustedKeys->quorum () == + BEAST_EXPECT(trustedKeysOuter->quorum () == std::ceil(cfgKeys.size() * 0.8f)); for (auto const& val : cfgKeys) { if (auto const valKey = parseBase58( TokenType::NodePublic, val)) { - BEAST_EXPECT(trustedKeys->listed (*valKey)); - BEAST_EXPECT(trustedKeys->trusted (*valKey)); + BEAST_EXPECT(trustedKeysOuter->listed (*valKey)); + BEAST_EXPECT(trustedKeysOuter->trusted (*valKey)); } else fail (); } changes = - trustedKeys->updateTrusted(activeValidators); + trustedKeysOuter->updateTrusted(activeValidatorsOuter); BEAST_EXPECT(changes.added.empty()); BEAST_EXPECT(changes.removed.empty()); - BEAST_EXPECT(trustedKeys->quorum () == + BEAST_EXPECT(trustedKeysOuter->quorum () == std::ceil(cfgKeys.size() * 0.8f)); } { @@ -640,23 +640,23 @@ private: std::vector cfgKeys ({ toBase58 (TokenType::NodePublic, masterPublic)}); - BEAST_EXPECT(trustedKeys->load ( - emptyLocalKey, cfgKeys, cfgPublishers)); + BEAST_EXPECT(trustedKeysOuter->load ( + emptyLocalKeyOuter, cfgKeys, cfgPublishersOuter)); auto const signingKeys1 = randomKeyPair(KeyType::secp256k1); auto const signingPublic1 = signingKeys1.first; - activeValidators.emplace (calcNodeID(masterPublic)); + activeValidatorsOuter.emplace (calcNodeID(masterPublic)); // Should not trust ephemeral signing key if there is no manifest TrustChanges changes = - trustedKeys->updateTrusted(activeValidators); + trustedKeysOuter->updateTrusted(activeValidatorsOuter); BEAST_EXPECT(changes.added == asNodeIDs({masterPublic})); BEAST_EXPECT(changes.removed.empty()); - BEAST_EXPECT(trustedKeys->quorum () == std::ceil((n + 1) * 0.8f)); - BEAST_EXPECT(trustedKeys->listed (masterPublic)); - BEAST_EXPECT(trustedKeys->trusted (masterPublic)); - BEAST_EXPECT(!trustedKeys->listed (signingPublic1)); - BEAST_EXPECT(!trustedKeys->trusted (signingPublic1)); + BEAST_EXPECT(trustedKeysOuter->quorum () == std::ceil((maxKeys + 1) * 0.8f)); + BEAST_EXPECT(trustedKeysOuter->listed (masterPublic)); + BEAST_EXPECT(trustedKeysOuter->trusted (masterPublic)); + BEAST_EXPECT(!trustedKeysOuter->listed (signingPublic1)); + BEAST_EXPECT(!trustedKeysOuter->trusted (signingPublic1)); // Should trust the ephemeral signing key from the applied manifest auto m1 = deserializeManifest(makeManifestString( @@ -664,12 +664,12 @@ private: signingPublic1, signingKeys1.second, 1)); BEAST_EXPECT( - manifests.applyManifest(std::move (*m1)) == + manifestsOuter.applyManifest(std::move (*m1)) == ManifestDisposition::accepted); - BEAST_EXPECT(trustedKeys->listed (masterPublic)); - BEAST_EXPECT(trustedKeys->trusted (masterPublic)); - BEAST_EXPECT(trustedKeys->listed (signingPublic1)); - BEAST_EXPECT(trustedKeys->trusted (signingPublic1)); + BEAST_EXPECT(trustedKeysOuter->listed (masterPublic)); + BEAST_EXPECT(trustedKeysOuter->trusted (masterPublic)); + BEAST_EXPECT(trustedKeysOuter->listed (signingPublic1)); + BEAST_EXPECT(trustedKeysOuter->trusted (signingPublic1)); // Should only trust the ephemeral signing key // from the newest applied manifest @@ -679,50 +679,50 @@ private: masterPublic, masterPrivate, signingPublic2, signingKeys2.second, 2)); BEAST_EXPECT( - manifests.applyManifest(std::move (*m2)) == + manifestsOuter.applyManifest(std::move (*m2)) == ManifestDisposition::accepted); - BEAST_EXPECT(trustedKeys->listed (masterPublic)); - BEAST_EXPECT(trustedKeys->trusted (masterPublic)); - BEAST_EXPECT(trustedKeys->listed (signingPublic2)); - BEAST_EXPECT(trustedKeys->trusted (signingPublic2)); - BEAST_EXPECT(!trustedKeys->listed (signingPublic1)); - BEAST_EXPECT(!trustedKeys->trusted (signingPublic1)); + BEAST_EXPECT(trustedKeysOuter->listed (masterPublic)); + BEAST_EXPECT(trustedKeysOuter->trusted (masterPublic)); + BEAST_EXPECT(trustedKeysOuter->listed (signingPublic2)); + BEAST_EXPECT(trustedKeysOuter->trusted (signingPublic2)); + BEAST_EXPECT(!trustedKeysOuter->listed (signingPublic1)); + BEAST_EXPECT(!trustedKeysOuter->trusted (signingPublic1)); // Should not trust keys from revoked master public key auto const signingKeysMax = randomKeyPair(KeyType::secp256k1); auto const signingPublicMax = signingKeysMax.first; - activeValidators.emplace (calcNodeID(signingPublicMax)); + activeValidatorsOuter.emplace (calcNodeID(signingPublicMax)); auto mMax = deserializeManifest(makeRevocationString( masterPublic, masterPrivate)); BEAST_EXPECT(mMax->revoked ()); BEAST_EXPECT( - manifests.applyManifest(std::move (*mMax)) == + manifestsOuter.applyManifest(std::move (*mMax)) == ManifestDisposition::accepted); - BEAST_EXPECT(manifests.getSigningKey (masterPublic) == masterPublic); - BEAST_EXPECT(manifests.revoked (masterPublic)); + BEAST_EXPECT(manifestsOuter.getSigningKey (masterPublic) == masterPublic); + BEAST_EXPECT(manifestsOuter.revoked (masterPublic)); // Revoked key remains trusted until list is updated - BEAST_EXPECT(trustedKeys->listed (masterPublic)); - BEAST_EXPECT(trustedKeys->trusted (masterPublic)); + BEAST_EXPECT(trustedKeysOuter->listed (masterPublic)); + BEAST_EXPECT(trustedKeysOuter->trusted (masterPublic)); - changes = trustedKeys->updateTrusted (activeValidators); + changes = trustedKeysOuter->updateTrusted (activeValidatorsOuter); BEAST_EXPECT(changes.removed == asNodeIDs({masterPublic})); BEAST_EXPECT(changes.added.empty()); - BEAST_EXPECT(trustedKeys->quorum () == std::ceil(n * 0.8f)); - BEAST_EXPECT(trustedKeys->listed (masterPublic)); - BEAST_EXPECT(!trustedKeys->trusted (masterPublic)); - BEAST_EXPECT(!trustedKeys->listed (signingPublicMax)); - BEAST_EXPECT(!trustedKeys->trusted (signingPublicMax)); - BEAST_EXPECT(!trustedKeys->listed (signingPublic2)); - BEAST_EXPECT(!trustedKeys->trusted (signingPublic2)); - BEAST_EXPECT(!trustedKeys->listed (signingPublic1)); - BEAST_EXPECT(!trustedKeys->trusted (signingPublic1)); + BEAST_EXPECT(trustedKeysOuter->quorum () == std::ceil(maxKeys * 0.8f)); + BEAST_EXPECT(trustedKeysOuter->listed (masterPublic)); + BEAST_EXPECT(!trustedKeysOuter->trusted (masterPublic)); + BEAST_EXPECT(!trustedKeysOuter->listed (signingPublicMax)); + BEAST_EXPECT(!trustedKeysOuter->trusted (signingPublicMax)); + BEAST_EXPECT(!trustedKeysOuter->listed (signingPublic2)); + BEAST_EXPECT(!trustedKeysOuter->trusted (signingPublic2)); + BEAST_EXPECT(!trustedKeysOuter->listed (signingPublic1)); + BEAST_EXPECT(!trustedKeysOuter->trusted (signingPublic1)); } { // Make quorum unattainable if lists from any publishers are unavailable auto trustedKeys = std::make_unique ( - manifests, manifests, env.timeKeeper(), env.journal); + manifestsOuter, manifestsOuter, env.timeKeeper(), env.journal); auto const publisherSecret = randomSecretKey(); auto const publisherPublic = derivePublicKey(KeyType::ed25519, publisherSecret); @@ -732,10 +732,10 @@ private: std::vector emptyCfgKeys; BEAST_EXPECT(trustedKeys->load ( - emptyLocalKey, emptyCfgKeys, cfgPublishers)); + emptyLocalKeyOuter, emptyCfgKeys, cfgPublishers)); TrustChanges changes = - trustedKeys->updateTrusted(activeValidators); + trustedKeys->updateTrusted(activeValidatorsOuter); BEAST_EXPECT(changes.removed.empty()); BEAST_EXPECT(changes.added.empty()); BEAST_EXPECT(trustedKeys->quorum () == @@ -768,7 +768,7 @@ private: } BEAST_EXPECT(trustedKeys->load ( - emptyLocalKey, cfgKeys, cfgPublishers)); + emptyLocalKeyOuter, cfgKeys, cfgPublishersOuter)); TrustChanges changes = trustedKeys->updateTrusted(activeValidators); @@ -786,7 +786,7 @@ private: { // Remove expired published list auto trustedKeys = std::make_unique ( - manifests, manifests, env.app().timeKeeper(), env.journal); + manifestsOuter, manifestsOuter, env.app().timeKeeper(), env.journal); PublicKey emptyLocalKey; std::vector emptyCfgKeys; @@ -872,7 +872,7 @@ private: { // Test 1-9 configured validators auto trustedKeys = std::make_unique ( - manifests, manifests, env.timeKeeper(), env.journal); + manifestsOuter, manifestsOuter, env.timeKeeper(), env.journal); std::vector cfgPublishers; hash_set activeValidators; @@ -889,7 +889,7 @@ private: activeValidators.emplace (calcNodeID(valKey)); activeKeys.emplace(valKey); BEAST_EXPECT(trustedKeys->load ( - emptyLocalKey, cfgKeys, cfgPublishers)); + emptyLocalKeyOuter, cfgKeys, cfgPublishers)); TrustChanges changes = trustedKeys->updateTrusted(activeValidators); BEAST_EXPECT(changes.removed.empty()); @@ -903,7 +903,7 @@ private: { // Test 2-9 configured validators as validator auto trustedKeys = std::make_unique ( - manifests, manifests, env.timeKeeper(), env.journal); + manifestsOuter, manifestsOuter, env.timeKeeper(), env.journal); auto const localKey = randomNode(); std::vector cfgPublishers; @@ -947,9 +947,9 @@ private: hash_set activeValidators; std::vector valKeys; - valKeys.reserve(n); + valKeys.reserve(maxKeys); - while (valKeys.size () != n) + while (valKeys.size () != maxKeys) { valKeys.push_back (randomValidator()); activeValidators.emplace( diff --git a/src/test/basics/PerfLog_test.cpp b/src/test/basics/PerfLog_test.cpp index a07b32805..b15bdefc5 100644 --- a/src/test/basics/PerfLog_test.cpp +++ b/src/test/basics/PerfLog_test.cpp @@ -537,9 +537,9 @@ public: // Verify that. // Get the last line of the log. - std::ifstream log (fullPath.c_str()); + std::ifstream logStream (fullPath.c_str()); std::string lastLine; - for (std::string line; std::getline (log, line); ) + for (std::string line; std::getline (logStream, line); ) { if (! line.empty()) lastLine = std::move (line); @@ -849,9 +849,9 @@ public: [this] (Json::Value const& currentJson) { { - Json::Value const& jobs = currentJson[jss::jobs]; - BEAST_EXPECT(jobs.isArray()); - BEAST_EXPECT(jobs.size() == 0); + Json::Value const& j = currentJson[jss::jobs]; + BEAST_EXPECT(j.isArray()); + BEAST_EXPECT(j.size() == 0); } Json::Value const& methods = currentJson[jss::methods]; @@ -884,9 +884,9 @@ public: // Verify that. // Get the last line of the log. - std::ifstream log (fullPath.c_str()); + std::ifstream logStream (fullPath.c_str()); std::string lastLine; - for (std::string line; std::getline (log, line); ) + for (std::string line; std::getline (logStream, line); ) { if (! line.empty()) lastLine = std::move (line); @@ -1024,9 +1024,9 @@ public: // Verify that. // Get the last line of the log. - std::ifstream log (fullPath.c_str()); + std::ifstream logStream (fullPath.c_str()); std::string lastLine; - for (std::string line; std::getline (log, line); ) + for (std::string line; std::getline (logStream, line); ) { if (! line.empty()) lastLine = std::move (line); diff --git a/src/test/basics/contract_test.cpp b/src/test/basics/contract_test.cpp index 24b7e30d4..928ac8718 100644 --- a/src/test/basics/contract_test.cpp +++ b/src/test/basics/contract_test.cpp @@ -32,17 +32,17 @@ public: { Throw("Throw test"); } - catch (std::runtime_error const& e) + catch (std::runtime_error const& e1) { - BEAST_EXPECT(std::string(e.what()) == "Throw test"); + BEAST_EXPECT(std::string(e1.what()) == "Throw test"); try { Rethrow(); } - catch (std::runtime_error const& e) + catch (std::runtime_error const& e2) { - BEAST_EXPECT(std::string(e.what()) == "Throw test"); + BEAST_EXPECT(std::string(e2.what()) == "Throw test"); } catch (...) { diff --git a/src/test/beast/IPEndpoint_test.cpp b/src/test/beast/IPEndpoint_test.cpp index 29fe2e241..882cc7467 100644 --- a/src/test/beast/IPEndpoint_test.cpp +++ b/src/test/beast/IPEndpoint_test.cpp @@ -66,12 +66,15 @@ public: testcase ("AddressV4"); BEAST_EXPECT(AddressV4{}.to_ulong() == 0); - BEAST_EXPECT(is_unspecified (AddressV4{})); + BEAST_EXPECT(is_unspecified(AddressV4{})); BEAST_EXPECT(AddressV4{0x01020304}.to_ulong() == 0x01020304); - AddressV4::bytes_type d = {{1,2,3,4}}; - BEAST_EXPECT(AddressV4{d}.to_ulong() == 0x01020304); - unexpected (is_unspecified (AddressV4{d})); + { + AddressV4::bytes_type d = {{1, 2, 3, 4}}; + BEAST_EXPECT(AddressV4{d}.to_ulong() == 0x01020304); + + unexpected(is_unspecified(AddressV4{d})); + } AddressV4 const v1 {1}; BEAST_EXPECT(AddressV4{v1}.to_ulong() == 1); diff --git a/src/test/consensus/LedgerTrie_test.cpp b/src/test/consensus/LedgerTrie_test.cpp index 8aa0f2ccf..dcc11136b 100644 --- a/src/test/consensus/LedgerTrie_test.cpp +++ b/src/test/consensus/LedgerTrie_test.cpp @@ -630,7 +630,7 @@ class LedgerTrie_test : public beast::unit_test::suite // from a branching history. // Ledgers have sequence 1,2,3,4 - std::uint32_t const depth = 4; + std::uint32_t const depthConst = 4; // Each ledger has 4 possible children std::uint32_t const width = 4; @@ -638,7 +638,7 @@ class LedgerTrie_test : public beast::unit_test::suite // Use explicit seed to have same results for CI std::mt19937 gen{42}; - std::uniform_int_distribution<> depthDist(0, depth - 1); + std::uniform_int_distribution<> depthDist(0, depthConst - 1); std::uniform_int_distribution<> widthDist(0, width - 1); std::uniform_int_distribution<> flip(0, 1); for (std::uint32_t i = 0; i < iterations; ++i) diff --git a/src/test/core/ClosureCounter_test.cpp b/src/test/core/ClosureCounter_test.cpp index bac109ab1..a9e4b7e6d 100644 --- a/src/test/core/ClosureCounter_test.cpp +++ b/src/test/core/ClosureCounter_test.cpp @@ -90,7 +90,7 @@ class ClosureCounter_test : public beast::unit_test::suite BEAST_EXPECT (sumCounter.count() == 0); // Make sure sumCounter.wrap works with a const lvalue closure. - auto const sum = [] (int i, int j) { return i + j; }; + auto const sum = [] (int ii, int jj) { return ii + jj; }; auto wrapped = sumCounter.wrap (sum); BEAST_EXPECT (sumCounter.count() == 1); @@ -142,9 +142,9 @@ class ClosureCounter_test : public beast::unit_test::suite } friend - TrackedString operator+(TrackedString const& str, char const* rhs) + TrackedString operator+(TrackedString const& s, char const* rhs) { - TrackedString ret {str}; + TrackedString ret {s}; ret.str += rhs; return ret; } diff --git a/src/test/core/Config_test.cpp b/src/test/core/Config_test.cpp index 92a271f24..cc35102a0 100644 --- a/src/test/core/Config_test.cpp +++ b/src/test/core/Config_test.cpp @@ -634,8 +634,8 @@ trustthesevalidators.gov vtg.validatorsFile (); std::ofstream o (vtg.validatorsFile ()); try { - Config c; - c.loadFromString (boost::str (cc % vtg.validatorsFile ())); + Config c2; + c2.loadFromString (boost::str (cc % vtg.validatorsFile ())); } catch (std::runtime_error& e) { error = e.what(); } diff --git a/src/test/csf/BasicNetwork.h b/src/test/csf/BasicNetwork.h index 6b8ee2089..3ead8a0e9 100644 --- a/src/test/csf/BasicNetwork.h +++ b/src/test/csf/BasicNetwork.h @@ -246,9 +246,11 @@ BasicNetwork::send(Peer const& from, Peer const& to, Function&& f) [ from, to, sent, f = std::forward(f), this ] { // only process if still connected and connection was // not broken since the message was sent - auto link = links_.edge(from, to); - if (link && link->established <= sent) + if (auto l = links_.edge(from, to); + l && l->established <= sent) + { f(); + } }); } diff --git a/src/test/csf/Peer.h b/src/test/csf/Peer.h index 349bcbd49..31734e5c2 100644 --- a/src/test/csf/Peer.h +++ b/src/test/csf/Peer.h @@ -145,9 +145,9 @@ struct Peer } boost::optional - acquire(Ledger::ID const & id) + acquire(Ledger::ID const & lId) { - if(Ledger const * ledger = p_.acquireLedger(id)) + if(Ledger const * ledger = p_.acquireLedger(lId)) return *ledger; return boost::none; } @@ -385,9 +385,11 @@ struct Peer Ledger const* acquireLedger(Ledger::ID const& ledgerID) { - auto it = ledgers.find(ledgerID); - if (it != ledgers.end()) + if (auto it = ledgers.find(ledgerID); + it != ledgers.end()) + { return &(it->second); + } // No peers if(net.links(this).empty()) @@ -410,8 +412,8 @@ struct Peer // Send a messsage to neighbors to find the ledger net.send( this, link.target, [ to = link.target, from = this, ledgerID ]() { - auto it = to->ledgers.find(ledgerID); - if (it != to->ledgers.end()) + if (auto it = to->ledgers.find(ledgerID); + it != to->ledgers.end()) { // if the ledger is found, send it back to the original // requesting peer where it is added to the available @@ -431,9 +433,11 @@ struct Peer TxSet const* acquireTxSet(TxSet::ID const& setId) { - auto it = txSets.find(setId); - if (it != txSets.end()) + if (auto it = txSets.find(setId); + it != txSets.end()) + { return &(it->second); + } // No peers if(net.links(this).empty()) @@ -455,8 +459,8 @@ struct Peer // Send a message to neighbors to find the tx set net.send( this, link.target, [ to = link.target, from = this, setId ]() { - auto it = to->txSets.find(setId); - if (it != to->txSets.end()) + if (auto it = to->txSets.find(setId); + it != to->txSets.end()) { // If the txSet is found, send it back to the original // requesting peer, where it is handled like a TxSet @@ -850,9 +854,9 @@ struct Peer } std::size_t - laggards(Ledger::Seq const seq, hash_set& trustedKeys) + laggards(Ledger::Seq const seq, hash_set& trusted) { - return validations.laggards(seq, trustedKeys); + return validations.laggards(seq, trusted); } bool diff --git a/src/test/csf/collectors.h b/src/test/csf/collectors.h index b340b38d2..e330a70d4 100644 --- a/src/test/csf/collectors.h +++ b/src/test/csf/collectors.h @@ -81,7 +81,7 @@ public: @param cs References to the collectors to call together */ - Collectors(Cs&... cs) : cs(std::tie(cs...)) + Collectors(Cs&... cs_) : cs(std::tie(cs_...)) { } diff --git a/src/test/json/json_value_test.cpp b/src/test/json/json_value_test.cpp index e587ce6d4..1917e4cfb 100644 --- a/src/test/json/json_value_test.cpp +++ b/src/test/json/json_value_test.cpp @@ -231,9 +231,9 @@ struct json_value_test : beast::unit_test::suite Json::Reader r; char const* s ("{\"array\":[{\"12\":23},{},null,false,0.5]}"); - auto countLines = [](std::string const & s) + auto countLines = [](std::string const & str) { - return 1 + std::count_if(s.begin(), s.end(), [](char c){ + return 1 + std::count_if(str.begin(), str.end(), [](char c){ return c == '\n'; }); }; diff --git a/src/test/jtx/impl/WSClient.cpp b/src/test/jtx/impl/WSClient.cpp index 03b00aab2..74b276e5f 100644 --- a/src/test/jtx/impl/WSClient.cpp +++ b/src/test/jtx/impl/WSClient.cpp @@ -190,9 +190,9 @@ public: } auto jv = findMsg(5s, - [&](Json::Value const& jv) + [&](Json::Value const& jval) { - return jv[jss::type] == jss::response; + return jval[jss::type] == jss::response; }); if (jv) { diff --git a/src/test/jtx/impl/multisign.cpp b/src/test/jtx/impl/multisign.cpp index e6ee1c152..1a441003e 100644 --- a/src/test/jtx/impl/multisign.cpp +++ b/src/test/jtx/impl/multisign.cpp @@ -77,20 +77,20 @@ void msig::operator()(Env& env, JTx& jt) const { auto const mySigners = signers; - jt.signer = [mySigners, &env](Env&, JTx& jt) + jt.signer = [mySigners, &env](Env&, JTx& jtx) { - jt[sfSigningPubKey.getJsonName()] = ""; + jtx[sfSigningPubKey.getJsonName()] = ""; boost::optional st; try { - st = parse(jt.jv); + st = parse(jtx.jv); } catch(parse_error const&) { - env.test.log << pretty(jt.jv) << std::endl; + env.test.log << pretty(jtx.jv) << std::endl; Rethrow(); } - auto& js = jt[sfSigners.getJsonName()]; + auto& js = jtx[sfSigners.getJsonName()]; js.resize(mySigners.size()); for(std::size_t i = 0; i < mySigners.size(); ++i) { diff --git a/src/test/jtx/impl/sig.cpp b/src/test/jtx/impl/sig.cpp index 04b546c31..1e7ea8003 100644 --- a/src/test/jtx/impl/sig.cpp +++ b/src/test/jtx/impl/sig.cpp @@ -34,9 +34,9 @@ sig::operator()(Env&, JTx& jt) const { // VFALCO Inefficient pre-C++14 auto const account = *account_; - jt.signer = [account](Env&, JTx& jt) + jt.signer = [account](Env&, JTx& jtx) { - jtx::sign(jt.jv, account); + jtx::sign(jtx.jv, account); }; } } diff --git a/src/test/ledger/View_test.cpp b/src/test/ledger/View_test.cpp index 5b1508b4b..a2d648808 100644 --- a/src/test/ledger/View_test.cpp +++ b/src/test/ledger/View_test.cpp @@ -301,9 +301,9 @@ class View_test BEAST_EXPECT(seq(v1.read(k(4))) == 5); { Sandbox v2(&v1); - auto s = v2.peek(k(3)); - seq(s, 6); - v2.update(s); + auto s2 = v2.peek(k(3)); + seq(s2, 6); + v2.update(s2); v2.erase(v2.peek(k(4))); BEAST_EXPECT(seq(v2.read(k(1))) == 1); BEAST_EXPECT(! v2.exists(k(2))); @@ -318,9 +318,9 @@ class View_test { Sandbox v2(&v1); - auto s = v2.peek(k(3)); - seq(s, 6); - v2.update(s); + auto s2 = v2.peek(k(3)); + seq(s2, 6); + v2.update(s2); v2.erase(v2.peek(k(4))); BEAST_EXPECT(seq(v2.read(k(1))) == 1); BEAST_EXPECT(! v2.exists(k(2))); diff --git a/src/test/nodestore/Backend_test.cpp b/src/test/nodestore/Backend_test.cpp index dd5c5716d..4455ec40c 100644 --- a/src/test/nodestore/Backend_test.cpp +++ b/src/test/nodestore/Backend_test.cpp @@ -36,7 +36,7 @@ public: void testBackend ( std::string const& type, std::uint64_t const seedValue, - int numObjectsToTest = 2000) + int numObjsToTest = 2000) { DummyScheduler scheduler; @@ -51,7 +51,7 @@ public: // Create a batch auto batch = createPredictableBatch ( - numObjectsToTest, rng()); + numObjsToTest, rng()); using namespace beast::severities; test::SuiteJournal journal ("Backend_test", *this); diff --git a/src/test/nodestore/Database_test.cpp b/src/test/nodestore/Database_test.cpp index bcc487c5e..ae38fd63e 100644 --- a/src/test/nodestore/Database_test.cpp +++ b/src/test/nodestore/Database_test.cpp @@ -94,7 +94,7 @@ public: void testNodeStore (std::string const& type, bool const testPersistence, std::int64_t const seedValue, - int numObjectsToTest = 2000) + int numObjsToTest = 2000) { DummyScheduler scheduler; RootStoppable parent ("TestRootStoppable"); @@ -112,7 +112,7 @@ public: // Create a batch auto batch = createPredictableBatch ( - numObjectsToTest, rng()); + numObjsToTest, rng()); { // Open the database diff --git a/src/test/protocol/STObject_test.cpp b/src/test/protocol/STObject_test.cpp index 95146a220..70f33af98 100644 --- a/src/test/protocol/STObject_test.cpp +++ b/src/test/protocol/STObject_test.cpp @@ -388,9 +388,9 @@ public: { testcase ("fields"); - auto const& sf1 = sfSequence; - auto const& sf2 = sfExpiration; - auto const& sf3 = sfQualityIn; + auto const& sf1Outer = sfSequence; + auto const& sf2Outer = sfExpiration; + auto const& sf3Outer = sfQualityIn; auto const& sf4 = sfSignature; auto const& sf5 = sfPublicKey; @@ -399,32 +399,32 @@ public: { auto const st = [&]() { - STObject st(sfGeneric); - st.setFieldU32(sf1, 1); - st.setFieldU32(sf2, 2); - return st; + STObject s(sfGeneric); + s.setFieldU32(sf1Outer, 1); + s.setFieldU32(sf2Outer, 2); + return s; }(); - BEAST_EXPECT(st[sf1] == 1); - BEAST_EXPECT(st[sf2] == 2); + BEAST_EXPECT(st[sf1Outer] == 1); + BEAST_EXPECT(st[sf2Outer] == 2); except([&]() - { st[sf3]; }); - BEAST_EXPECT(*st[~sf1] == 1); - BEAST_EXPECT(*st[~sf2] == 2); - BEAST_EXPECT(st[~sf3] == boost::none); - BEAST_EXPECT(!! st[~sf1]); - BEAST_EXPECT(!! st[~sf2]); - BEAST_EXPECT(! st[~sf3]); - BEAST_EXPECT(st[sf1] != st[sf2]); - BEAST_EXPECT(st[~sf1] != st[~sf2]); + { st[sf3Outer]; }); + BEAST_EXPECT(*st[~sf1Outer] == 1); + BEAST_EXPECT(*st[~sf2Outer] == 2); + BEAST_EXPECT(st[~sf3Outer] == boost::none); + BEAST_EXPECT(!! st[~sf1Outer]); + BEAST_EXPECT(!! st[~sf2Outer]); + BEAST_EXPECT(! st[~sf3Outer]); + BEAST_EXPECT(st[sf1Outer] != st[sf2Outer]); + BEAST_EXPECT(st[~sf1Outer] != st[~sf2Outer]); } // read templated object - SOTemplate const sot + SOTemplate const sotOuter { - { sf1, soeREQUIRED }, - { sf2, soeOPTIONAL }, - { sf3, soeDEFAULT }, + { sf1Outer, soeREQUIRED }, + { sf2Outer, soeOPTIONAL }, + { sf3Outer, soeDEFAULT }, { sf4, soeOPTIONAL }, { sf5, soeDEFAULT }, }; @@ -432,122 +432,122 @@ public: { auto const st = [&]() { - STObject st(sot, sfGeneric); - st.setFieldU32(sf1, 1); - st.setFieldU32(sf2, 2); - return st; + STObject s(sotOuter, sfGeneric); + s.setFieldU32(sf1Outer, 1); + s.setFieldU32(sf2Outer, 2); + return s; }(); - BEAST_EXPECT(st[sf1] == 1); - BEAST_EXPECT(st[sf2] == 2); - BEAST_EXPECT(st[sf3] == 0); - BEAST_EXPECT(*st[~sf1] == 1); - BEAST_EXPECT(*st[~sf2] == 2); - BEAST_EXPECT(*st[~sf3] == 0); - BEAST_EXPECT(!! st[~sf1]); - BEAST_EXPECT(!! st[~sf2]); - BEAST_EXPECT(!! st[~sf3]); + BEAST_EXPECT(st[sf1Outer] == 1); + BEAST_EXPECT(st[sf2Outer] == 2); + BEAST_EXPECT(st[sf3Outer] == 0); + BEAST_EXPECT(*st[~sf1Outer] == 1); + BEAST_EXPECT(*st[~sf2Outer] == 2); + BEAST_EXPECT(*st[~sf3Outer] == 0); + BEAST_EXPECT(!! st[~sf1Outer]); + BEAST_EXPECT(!! st[~sf2Outer]); + BEAST_EXPECT(!! st[~sf3Outer]); } // write free object { STObject st(sfGeneric); - unexcept([&]() { st[sf1]; }); - except([&](){ return st[sf1] == 0; }); - BEAST_EXPECT(st[~sf1] == boost::none); - BEAST_EXPECT(st[~sf1] == boost::optional{}); - BEAST_EXPECT(st[~sf1] != boost::optional(1)); - BEAST_EXPECT(! st[~sf1]); - st[sf1] = 2; - BEAST_EXPECT(st[sf1] == 2); - BEAST_EXPECT(st[~sf1] != boost::none); - BEAST_EXPECT(st[~sf1] == boost::optional(2)); - BEAST_EXPECT(!! st[~sf1]); - st[sf1] = 1; - BEAST_EXPECT(st[sf1] == 1); - BEAST_EXPECT(!! st[sf1]); - BEAST_EXPECT(!! st[~sf1]); - st[sf1] = 0; - BEAST_EXPECT(! st[sf1]); - BEAST_EXPECT(!! st[~sf1]); - st[~sf1] = boost::none; - BEAST_EXPECT(! st[~sf1]); - BEAST_EXPECT(st[~sf1] == boost::none); - BEAST_EXPECT(st[~sf1] == boost::optional{}); - st[~sf1] = boost::none; - BEAST_EXPECT(! st[~sf1]); - except([&]() { return st[sf1] == 0; }); - except([&]() { return *st[~sf1]; }); - st[sf1] = 1; - BEAST_EXPECT(st[sf1] == 1); - BEAST_EXPECT(!! st[sf1]); - BEAST_EXPECT(!! st[~sf1]); - st[sf1] = 3; - st[sf2] = st[sf1]; - BEAST_EXPECT(st[sf1] == 3); - BEAST_EXPECT(st[sf2] == 3); - BEAST_EXPECT(st[sf2] == st[sf1]); - st[sf1] = 4; - st[sf2] = st[sf1]; - BEAST_EXPECT(st[sf1] == 4); - BEAST_EXPECT(st[sf2] == 4); - BEAST_EXPECT(st[sf2] == st[sf1]); + unexcept([&]() { st[sf1Outer]; }); + except([&](){ return st[sf1Outer] == 0; }); + BEAST_EXPECT(st[~sf1Outer] == boost::none); + BEAST_EXPECT(st[~sf1Outer] == boost::optional{}); + BEAST_EXPECT(st[~sf1Outer] != boost::optional(1)); + BEAST_EXPECT(! st[~sf1Outer]); + st[sf1Outer] = 2; + BEAST_EXPECT(st[sf1Outer] == 2); + BEAST_EXPECT(st[~sf1Outer] != boost::none); + BEAST_EXPECT(st[~sf1Outer] == boost::optional(2)); + BEAST_EXPECT(!! st[~sf1Outer]); + st[sf1Outer] = 1; + BEAST_EXPECT(st[sf1Outer] == 1); + BEAST_EXPECT(!! st[sf1Outer]); + BEAST_EXPECT(!! st[~sf1Outer]); + st[sf1Outer] = 0; + BEAST_EXPECT(! st[sf1Outer]); + BEAST_EXPECT(!! st[~sf1Outer]); + st[~sf1Outer] = boost::none; + BEAST_EXPECT(! st[~sf1Outer]); + BEAST_EXPECT(st[~sf1Outer] == boost::none); + BEAST_EXPECT(st[~sf1Outer] == boost::optional{}); + st[~sf1Outer] = boost::none; + BEAST_EXPECT(! st[~sf1Outer]); + except([&]() { return st[sf1Outer] == 0; }); + except([&]() { return *st[~sf1Outer]; }); + st[sf1Outer] = 1; + BEAST_EXPECT(st[sf1Outer] == 1); + BEAST_EXPECT(!! st[sf1Outer]); + BEAST_EXPECT(!! st[~sf1Outer]); + st[sf1Outer] = 3; + st[sf2Outer] = st[sf1Outer]; + BEAST_EXPECT(st[sf1Outer] == 3); + BEAST_EXPECT(st[sf2Outer] == 3); + BEAST_EXPECT(st[sf2Outer] == st[sf1Outer]); + st[sf1Outer] = 4; + st[sf2Outer] = st[sf1Outer]; + BEAST_EXPECT(st[sf1Outer] == 4); + BEAST_EXPECT(st[sf2Outer] == 4); + BEAST_EXPECT(st[sf2Outer] == st[sf1Outer]); } // Write templated object { - STObject st(sot, sfGeneric); - BEAST_EXPECT(!! st[~sf1]); - BEAST_EXPECT(st[~sf1] != boost::none); - BEAST_EXPECT(st[sf1] == 0); - BEAST_EXPECT(*st[~sf1] == 0); - BEAST_EXPECT(! st[~sf2]); - BEAST_EXPECT(st[~sf2] == boost::none); - except([&]() { return st[sf2] == 0; }); - BEAST_EXPECT(!! st[~sf3]); - BEAST_EXPECT(st[~sf3] != boost::none); - BEAST_EXPECT(st[sf3] == 0); - except([&]() { st[~sf1] = boost::none; }); - st[sf1] = 1; - BEAST_EXPECT(st[sf1] == 1); - BEAST_EXPECT(*st[~sf1] == 1); - BEAST_EXPECT(!! st[~sf1]); - st[sf1] = 0; - BEAST_EXPECT(st[sf1] == 0); - BEAST_EXPECT(*st[~sf1] == 0); - BEAST_EXPECT(!! st[~sf1]); - st[sf2] = 2; - BEAST_EXPECT(st[sf2] == 2); - BEAST_EXPECT(*st[~sf2] == 2); - BEAST_EXPECT(!! st[~sf2]); - st[~sf2] = boost::none; - except([&]() { return *st[~sf2]; }); - BEAST_EXPECT(! st[~sf2]); - st[sf3] = 3; - BEAST_EXPECT(st[sf3] == 3); - BEAST_EXPECT(*st[~sf3] == 3); - BEAST_EXPECT(!! st[~sf3]); - st[sf3] = 2; - BEAST_EXPECT(st[sf3] == 2); - BEAST_EXPECT(*st[~sf3] == 2); - BEAST_EXPECT(!! st[~sf3]); - st[sf3] = 0; - BEAST_EXPECT(st[sf3] == 0); - BEAST_EXPECT(*st[~sf3] == 0); - BEAST_EXPECT(!! st[~sf3]); - except([&]() { st[~sf3] = boost::none; }); - BEAST_EXPECT(st[sf3] == 0); - BEAST_EXPECT(*st[~sf3] == 0); - BEAST_EXPECT(!! st[~sf3]); + STObject st(sotOuter, sfGeneric); + BEAST_EXPECT(!! st[~sf1Outer]); + BEAST_EXPECT(st[~sf1Outer] != boost::none); + BEAST_EXPECT(st[sf1Outer] == 0); + BEAST_EXPECT(*st[~sf1Outer] == 0); + BEAST_EXPECT(! st[~sf2Outer]); + BEAST_EXPECT(st[~sf2Outer] == boost::none); + except([&]() { return st[sf2Outer] == 0; }); + BEAST_EXPECT(!! st[~sf3Outer]); + BEAST_EXPECT(st[~sf3Outer] != boost::none); + BEAST_EXPECT(st[sf3Outer] == 0); + except([&]() { st[~sf1Outer] = boost::none; }); + st[sf1Outer] = 1; + BEAST_EXPECT(st[sf1Outer] == 1); + BEAST_EXPECT(*st[~sf1Outer] == 1); + BEAST_EXPECT(!! st[~sf1Outer]); + st[sf1Outer] = 0; + BEAST_EXPECT(st[sf1Outer] == 0); + BEAST_EXPECT(*st[~sf1Outer] == 0); + BEAST_EXPECT(!! st[~sf1Outer]); + st[sf2Outer] = 2; + BEAST_EXPECT(st[sf2Outer] == 2); + BEAST_EXPECT(*st[~sf2Outer] == 2); + BEAST_EXPECT(!! st[~sf2Outer]); + st[~sf2Outer] = boost::none; + except([&]() { return *st[~sf2Outer]; }); + BEAST_EXPECT(! st[~sf2Outer]); + st[sf3Outer] = 3; + BEAST_EXPECT(st[sf3Outer] == 3); + BEAST_EXPECT(*st[~sf3Outer] == 3); + BEAST_EXPECT(!! st[~sf3Outer]); + st[sf3Outer] = 2; + BEAST_EXPECT(st[sf3Outer] == 2); + BEAST_EXPECT(*st[~sf3Outer] == 2); + BEAST_EXPECT(!! st[~sf3Outer]); + st[sf3Outer] = 0; + BEAST_EXPECT(st[sf3Outer] == 0); + BEAST_EXPECT(*st[~sf3Outer] == 0); + BEAST_EXPECT(!! st[~sf3Outer]); + except([&]() { st[~sf3Outer] = boost::none; }); + BEAST_EXPECT(st[sf3Outer] == 0); + BEAST_EXPECT(*st[~sf3Outer] == 0); + BEAST_EXPECT(!! st[~sf3Outer]); } // coercion operator to boost::optional { STObject st(sfGeneric); - auto const v = ~st[~sf1]; + auto const v = ~st[~sf1Outer]; static_assert(std::is_same< std::decay_t, boost::optional>::value, ""); @@ -586,7 +586,7 @@ public: BEAST_EXPECT(Slice(st[sf5]).size() == 2); } { - STObject st(sot, sfGeneric); + STObject st(sotOuter, sfGeneric); BEAST_EXPECT(st[sf5] == Slice{}); BEAST_EXPECT(!! st[~sf5]); BEAST_EXPECT(!! ~st[~sf5]); diff --git a/src/test/protocol/TER_test.cpp b/src/test/protocol/TER_test.cpp index 7bb40baac..54ab61089 100644 --- a/src/test/protocol/TER_test.cpp +++ b/src/test/protocol/TER_test.cpp @@ -91,32 +91,32 @@ struct TER_test : public beast::unit_test::suite template class Func, typename Tup> std::enable_if_t - testIterate (Tup const& tup, beast::unit_test::suite& suite) + testIterate (Tup const& tup, beast::unit_test::suite& s) { Func func; - func (tup, suite); - testIterate(tup, suite); + func (tup, s); + testIterate(tup, s); } // Slow iteration over the tuple. template class Func, typename Tup> std::enable_if_t - testIterate (Tup const& tup, beast::unit_test::suite& suite) + testIterate (Tup const& tup, beast::unit_test::suite& s) { Func func; - func (tup, suite); - testIterate::value - 1, I2 - 1, Func>(tup, suite); + func (tup, s); + testIterate::value - 1, I2 - 1, Func>(tup, s); } // Finish iteration over the tuple. template class Func, typename Tup> std::enable_if_t - testIterate (Tup const& tup, beast::unit_test::suite& suite) + testIterate (Tup const& tup, beast::unit_test::suite& s) { Func func; - func (tup, suite); + func (tup, s); } void testConversion() @@ -200,7 +200,7 @@ struct TER_test : public beast::unit_test::suite { public: template - void operator()(Tup const& tup, beast::unit_test::suite& suite) const + void operator()(Tup const& tup, beast::unit_test::suite& s) const { // All entries in the tuple should be comparable one to the other. auto const lhs = std::get(tup); @@ -226,12 +226,12 @@ struct TER_test : public beast::unit_test::suite // Make sure a sampling of TER types exhibit the expected behavior // for all comparison operators. - suite.expect ((lhs == rhs) == (TERtoInt (lhs) == TERtoInt (rhs))); - suite.expect ((lhs != rhs) == (TERtoInt (lhs) != TERtoInt (rhs))); - suite.expect ((lhs < rhs) == (TERtoInt (lhs) < TERtoInt (rhs))); - suite.expect ((lhs <= rhs) == (TERtoInt (lhs) <= TERtoInt (rhs))); - suite.expect ((lhs > rhs) == (TERtoInt (lhs) > TERtoInt (rhs))); - suite.expect ((lhs >= rhs) == (TERtoInt (lhs) >= TERtoInt (rhs))); + s.expect ((lhs == rhs) == (TERtoInt (lhs) == TERtoInt (rhs))); + s.expect ((lhs != rhs) == (TERtoInt (lhs) != TERtoInt (rhs))); + s.expect ((lhs < rhs) == (TERtoInt (lhs) < TERtoInt (rhs))); + s.expect ((lhs <= rhs) == (TERtoInt (lhs) <= TERtoInt (rhs))); + s.expect ((lhs > rhs) == (TERtoInt (lhs) > TERtoInt (rhs))); + s.expect ((lhs >= rhs) == (TERtoInt (lhs) >= TERtoInt (rhs))); } }; diff --git a/src/test/rpc/AccountOffers_test.cpp b/src/test/rpc/AccountOffers_test.cpp index 228331030..b69621280 100644 --- a/src/test/rpc/AccountOffers_test.cpp +++ b/src/test/rpc/AccountOffers_test.cpp @@ -103,26 +103,26 @@ public: env(offer(bob, XRP(10), USD_gw(2))); // make the RPC call - auto const jro = env.rpc("account_offers", bob.human())[jss::result][jss::offers]; - if(BEAST_EXPECT(checkArraySize(jro, 3u))) + auto const jroOuter = env.rpc("account_offers", bob.human())[jss::result][jss::offers]; + if(BEAST_EXPECT(checkArraySize(jroOuter, 3u))) { - BEAST_EXPECT(jro[0u][jss::quality] == "100000000"); - BEAST_EXPECT(jro[0u][jss::taker_gets][jss::currency] == "USD"); - BEAST_EXPECT(jro[0u][jss::taker_gets][jss::issuer] == gw.human()); - BEAST_EXPECT(jro[0u][jss::taker_gets][jss::value] == "1"); - BEAST_EXPECT(jro[0u][jss::taker_pays] == "100000000"); + BEAST_EXPECT(jroOuter[0u][jss::quality] == "100000000"); + BEAST_EXPECT(jroOuter[0u][jss::taker_gets][jss::currency] == "USD"); + BEAST_EXPECT(jroOuter[0u][jss::taker_gets][jss::issuer] == gw.human()); + BEAST_EXPECT(jroOuter[0u][jss::taker_gets][jss::value] == "1"); + BEAST_EXPECT(jroOuter[0u][jss::taker_pays] == "100000000"); - BEAST_EXPECT(jro[1u][jss::quality] == "5000000"); - BEAST_EXPECT(jro[1u][jss::taker_gets][jss::currency] == "USD"); - BEAST_EXPECT(jro[1u][jss::taker_gets][jss::issuer] == gw.human()); - BEAST_EXPECT(jro[1u][jss::taker_gets][jss::value] == "2"); - BEAST_EXPECT(jro[1u][jss::taker_pays] == "10000000"); + BEAST_EXPECT(jroOuter[1u][jss::quality] == "5000000"); + BEAST_EXPECT(jroOuter[1u][jss::taker_gets][jss::currency] == "USD"); + BEAST_EXPECT(jroOuter[1u][jss::taker_gets][jss::issuer] == gw.human()); + BEAST_EXPECT(jroOuter[1u][jss::taker_gets][jss::value] == "2"); + BEAST_EXPECT(jroOuter[1u][jss::taker_pays] == "10000000"); - BEAST_EXPECT(jro[2u][jss::quality] == "100000000"); - BEAST_EXPECT(jro[2u][jss::taker_gets][jss::currency] == "USD"); - BEAST_EXPECT(jro[2u][jss::taker_gets][jss::issuer] == bob.human()); - BEAST_EXPECT(jro[2u][jss::taker_gets][jss::value] == "1"); - BEAST_EXPECT(jro[2u][jss::taker_pays] == "100000000"); + BEAST_EXPECT(jroOuter[2u][jss::quality] == "100000000"); + BEAST_EXPECT(jroOuter[2u][jss::taker_gets][jss::currency] == "USD"); + BEAST_EXPECT(jroOuter[2u][jss::taker_gets][jss::issuer] == bob.human()); + BEAST_EXPECT(jroOuter[2u][jss::taker_gets][jss::value] == "1"); + BEAST_EXPECT(jroOuter[2u][jss::taker_pays] == "100000000"); } { @@ -141,7 +141,7 @@ public: BEAST_EXPECT(asAdmin ? checkMarker(jrr_l_1) : (! jrr_l_1.isMember(jss::marker))); if (asAdmin) { - BEAST_EXPECT(jro[0u] == jro_l_1[0u]); + BEAST_EXPECT(jroOuter[0u] == jro_l_1[0u]); // second item...with previous marker passed jvParams[jss::marker] = jrr_l_1[jss::marker]; @@ -149,7 +149,7 @@ public: auto const& jro_l_2 = jrr_l_2[jss::offers]; BEAST_EXPECT(checkMarker(jrr_l_2)); BEAST_EXPECT(checkArraySize(jro_l_2, 1u)); - BEAST_EXPECT(jro[1u] == jro_l_2[0u]); + BEAST_EXPECT(jroOuter[1u] == jro_l_2[0u]); // last item...with previous marker passed jvParams[jss::marker] = jrr_l_2[jss::marker]; @@ -157,11 +157,11 @@ public: auto const& jro_l_3 = jrr_l_3[jss::offers]; BEAST_EXPECT(! jrr_l_3.isMember(jss::marker)); BEAST_EXPECT(checkArraySize(jro_l_3, 1u)); - BEAST_EXPECT(jro[2u] == jro_l_3[0u]); + BEAST_EXPECT(jroOuter[2u] == jro_l_3[0u]); } else { - BEAST_EXPECT(jro == jro_l_1); + BEAST_EXPECT(jroOuter == jro_l_1); } } diff --git a/src/test/rpc/Book_test.cpp b/src/test/rpc/Book_test.cpp index 749252b0d..466383a41 100644 --- a/src/test/rpc/Book_test.cpp +++ b/src/test/rpc/Book_test.cpp @@ -1053,9 +1053,9 @@ public: using namespace std::chrono_literals; BEAST_EXPECT(wsc->findMsg(5s, - [&](auto const& jv) + [&](auto const& jval) { - auto const& t = jv[jss::transaction]; + auto const& t = jval[jss::transaction]; return t[jss::TransactionType] == jss::OfferCreate && t[jss::TakerGets] == USD(10).value().getJson(JsonOptions::none) && @@ -1068,9 +1068,9 @@ public: env.close(); BEAST_EXPECT(wsc->findMsg(5s, - [&](auto const& jv) + [&](auto const& jval) { - auto const& t = jv[jss::transaction]; + auto const& t = jval[jss::transaction]; return t[jss::TransactionType] == jss::OfferCreate && t[jss::TakerGets] == USD(5).value().getJson(JsonOptions::none) && diff --git a/src/test/rpc/JSONRPC_test.cpp b/src/test/rpc/JSONRPC_test.cpp index 4f5efaf50..a5bfa758c 100644 --- a/src/test/rpc/JSONRPC_test.cpp +++ b/src/test/rpc/JSONRPC_test.cpp @@ -2023,7 +2023,7 @@ public: .set("minimum_txn_in_ledger_standalone", "3"); return cfg; })}; - LoadFeeTrack const& feeTrack = env.app().getFeeTrack(); + LoadFeeTrack const& feeTrackOuter = env.app().getFeeTrack(); { // high mult, no tx @@ -2034,7 +2034,7 @@ public: })", req); Json::Value result = checkFee (req, Role::ADMIN, true, - env.app().config(), feeTrack, + env.app().config(), feeTrackOuter, env.app().getTxQ(), env.current()); BEAST_EXPECT(! RPC::contains_error (result)); @@ -2051,7 +2051,7 @@ public: })", req); Json::Value result = checkFee(req, Role::ADMIN, true, - env.app().config(), feeTrack, + env.app().config(), feeTrackOuter, env.app().getTxQ(), env.current()); BEAST_EXPECT(!RPC::contains_error(result)); @@ -2074,7 +2074,7 @@ public: })", req); Json::Value result = checkFee(req, Role::ADMIN, true, - env.app().config(), feeTrack, + env.app().config(), feeTrackOuter, env.app().getTxQ(), env.current()); BEAST_EXPECT(!RPC::contains_error(result)); @@ -2091,7 +2091,7 @@ public: })", req); Json::Value result = checkFee(req, Role::ADMIN, true, - env.app().config(), feeTrack, + env.app().config(), feeTrackOuter, env.app().getTxQ(), env.current()); BEAST_EXPECT(RPC::contains_error(result)); @@ -2108,7 +2108,7 @@ public: })", req); Json::Value result = checkFee(req, Role::ADMIN, true, - env.app().config(), feeTrack, + env.app().config(), feeTrackOuter, env.app().getTxQ(), env.current()); BEAST_EXPECT(RPC::contains_error(result)); @@ -2125,7 +2125,7 @@ public: })", req); Json::Value result = checkFee(req, Role::ADMIN, true, - env.app().config(), feeTrack, + env.app().config(), feeTrackOuter, env.app().getTxQ(), env.current()); BEAST_EXPECT(!RPC::contains_error(result)); @@ -2142,7 +2142,7 @@ public: })", req); Json::Value result = checkFee(req, Role::ADMIN, true, - env.app().config(), feeTrack, + env.app().config(), feeTrackOuter, env.app().getTxQ(), env.current()); BEAST_EXPECT(RPC::contains_error(result)); @@ -2157,7 +2157,7 @@ public: })", req); Json::Value result = checkFee(req, Role::ADMIN, true, - env.app().config(), feeTrack, + env.app().config(), feeTrackOuter, env.app().getTxQ(), env.current()); BEAST_EXPECT(RPC::contains_error(result)); @@ -2173,7 +2173,7 @@ public: })", req); Json::Value result = checkFee(req, Role::ADMIN, true, - env.app().config(), feeTrack, + env.app().config(), feeTrackOuter, env.app().getTxQ(), env.current()); BEAST_EXPECT(RPC::contains_error(result)); @@ -2253,7 +2253,7 @@ public: { // Call "sign" with higher server load and // enough transactions to escalate the fee - BEAST_EXPECT(feeTrack.getLoadFactor() == 1220); + BEAST_EXPECT(feeTrackOuter.getLoadFactor() == 1220); for (;;) { diff --git a/src/test/rpc/LedgerData_test.cpp b/src/test/rpc/LedgerData_test.cpp index 8aa3b77e2..bd816a1da 100644 --- a/src/test/rpc/LedgerData_test.cpp +++ b/src/test/rpc/LedgerData_test.cpp @@ -64,13 +64,17 @@ public: Json::Value jvParams; jvParams[jss::ledger_index] = "current"; jvParams[jss::binary] = false; - auto const jrr = env.rpc ( "json", "ledger_data", - boost::lexical_cast(jvParams)) [jss::result]; - BEAST_EXPECT( - jrr[jss::ledger_current_index].isIntegral() && - jrr[jss::ledger_current_index].asInt() > 0 ); - BEAST_EXPECT( checkMarker(jrr) ); - BEAST_EXPECT( checkArraySize(jrr[jss::state], max_limit) ); + { + auto const jrr = env.rpc( + "json", + "ledger_data", + boost::lexical_cast(jvParams))[jss::result]; + BEAST_EXPECT( + jrr[jss::ledger_current_index].isIntegral() && + jrr[jss::ledger_current_index].asInt() > 0); + BEAST_EXPECT(checkMarker(jrr)); + BEAST_EXPECT(checkArraySize(jrr[jss::state], max_limit)); + } // check limits values around the max_limit (+/- 1) for (auto delta = -1; delta <= 1; delta++) diff --git a/src/test/rpc/LedgerRequestRPC_test.cpp b/src/test/rpc/LedgerRequestRPC_test.cpp index 52cd1b101..71bc0b9d3 100644 --- a/src/test/rpc/LedgerRequestRPC_test.cpp +++ b/src/test/rpc/LedgerRequestRPC_test.cpp @@ -99,14 +99,13 @@ public: [jss::ledger][jss::ledger_hash].asString(); { - // Intentionally shadow `result` here to avoid reuing it. - auto const result = env.rpc("ledger_request", ledgerHash); - BEAST_EXPECT(!RPC::contains_error(result[jss::result]) && - result[jss::result][jss::ledger_index] == 3 && - result[jss::result].isMember(jss::ledger)); - BEAST_EXPECT(result[jss::result][jss::ledger]. + auto const r = env.rpc("ledger_request", ledgerHash); + BEAST_EXPECT(!RPC::contains_error(r[jss::result]) && + r[jss::result][jss::ledger_index] == 3 && + r[jss::result].isMember(jss::ledger)); + BEAST_EXPECT(r[jss::result][jss::ledger]. isMember(jss::ledger_hash) && - result[jss::result][jss::ledger] + r[jss::result][jss::ledger] [jss::ledger_hash] == ledgerHash); } } diff --git a/src/test/rpc/NoRippleCheck_test.cpp b/src/test/rpc/NoRippleCheck_test.cpp index a128cf102..b28aeeb8a 100644 --- a/src/test/rpc/NoRippleCheck_test.cpp +++ b/src/test/rpc/NoRippleCheck_test.cpp @@ -273,9 +273,9 @@ class NoRippleCheckLimits_test : public beast::unit_test::suite // if we go above the warning threshold, reset if (c.balance() > warningThreshold) { - using clock_type = beast::abstract_clock ; + using ct = beast::abstract_clock ; c.entry().local_balance = - DecayingSample + DecayingSample {steady_clock::now()}; } }; diff --git a/src/test/rpc/NoRipple_test.cpp b/src/test/rpc/NoRipple_test.cpp index c6a451d11..c65abe170 100644 --- a/src/test/rpc/NoRipple_test.cpp +++ b/src/test/rpc/NoRipple_test.cpp @@ -125,9 +125,9 @@ public: { Json::Value jv; jv[jss::account] = acct.human(); - auto const resp = + auto const r = env.rpc("json", "account_lines", to_string(jv)); - return resp[jss::result][jss::lines]; + return r[jss::result][jss::lines]; }; { auto const aliceLines = getAccountLines (alice); diff --git a/src/test/rpc/RobustTransaction_test.cpp b/src/test/rpc/RobustTransaction_test.cpp index f3dc43c08..7a37cb13a 100644 --- a/src/test/rpc/RobustTransaction_test.cpp +++ b/src/test/rpc/RobustTransaction_test.cpp @@ -299,9 +299,9 @@ public: env.app().getJobQueue().rendezvous(); BEAST_EXPECT(wsc->findMsg(5s, - [&](auto const& jv) + [&](auto const& jval) { - return jv[jss::type] == "ledgerClosed"; + return jval[jss::type] == "ledgerClosed"; })); } @@ -356,9 +356,9 @@ public: env.app().getJobQueue().rendezvous(); BEAST_EXPECT(wsc->findMsg(5s, - [&](auto const& jv) + [&](auto const& jval) { - return jv[jss::type] == "ledgerClosed"; + return jval[jss::type] == "ledgerClosed"; })); }