diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-04-08 09:07:57 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-04-08 09:08:03 +0200 |
| commit | 6664211be2b664dd471d7aeea12fcf2859dba860 (patch) | |
| tree | b07a5b5c3d8f1398ad62f40cac79b9e7e562f225 /src/rpc | |
| parent | 2e9031f95d2bf8d0134103a10a8a2162975f1259 (diff) | |
| parent | 9044522ef76f880760165d98fab024802ccfc062 (diff) | |
Merge #21574: Drop JSONRPCRequest constructors after #21366
9044522ef76f880760165d98fab024802ccfc062 Drop JSONRPCRequest constructors after #21366 (Russell Yanofsky)
Pull request description:
This just makes an additional simplification after #21366 replaced
util::Ref with std::any. It was originally suggested
https://github.com/bitcoin/bitcoin/pull/21366#issuecomment-792044351 but
delayed for a followup. It would have prevented usage bug
https://github.com/bitcoin/bitcoin/pull/21572.
ACKs for top commit:
promag:
ACK 9044522ef76f880760165d98fab024802ccfc062, fixed conflict in src/wallet/interfaces.cpp.
Tree-SHA512: e909411b8f75013620b94e1a609296befb832fdcb574cd2e6689bfe3c636b03cd4ac1ccb2b32b532daf0f2131bb043464024966310fffc7e3cad77713d4bd0ef
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/request.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/rpc/request.h b/src/rpc/request.h index e1569673f6..bb091efea8 100644 --- a/src/rpc/request.h +++ b/src/rpc/request.h @@ -35,18 +35,7 @@ public: std::string URI; std::string authUser; std::string peerAddr; - const std::any& context; - - explicit JSONRPCRequest(const std::any& context) : id(NullUniValue), params(NullUniValue), context(context) {} - - //! Initializes request information from another request object and the - //! given context. The implementation should be updated if any members are - //! added or removed above. - JSONRPCRequest(const JSONRPCRequest& other, const std::any& context) - : id(other.id), strMethod(other.strMethod), params(other.params), mode(other.mode), URI(other.URI), - authUser(other.authUser), peerAddr(other.peerAddr), context(context) - { - } + std::any context; void parse(const UniValue& valRequest); }; |