ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +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

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