Skip to content

Commit 29e62db

Browse files
committed
Merge #1195: Remove duplicated code from merge
2c7335f 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 2c7335f Tree-SHA512: 19332412530b898783de7ba705108552dcb17a8e54987d9c916f15aeb33cd94063a3957578edd77fedc97650b224949e5e13a5e25cc045959f3d72567a773e5a
2 parents 679f620 + 2c7335f commit 29e62db

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

src/rpc/util.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -586,8 +586,6 @@ UniValue RPCHelpMan::HandleRequest(const JSONRPCRequest& request) const
586586
throw std::runtime_error(ToString());
587587
}
588588
const UniValue ret = m_fun(*this, request);
589-
if (!std::any_of(m_results.m_results.begin(), m_results.m_results.end(), [ret](const RPCResult& res) { return res.MatchesType(ret); })) {
590-
}
591589
CHECK_NONFATAL(std::any_of(m_results.m_results.begin(), m_results.m_results.end(), [ret](const RPCResult& res) { return res.MatchesType(ret); }));
592590
return ret;
593591
}

0 commit comments

Comments
 (0)