GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-19 13:27:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge #7766: rpc: Register calls where they are defined

Browse source 
fb8a8cf rpc: Register calls where they are defined (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan 2016-03-31 10:55:06 +02:00
commit 16555b658f
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
15 changed files with 165 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/init.cpp
View file

@ -24,6 +24,7 @@
#include "net.h"
#include "policy/policy.h"
#include "rpc/server.h"
#include "rpc/register.h"
#include "script/standard.h"
#include "script/sigcache.h"
#include "scheduler.h"
@ -915,10 +916,11 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
fPruneMode = true;
}
RegisterAllCoreRPCCommands(tableRPC);
#ifdef ENABLE_WALLET
bool fDisableWallet = GetBoolArg("-disablewallet", false);
if (!fDisableWallet)
walletRegisterRPCCommands();
RegisterWalletRPCCommands(tableRPC);
#endif
nConnectTimeout = GetArg("-timeout", DEFAULT_CONNECT_TIMEOUT);