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

240
src/test/protocol/STObject_test.cpp
View File

@@ -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<STObject::FieldErr>([&]()
{ 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<std::uint32_t>{});
BEAST_EXPECT(st[~sf1] != boost::optional<std::uint32_t>(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<std::uint32_t>(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<std::uint32_t>{});
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<std::uint32_t>{});
BEAST_EXPECT(st[~sf1Outer] != boost::optional<std::uint32_t>(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<std::uint32_t>(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<std::uint32_t>{});
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<decltype(v)>,
boost::optional<std::uint32_t>>::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]);

30
src/test/protocol/TER_test.cpp
View File

@@ -91,32 +91,32 @@ struct TER_test : public beast::unit_test::suite
template<std::size_t I1, std::size_t I2,
template<std::size_t, std::size_t> class Func, typename Tup>
std::enable_if_t<I1 != 0>
testIterate (Tup const& tup, beast::unit_test::suite& suite)
testIterate (Tup const& tup, beast::unit_test::suite& s)
{
Func<I1, I2> func;
func (tup, suite);
testIterate<I1 - 1, I2, Func>(tup, suite);
func (tup, s);
testIterate<I1 - 1, I2, Func>(tup, s);
}
// Slow iteration over the tuple.
template<std::size_t I1, std::size_t I2,
template<std::size_t, std::size_t> class Func, typename Tup>
std::enable_if_t<I1 == 0 && I2 != 0>
testIterate (Tup const& tup, beast::unit_test::suite& suite)
testIterate (Tup const& tup, beast::unit_test::suite& s)
{
Func<I1, I2> func;
func (tup, suite);
testIterate<std::tuple_size<Tup>::value - 1, I2 - 1, Func>(tup, suite);
func (tup, s);
testIterate<std::tuple_size<Tup>::value - 1, I2 - 1, Func>(tup, s);
}
// Finish iteration over the tuple.
template<std::size_t I1, std::size_t I2,
template<std::size_t, std::size_t> class Func, typename Tup>
std::enable_if_t<I1 == 0 && I2 == 0>
testIterate (Tup const& tup, beast::unit_test::suite& suite)
testIterate (Tup const& tup, beast::unit_test::suite& s)
{
Func<I1, I2> func;
func (tup, suite);
func (tup, s);
}
void testConversion()
@@ -200,7 +200,7 @@ struct TER_test : public beast::unit_test::suite
{
public:
template<typename Tup>
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<I1>(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)));
}
};