Skip to content

Commit c1d2b76

Browse files
author
MarcoFalke
committed
Merge #15913: Bugfix: dummywallet: Add -ignorepartialspends to list of ignored wallet options
765d589 Bugfix: dummywallet: Add -ignorepartialspends to list of ignored wallet options (Luke Dashjr) 0f09eb7 dummywallet: Reformat ignored wallet options list (Luke Dashjr) Pull request description: When building w/o wallet support, we add all the wallet options as hidden options to avoid throwing errors/warnings that they're unknown. `-ignorepartialspends` is missing from this list. This PR adds it. (This seems like a good candidate for a linter? Or maybe we can autogenerate it?) Also reformats the dummywallet options list across multiple lines to make conflicts less often. ACKs for commit 765d58: meshcollider: utACK bitcoin/bitcoin@765d589 MarcoFalke: utACK 765d589 promag: utACK 765d589. practicalswift: utACK 765d589 fanquake: utACK 765d589 Tree-SHA512: 37c8037148bdc1b7a8bde201eff51ee6a64c042c17eb8b6c68faef490d16575348c2f22ab81f48302b8ad80a5559222af23b721a8b5acc1d89c0757fb88796a6
2 parents 150be1c + 765d589 commit c1d2b76

File tree

1 file changed

+27
-5
lines changed

1 file changed

+27
-5
lines changed

src/dummywallet.cpp

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,33 @@ class DummyWalletInit : public WalletInitInterface {
2323

2424
void DummyWalletInit::AddWalletOptions() const
2525
{
26-
std::vector<std::string> opts = {"-addresstype", "-changetype", "-disablewallet", "-discardfee=<amt>", "-fallbackfee=<amt>",
27-
"-keypool=<n>", "-maxtxfee=<amt>", "-mintxfee=<amt>", "-paytxfee=<amt>", "-rescan", "-salvagewallet", "-spendzeroconfchange", "-txconfirmtarget=<n>",
28-
"-upgradewallet", "-wallet=<path>", "-walletbroadcast", "-walletdir=<dir>", "-walletnotify=<cmd>", "-walletrbf", "-zapwallettxes=<mode>",
29-
"-dblogsize=<n>", "-flushwallet", "-privdb", "-walletrejectlongchains"};
30-
gArgs.AddHiddenArgs(opts);
26+
gArgs.AddHiddenArgs({
27+
"-addresstype",
28+
"-avoidpartialspends",
29+
"-changetype",
30+
"-disablewallet",
31+
"-discardfee=<amt>",
32+
"-fallbackfee=<amt>",
33+
"-keypool=<n>",
34+
"-maxtxfee=<amt>",
35+
"-mintxfee=<amt>",
36+
"-paytxfee=<amt>",
37+
"-rescan",
38+
"-salvagewallet",
39+
"-spendzeroconfchange",
40+
"-txconfirmtarget=<n>",
41+
"-upgradewallet",
42+
"-wallet=<path>",
43+
"-walletbroadcast",
44+
"-walletdir=<dir>",
45+
"-walletnotify=<cmd>",
46+
"-walletrbf",
47+
"-zapwallettxes=<mode>",
48+
"-dblogsize=<n>",
49+
"-flushwallet",
50+
"-privdb",
51+
"-walletrejectlongchains",
52+
});
3153
}
3254

3355
const WalletInitInterface& g_wallet_init_interface = DummyWalletInit();

0 commit comments

Comments
 (0)