diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-11-23 22:06:00 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-11-23 22:10:30 +0100 |
| commit | a933cb14c75b9c79a02f8de8397a8eae405a264f (patch) | |
| tree | b44bb4bbef5bae198ab142b0b941570e0049eac0 /src/init.cpp | |
| parent | 84fa64598e8b7d6901c546e938fb0eeda625a8e8 (diff) | |
| parent | abbd230217df2f3b0cc25527f3c15f6f11b9852e (diff) | |
| download | bitcoin-a933cb14c75b9c79a02f8de8397a8eae405a264f.tar.xz | |
Merge #11603: Move RPC registration out of AppInitParameterInteraction
abbd230 Move RPC registration out of AppInitParameterInteraction (Russell Yanofsky)
Pull request description:
Move to AppInitServers. This doesn't have any effects on bitcoin behavior. It was just strange to have this unrelated code in the middle of parameter interaction.
Tree-SHA512: 373e18f2ef8d21999ad36295d69326128a3086044acfc8ed537abd5497c8d3620b9832f7f6aa87c0c0939bb5e0d92be8a3c006b5997e9e6fa20334f5610c89bc
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/init.cpp b/src/init.cpp index 439eaacfcc..3cc797a17c 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1030,11 +1030,6 @@ bool AppInitParameterInteraction() fPruneMode = true; } - RegisterAllCoreRPCCommands(tableRPC); -#ifdef ENABLE_WALLET - RegisterWalletRPC(tableRPC); -#endif - nConnectTimeout = gArgs.GetArg("-timeout", DEFAULT_CONNECT_TIMEOUT); if (nConnectTimeout <= 0) nConnectTimeout = DEFAULT_CONNECT_TIMEOUT; @@ -1239,6 +1234,14 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler) GetMainSignals().RegisterBackgroundSignalScheduler(scheduler); GetMainSignals().RegisterWithMempoolSignals(mempool); + /* Register RPC commands regardless of -server setting so they will be + * available in the GUI RPC console even if external calls are disabled. + */ + RegisterAllCoreRPCCommands(tableRPC); +#ifdef ENABLE_WALLET + RegisterWalletRPC(tableRPC); +#endif + /* Start the RPC server already. It will be started in "warmup" mode * and not really process calls already (but it will signify connections * that the server is there and will be ready later). Warmup mode will |