Merge ElementsProject/elements#1195: Remove duplicated code from merge

2c7335fecc Remove duplicated code from merge (Pablo Greco)

Pull request description:

  Remove duplicated code that looks like a bad merge in the 21-22 timeframe

ACKs for top commit:
  delta1:
    utACK 2c7335f
  apoelstra:
    utACK 2c7335fecc

Tree-SHA512: 19332412530b898783de7ba705108552dcb17a8e54987d9c916f15aeb33cd94063a3957578edd77fedc97650b224949e5e13a5e25cc045959f3d72567a773e5a
This commit is contained in:
Steven Roose 2022-11-28 19:46:18 +00:00
commit 29e62db08e
No known key found for this signature in database
GPG key ID: 2F2A88D7F8D68E87

View file

@ -586,8 +586,6 @@ UniValue RPCHelpMan::HandleRequest(const JSONRPCRequest& request) const
throw std::runtime_error(ToString());
}
const UniValue ret = m_fun(*this, request);
if (!std::any_of(m_results.m_results.begin(), m_results.m_results.end(), [ret](const RPCResult& res) { return res.MatchesType(ret); })) {
}
CHECK_NONFATAL(std::any_of(m_results.m_results.begin(), m_results.m_results.end(), [ret](const RPCResult& res) { return res.MatchesType(ret); }));
return ret;
}