mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-01-20 07:09:15 +01:00
Merge #16189: 0.18: Backport "Add -ignorepartialspends to list of ignored wallet options"
106471d0d7Bugfix: dummywallet: Add -ignorepartialspends to list of ignored wallet options (Luke Dashjr)206c30f6d7dummywallet: 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: ACK106471d. laanwj: ACK106471d0d7Tree-SHA512: 3e6eb7997aa32ef7385842614bac8cac56f86b6dde949cfbbd33b4387e713bf5f65e40ee3e4228ac43dfe50829169175b80ddeaac8a714ad8a38175638123f5d
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user