mirror of
https://github.com/XRPLF/rippled.git
synced 2026-06-05 09:46:53 +00:00
Merge branch 'develop' into ximinez/lending-shortages
This commit is contained in:
@@ -507,7 +507,7 @@ port_wss_admin
|
||||
{
|
||||
c.loadFromString(boost::str(configTemplate % validationSeed % token));
|
||||
}
|
||||
catch (std::runtime_error& e)
|
||||
catch (std::runtime_error const& e)
|
||||
{
|
||||
error = e.what();
|
||||
}
|
||||
@@ -528,7 +528,7 @@ port_wss_admin
|
||||
main
|
||||
)xrpldConfig");
|
||||
}
|
||||
catch (std::runtime_error& e)
|
||||
catch (std::runtime_error const& e)
|
||||
{
|
||||
error = e.what();
|
||||
}
|
||||
@@ -541,7 +541,7 @@ main
|
||||
c.loadFromString(R"xrpldConfig(
|
||||
)xrpldConfig");
|
||||
}
|
||||
catch (std::runtime_error& e)
|
||||
catch (std::runtime_error const& e)
|
||||
{
|
||||
error = e.what();
|
||||
}
|
||||
@@ -556,7 +556,7 @@ main
|
||||
255
|
||||
)xrpldConfig");
|
||||
}
|
||||
catch (std::runtime_error& e)
|
||||
catch (std::runtime_error const& e)
|
||||
{
|
||||
error = e.what();
|
||||
}
|
||||
@@ -571,7 +571,7 @@ main
|
||||
10000
|
||||
)xrpldConfig");
|
||||
}
|
||||
catch (std::runtime_error& e)
|
||||
catch (std::runtime_error const& e)
|
||||
{
|
||||
error = e.what();
|
||||
}
|
||||
@@ -598,7 +598,7 @@ main
|
||||
Config c;
|
||||
c.loadFromString(boost::str(cc % missingPath));
|
||||
}
|
||||
catch (std::runtime_error& e)
|
||||
catch (std::runtime_error const& e)
|
||||
{
|
||||
error = e.what();
|
||||
}
|
||||
@@ -617,7 +617,7 @@ main
|
||||
Config c;
|
||||
c.loadFromString(boost::str(cc % invalidFile.string()));
|
||||
}
|
||||
catch (std::runtime_error& e)
|
||||
catch (std::runtime_error const& e)
|
||||
{
|
||||
error = e.what();
|
||||
}
|
||||
@@ -725,7 +725,7 @@ trust-these-validators.gov
|
||||
c.loadFromString(toLoad);
|
||||
fail();
|
||||
}
|
||||
catch (std::runtime_error& e)
|
||||
catch (std::runtime_error const& e)
|
||||
{
|
||||
error = e.what();
|
||||
}
|
||||
@@ -754,7 +754,7 @@ value = 2
|
||||
c.loadFromString(toLoad);
|
||||
fail();
|
||||
}
|
||||
catch (std::runtime_error& e)
|
||||
catch (std::runtime_error const& e)
|
||||
{
|
||||
error = e.what();
|
||||
}
|
||||
@@ -802,7 +802,7 @@ trust-these-validators.gov
|
||||
c.loadFromString(toLoad);
|
||||
fail();
|
||||
}
|
||||
catch (std::runtime_error& e)
|
||||
catch (std::runtime_error const& e)
|
||||
{
|
||||
error = e.what();
|
||||
}
|
||||
@@ -948,7 +948,7 @@ trust-these-validators.gov
|
||||
c.loadFromString(boost::str(cc % vtg.validatorsFile()));
|
||||
fail();
|
||||
}
|
||||
catch (std::runtime_error& e)
|
||||
catch (std::runtime_error const& e)
|
||||
{
|
||||
error = e.what();
|
||||
}
|
||||
@@ -974,7 +974,7 @@ trust-these-validators.gov
|
||||
Config c2;
|
||||
c2.loadFromString(boost::str(cc % vtg.validatorsFile()));
|
||||
}
|
||||
catch (std::runtime_error& e)
|
||||
catch (std::runtime_error const& e)
|
||||
{
|
||||
error = e.what();
|
||||
}
|
||||
@@ -1451,7 +1451,7 @@ r.ripple.com:51235
|
||||
fail();
|
||||
}
|
||||
}
|
||||
catch (std::runtime_error&)
|
||||
catch (std::runtime_error const&)
|
||||
{
|
||||
if (!shouldPass)
|
||||
{
|
||||
@@ -1477,7 +1477,7 @@ r.ripple.com:51235
|
||||
c.loadFromString("[overlay]\nmax_unknown_time=" + value);
|
||||
return c.MAX_UNKNOWN_TIME;
|
||||
}
|
||||
catch (std::runtime_error&)
|
||||
catch (std::runtime_error const&)
|
||||
{
|
||||
return {};
|
||||
}
|
||||
@@ -1511,7 +1511,7 @@ r.ripple.com:51235
|
||||
c.loadFromString("[overlay]\nmax_diverged_time=" + value);
|
||||
return c.MAX_DIVERGED_TIME;
|
||||
}
|
||||
catch (std::runtime_error&)
|
||||
catch (std::runtime_error const&)
|
||||
{
|
||||
return {};
|
||||
}
|
||||
|
||||
@@ -265,7 +265,7 @@ inline Scheduler::queue_type::~queue_type()
|
||||
auto e = &*iter;
|
||||
++iter;
|
||||
e->~event();
|
||||
alloc_->deallocate(e, sizeof(e));
|
||||
alloc_->deallocate(e, sizeof(e)); // NOLINT(bugprone-sizeof-expression)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -452,7 +452,7 @@ private:
|
||||
bool ssl;
|
||||
|
||||
lambda(int id_, TrustedPublisherServer& self_, socket_type&& sock_, bool ssl_)
|
||||
: id(id_), self(self_), sock(std::move(sock_)), work(sock_.get_executor()), ssl(ssl_)
|
||||
: id(id_), self(self_), sock(std::move(sock_)), work(sock.get_executor()), ssl(ssl_)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -75,9 +75,10 @@ public:
|
||||
return hotTRANSACTION_NODE;
|
||||
case 3:
|
||||
return hotUNKNOWN;
|
||||
default:
|
||||
// will never happen, but make static analysis tool happy.
|
||||
return hotUNKNOWN;
|
||||
}
|
||||
// will never happen, but make static analysis tool happy.
|
||||
return hotUNKNOWN;
|
||||
}();
|
||||
|
||||
uint256 hash;
|
||||
|
||||
@@ -211,7 +211,7 @@ public:
|
||||
parallel_for(std::size_t const n, std::size_t number_of_threads, Args const&... args)
|
||||
{
|
||||
std::atomic<std::size_t> c(0);
|
||||
std::vector<beast::unit_test::thread> t;
|
||||
std::vector<beast::unit_test::Thread> t;
|
||||
t.reserve(number_of_threads);
|
||||
for (std::size_t id = 0; id < number_of_threads; ++id)
|
||||
t.emplace_back(*this, parallel_for_lambda<Body>(n, c), args...);
|
||||
@@ -224,7 +224,7 @@ public:
|
||||
parallel_for_id(std::size_t const n, std::size_t number_of_threads, Args const&... args)
|
||||
{
|
||||
std::atomic<std::size_t> c(0);
|
||||
std::vector<beast::unit_test::thread> t;
|
||||
std::vector<beast::unit_test::Thread> t;
|
||||
t.reserve(number_of_threads);
|
||||
for (std::size_t id = 0; id < number_of_threads; ++id)
|
||||
t.emplace_back(*this, parallel_for_lambda<Body>(n, c), id, args...);
|
||||
|
||||
@@ -1345,7 +1345,7 @@ vp_enable=0
|
||||
{
|
||||
c.loadFromString(toLoad);
|
||||
}
|
||||
catch (std::runtime_error& e)
|
||||
catch (std::runtime_error const& e)
|
||||
{
|
||||
error = e.what();
|
||||
}
|
||||
@@ -1389,7 +1389,7 @@ vp_base_squelch_max_selected_peers=2
|
||||
{
|
||||
c2.loadFromString(toLoad);
|
||||
}
|
||||
catch (std::runtime_error& e)
|
||||
catch (std::runtime_error const& e)
|
||||
{
|
||||
error = e.what();
|
||||
}
|
||||
|
||||
@@ -2130,7 +2130,7 @@ class STParsedJSON_test : public beast::unit_test::suite
|
||||
STParsedJSONObject const parsed("test", faultyJson);
|
||||
BEAST_EXPECT(!parsed.object);
|
||||
}
|
||||
catch (std::runtime_error& e)
|
||||
catch (std::runtime_error const& e)
|
||||
{
|
||||
std::string const what(e.what());
|
||||
unexpected(what.find("First level children of `Template`") != 0);
|
||||
|
||||
Reference in New Issue
Block a user