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

Convert throws to Throws.

Browse Source
This commit is contained in:
Miguel Portilla
2016-03-30 17:21:14 -04:00
committed by Nik Bougalis
parent c37261858a
commit efe4c9cae3
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ripple/app/tests/AmendmentTable.test.cpp
View File

@@ -412,27 +412,27 @@ public:
case 0:
// amendment goes from majority to enabled
if (enabled.find (hash) != enabled.end ())
throw std::runtime_error ("enabling already enabled");
Throw<std::runtime_error> ("enabling already enabled");
if (majority.find (hash) == majority.end ())
throw std::runtime_error ("enabling without majority");
Throw<std::runtime_error> ("enabling without majority");
enabled.insert (hash);
majority.erase (hash);
break;
case tfGotMajority:
if (majority.find (hash) != majority.end ())
throw std::runtime_error ("got majority while having majority");
Throw<std::runtime_error> ("got majority while having majority");
majority[hash] = roundTime;
break;
case tfLostMajority:
if (majority.find (hash) == majority.end ())
throw std::runtime_error ("lost majority without majority");
Throw<std::runtime_error> ("lost majority without majority");
majority.erase (hash);
break;
default:
throw std::runtime_error ("unknown action");
Throw<std::runtime_error> ("unknown action");
}
}
}

4
src/ripple/server/impl/Port.cpp
View File

@@ -101,7 +101,7 @@ populate (Section const& section, std::string const& field, std::ostream& log,
log << "0.0.0.0 not allowed'" <<
"' for key '" << field << "' in [" <<
section.name () << "]\n";
throw std::exception ();
Throw<std::exception> ();
}
else
{
@@ -127,7 +127,7 @@ populate (Section const& section, std::string const& field, std::ostream& log,
{
log << "IP specified for " << field << " is also for " <<
"admin: " << ip << " in [" << section.name() << "]\n";
throw std::exception();
Throw<std::exception> ();
}
ips->emplace_back (addr.first.address ());

6
src/ripple/test/impl/JSONRPCClient.cpp
View File

@@ -52,7 +52,8 @@ class JSONRPCClient : public AbstractClient
*pp.ip = address_v4{0x7f000001};
return { *pp.ip, *pp.port };
}
throw std::runtime_error("Missing HTTP port");
Throw<std::runtime_error>("Missing HTTP port");
return {}; // Silence compiler control paths return value warning
}
template <class ConstBufferSequence>
@@ -133,7 +134,8 @@ public:
{
auto const result = p.write(bin_.data());
if (result.first)
throw result.first;
Throw<boost::system::system_error>(result.first);
bin_.consume(result.second);
if(p.complete())
break;

6
src/ripple/test/impl/WSClient.cpp
View File

@@ -136,7 +136,8 @@ class WSClientImpl : public WSClient
*pp.ip = address_v4{0x7f000001};
return { *pp.ip, *pp.port };
}
throw std::runtime_error("Missing WebSocket port");
Throw<std::runtime_error>("Missing WebSocket port");
return {}; // Silence compiler control paths return value warning
}
template <class ConstBuffers>
@@ -181,7 +182,8 @@ public:
error_code ec;
ws_.connect(ec);
if(ec)
throw ec;
Throw<boost::system::system_error>(ec);
read_frame_op{*this};
}