ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix shadowing variables

Browse Source
This commit is contained in:
seelabs
2019-08-13 14:26:02 -07:00
parent 014df67fed
commit b9e73b4852
55 changed files with 460 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/test/rpc/AccountOffers_test.cpp
View File

@@ -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);
}
}

8
src/test/rpc/Book_test.cpp
View File

@@ -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) &&

22
src/test/rpc/JSONRPC_test.cpp
View File

@@ -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 (;;)
{

18
src/test/rpc/LedgerData_test.cpp
View File

@@ -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<std::string>(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<std::string>(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++)

13
src/test/rpc/LedgerRequestRPC_test.cpp
View File

@@ -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);
}
}

4
src/test/rpc/NoRippleCheck_test.cpp
View File

@@ -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 <steady_clock>;
using ct = beast::abstract_clock <steady_clock>;
c.entry().local_balance =
DecayingSample <decayWindowSeconds, clock_type>
DecayingSample <decayWindowSeconds, ct>
{steady_clock::now()};
}
};

4
src/test/rpc/NoRipple_test.cpp
View File

@@ -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);

8
src/test/rpc/RobustTransaction_test.cpp
View File

@@ -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";
}));
}