Skip to content

rpc: Disallow captures in RPCMethodImpl #34049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fanquake merged 2 commits into from
Mar 31, 2026
Merged

rpc: Disallow captures in RPCMethodImpl #34049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e78929
scripted-diff: rpc: Rename RPCHelpMan to RPCMethod
ajtowns Feb 20, 2026
5a81d73
scripted-diff: rpc: Don't pointlessly capture in RPCMethod lambdas
ajtowns Feb 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/qt/test/rpcnestedtests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
#include <string>
#include <stdexcept>

static RPCHelpMan rpcNestedTest_rpc()
static RPCMethod rpcNestedTest_rpc()
{
return RPCHelpMan{
return RPCMethod{
"rpcNestedTest",
"echo the passed string(s)",
{
Expand All @@ -28,7 +28,7 @@ static RPCHelpMan rpcNestedTest_rpc()
},
RPCResult{RPCResult::Type::ANY, "", ""},
RPCExamples{""},
[&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue {
[](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue {
return request.params.write(0, 0);
},
};
Expand Down
4 changes: 2 additions & 2 deletions src/rest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ static bool rest_block_filter(const std::any& context, HTTPRequest* req, const s
}

// A bit of a hack - dependency on a function defined in rpc/blockchain.cpp
RPCHelpMan getblockchaininfo();
RPCMethod getblockchaininfo();

static bool rest_chaininfo(const std::any& context, HTTPRequest* req, const std::string& uri_part)
{
Expand All @@ -738,7 +738,7 @@ static bool rest_chaininfo(const std::any& context, HTTPRequest* req, const std:
}


RPCHelpMan getdeploymentinfo();
RPCMethod getdeploymentinfo();

static bool rest_deploymentinfo(const std::any& context, HTTPRequest* req, const std::string& str_uri_part)
{
Expand Down
Loading
Loading