Merge #16189: 0.18: Backport "Add -ignorepartialspends to list of ignored wallet options"

106471d0d7 Bugfix: dummywallet: Add -ignorepartialspends to list of ignored wallet options (Luke Dashjr)
206c30f6d7 dummywallet: Reformat ignored wallet options list (MarcoFalke)

Pull request description:

  First run clang-format on the wallet options list (review with `--word-diff-regex=.`). This is not a backport.

  Then backport Github-Pull: #15913

ACKs for commit 106471:
  promag:
    ACK 106471d.
  laanwj:
    ACK 106471d0d7

Tree-SHA512: 3e6eb7997aa32ef7385842614bac8cac56f86b6dde949cfbbd33b4387e713bf5f65e40ee3e4228ac43dfe50829169175b80ddeaac8a714ad8a38175638123f5d
This commit is contained in:
Wladimir J. van der Laan
2019-06-13 12:38:11 +02:00

View File

@@ -23,10 +23,32 @@ public:
void DummyWalletInit::AddWalletOptions() const
{
std::vector<std::string> opts = {"-addresstype", "-changetype", "-disablewallet", "-discardfee=<amt>", "-fallbackfee=<amt>",
"-keypool=<n>", "-mintxfee=<amt>", "-paytxfee=<amt>", "-rescan", "-salvagewallet", "-spendzeroconfchange", "-txconfirmtarget=<n>",
"-upgradewallet", "-wallet=<path>", "-walletbroadcast", "-walletdir=<dir>", "-walletnotify=<cmd>", "-walletrbf", "-zapwallettxes=<mode>",
"-dblogsize=<n>", "-flushwallet", "-privdb", "-walletrejectlongchains"};
std::vector<std::string> opts = {
"-addresstype",
"-avoidpartialspends",
"-changetype",
"-disablewallet",
"-discardfee=<amt>",
"-fallbackfee=<amt>",
"-keypool=<n>",
"-mintxfee=<amt>",
"-paytxfee=<amt>",
"-rescan",
"-salvagewallet",
"-spendzeroconfchange",
"-txconfirmtarget=<n>",
"-upgradewallet",
"-wallet=<path>",
"-walletbroadcast",
"-walletdir=<dir>",
"-walletnotify=<cmd>",
"-walletrbf",
"-zapwallettxes=<mode>",
"-dblogsize=<n>",
"-flushwallet",
"-privdb",
"-walletrejectlongchains",
};
gArgs.AddHiddenArgs(opts);
}