diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-06-13 12:38:11 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-06-13 12:38:19 +0200 |
| commit | 9c29bc71dc40de4e6ff94c272d63449a7a87ba0a (patch) | |
| tree | f253018b7d4b787d5545bea280e1a1fea11ec7f5 | |
| parent | be92be5644a763f98b6fa2de0b04ba44217dcef9 (diff) | |
| parent | 106471d0d710a957280c36862df222657ace17f5 (diff) | |
| download | bitcoin-9c29bc71dc40de4e6ff94c272d63449a7a87ba0a.tar.xz | |
Merge #16189: 0.18: Backport "Add -ignorepartialspends to list of ignored wallet options"
106471d0d710a957280c36862df222657ace17f5 Bugfix: dummywallet: Add -ignorepartialspends to list of ignored wallet options (Luke Dashjr)
206c30f6d7ff9fbcdb0f0b882e8da54870f8ee73 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 106471d0d710a957280c36862df222657ace17f5
Tree-SHA512: 3e6eb7997aa32ef7385842614bac8cac56f86b6dde949cfbbd33b4387e713bf5f65e40ee3e4228ac43dfe50829169175b80ddeaac8a714ad8a38175638123f5d
| -rw-r--r-- | src/dummywallet.cpp | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/src/dummywallet.cpp b/src/dummywallet.cpp index 8a76021a5b..447c99b374 100644 --- a/src/dummywallet.cpp +++ b/src/dummywallet.cpp @@ -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); } |