diff options
author | MarcoFalke <falke.marco@gmail.com> | 2020-07-14 16:30:11 +0200 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2020-07-14 16:33:01 +0200 |
commit | 834ac4c0f50c0795b55f5586ecc4b1db251be58d (patch) | |
tree | 4529a5a45820c0f4f85943b7c5fba979e4840b49 /src/node/context.h | |
parent | a924f61caea8833b2afd3d4105fc7cd6f424d6c6 (diff) | |
parent | 314b49bd50906c03911d2b17a21a34685a60b3c8 (diff) |
Merge #19323: gui: Fix regression in *txoutset* in GUI console
314b49bd50906c03911d2b17a21a34685a60b3c8 gui: Fix regression in GUI console (Hennadii Stepanov)
Pull request description:
The regression was introduced in #19056: if the GUI is running without `-server=1`, the `*txoutset*` call in the console returns "Shutting down".
Fix #19255.
ACKs for top commit:
ryanofsky:
Code review ACK 314b49bd50906c03911d2b17a21a34685a60b3c8. Only change since last review is rebase
Tree-SHA512: 8ff85641a5c249858fecb1ab69c7a1b2850af651ff2a94aa41ce352b5b5bc95bc45c41e1767e871b51e647612d09e4d54ede3e20c313488afef5678826c51b62
Diffstat (limited to 'src/node/context.h')
-rw-r--r-- | src/node/context.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/node/context.h b/src/node/context.h index c783c39cd6..be568cba36 100644 --- a/src/node/context.h +++ b/src/node/context.h @@ -6,6 +6,7 @@ #define BITCOIN_NODE_CONTEXT_H #include <cassert> +#include <functional> #include <memory> #include <vector> @@ -41,6 +42,7 @@ struct NodeContext { std::unique_ptr<interfaces::Chain> chain; std::vector<std::unique_ptr<interfaces::ChainClient>> chain_clients; std::unique_ptr<CScheduler> scheduler; + std::function<void()> rpc_interruption_point = [] {}; //! Declare default constructor and destructor that are not inline, so code //! instantiating the NodeContext struct doesn't need to #include class |