Skip to content

Commit 1936125

Browse files
committed
wallet: Make WalletInitInterface members const
1 parent 39439e5 commit 1936125

File tree

3 files changed

+36
-36
lines changed

3 files changed

+36
-36
lines changed

src/init.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,15 @@ std::unique_ptr<PeerLogicValidation> peerLogic;
7676
class DummyWalletInit : public WalletInitInterface {
7777
public:
7878

79-
std::string GetHelpString(bool showDebug) override {return std::string{};}
80-
bool ParameterInteraction() override {return true;}
81-
void RegisterRPC(CRPCTable &) override {}
82-
bool Verify() override {return true;}
83-
bool Open() override {LogPrintf("No wallet support compiled in!\n"); return true;}
84-
void Start(CScheduler& scheduler) override {}
85-
void Flush() override {}
86-
void Stop() override {}
87-
void Close() override {}
79+
std::string GetHelpString(bool showDebug) const override {return std::string{};}
80+
bool ParameterInteraction() const override {return true;}
81+
void RegisterRPC(CRPCTable &) const override {}
82+
bool Verify() const override {return true;}
83+
bool Open() const override {LogPrintf("No wallet support compiled in!\n"); return true;}
84+
void Start(CScheduler& scheduler) const override {}
85+
void Flush() const override {}
86+
void Stop() const override {}
87+
void Close() const override {}
8888
};
8989

9090
static DummyWalletInit g_dummy_wallet_init;

src/wallet/init.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,39 +18,39 @@ class WalletInit : public WalletInitInterface {
1818
public:
1919

2020
//! Return the wallets help message.
21-
std::string GetHelpString(bool showDebug) override;
21+
std::string GetHelpString(bool showDebug) const override;
2222

2323
//! Wallets parameter interaction
24-
bool ParameterInteraction() override;
24+
bool ParameterInteraction() const override;
2525

2626
//! Register wallet RPCs.
27-
void RegisterRPC(CRPCTable &tableRPC) override;
27+
void RegisterRPC(CRPCTable &tableRPC) const override;
2828

2929
//! Responsible for reading and validating the -wallet arguments and verifying the wallet database.
3030
// This function will perform salvage on the wallet if requested, as long as only one wallet is
3131
// being loaded (WalletParameterInteraction forbids -salvagewallet, -zapwallettxes or -upgradewallet with multiwallet).
32-
bool Verify() override;
32+
bool Verify() const override;
3333

3434
//! Load wallet databases.
35-
bool Open() override;
35+
bool Open() const override;
3636

3737
//! Complete startup of wallets.
38-
void Start(CScheduler& scheduler) override;
38+
void Start(CScheduler& scheduler) const override;
3939

4040
//! Flush all wallets in preparation for shutdown.
41-
void Flush() override;
41+
void Flush() const override;
4242

4343
//! Stop all wallets. Wallets will be flushed first.
44-
void Stop() override;
44+
void Stop() const override;
4545

4646
//! Close all wallets.
47-
void Close() override;
47+
void Close() const override;
4848
};
4949

5050
static WalletInit g_wallet_init;
5151
WalletInitInterface* const g_wallet_init_interface = &g_wallet_init;
5252

53-
std::string WalletInit::GetHelpString(bool showDebug)
53+
std::string WalletInit::GetHelpString(bool showDebug) const
5454
{
5555
std::string strUsage = HelpMessageGroup(_("Wallet options:"));
5656
strUsage += HelpMessageOpt("-addresstype", strprintf("What type of addresses to use (\"legacy\", \"p2sh-segwit\", or \"bech32\", default: \"%s\")", FormatOutputType(DEFAULT_ADDRESS_TYPE)));
@@ -92,7 +92,7 @@ std::string WalletInit::GetHelpString(bool showDebug)
9292
return strUsage;
9393
}
9494

95-
bool WalletInit::ParameterInteraction()
95+
bool WalletInit::ParameterInteraction() const
9696
{
9797
if (gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) {
9898
for (const std::string& wallet : gArgs.GetArgs("-wallet")) {
@@ -220,7 +220,7 @@ bool WalletInit::ParameterInteraction()
220220
return true;
221221
}
222222

223-
void WalletInit::RegisterRPC(CRPCTable &t)
223+
void WalletInit::RegisterRPC(CRPCTable &t) const
224224
{
225225
if (gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) {
226226
return;
@@ -229,7 +229,7 @@ void WalletInit::RegisterRPC(CRPCTable &t)
229229
RegisterWalletRPCCommands(t);
230230
}
231231

232-
bool WalletInit::Verify()
232+
bool WalletInit::Verify() const
233233
{
234234
if (gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) {
235235
return true;
@@ -304,7 +304,7 @@ bool WalletInit::Verify()
304304
return true;
305305
}
306306

307-
bool WalletInit::Open()
307+
bool WalletInit::Open() const
308308
{
309309
if (gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) {
310310
LogPrintf("Wallet disabled!\n");
@@ -322,28 +322,28 @@ bool WalletInit::Open()
322322
return true;
323323
}
324324

325-
void WalletInit::Start(CScheduler& scheduler)
325+
void WalletInit::Start(CScheduler& scheduler) const
326326
{
327327
for (CWalletRef pwallet : vpwallets) {
328328
pwallet->postInitProcess(scheduler);
329329
}
330330
}
331331

332-
void WalletInit::Flush()
332+
void WalletInit::Flush() const
333333
{
334334
for (CWalletRef pwallet : vpwallets) {
335335
pwallet->Flush(false);
336336
}
337337
}
338338

339-
void WalletInit::Stop()
339+
void WalletInit::Stop() const
340340
{
341341
for (CWalletRef pwallet : vpwallets) {
342342
pwallet->Flush(true);
343343
}
344344
}
345345

346-
void WalletInit::Close()
346+
void WalletInit::Close() const
347347
{
348348
for (CWalletRef pwallet : vpwallets) {
349349
delete pwallet;

src/walletinitinterface.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@ class CRPCTable;
1313
class WalletInitInterface {
1414
public:
1515
/** Get wallet help string */
16-
virtual std::string GetHelpString(bool showDebug) = 0;
16+
virtual std::string GetHelpString(bool showDebug) const = 0;
1717
/** Check wallet parameter interaction */
18-
virtual bool ParameterInteraction() = 0;
18+
virtual bool ParameterInteraction() const = 0;
1919
/** Register wallet RPC*/
20-
virtual void RegisterRPC(CRPCTable &) = 0;
20+
virtual void RegisterRPC(CRPCTable &) const = 0;
2121
/** Verify wallets */
22-
virtual bool Verify() = 0;
22+
virtual bool Verify() const = 0;
2323
/** Open wallets*/
24-
virtual bool Open() = 0;
24+
virtual bool Open() const = 0;
2525
/** Start wallets*/
26-
virtual void Start(CScheduler& scheduler) = 0;
26+
virtual void Start(CScheduler& scheduler) const = 0;
2727
/** Flush Wallets*/
28-
virtual void Flush() = 0;
28+
virtual void Flush() const = 0;
2929
/** Stop Wallets*/
30-
virtual void Stop() = 0;
30+
virtual void Stop() const = 0;
3131
/** Close wallets */
32-
virtual void Close() = 0;
32+
virtual void Close() const = 0;
3333

3434
virtual ~WalletInitInterface() {}
3535
};

0 commit comments

Comments
 (0)