From 0f09eb779d9eeff7574a7a49ca093a13bf9fb75f Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Sun, 28 Apr 2019 04:42:14 +0000
Subject: [PATCH 1/2] dummywallet: Reformat ignored wallet options list

---
 src/dummywallet.cpp | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/dummywallet.cpp b/src/dummywallet.cpp
index f5141e496..4526c1e48 100644
--- a/src/dummywallet.cpp
+++ b/src/dummywallet.cpp
@@ -23,11 +23,32 @@ public:
 
 void DummyWalletInit::AddWalletOptions() const
 {
-    std::vector<std::string> opts = {"-addresstype", "-changetype", "-disablewallet", "-discardfee=<amt>", "-fallbackfee=<amt>",
-        "-keypool=<n>", "-maxtxfee=<amt>", "-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);
+    gArgs.AddHiddenArgs({
+        "-addresstype",
+        "-changetype",
+        "-disablewallet",
+        "-discardfee=<amt>",
+        "-fallbackfee=<amt>",
+        "-keypool=<n>",
+        "-maxtxfee=<amt>",
+        "-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",
+    });
 }
 
 const WalletInitInterface& g_wallet_init_interface = DummyWalletInit();

From 765d5890be46ed5f5557c1d2b3cb931e6b8eb3b0 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Sun, 28 Apr 2019 04:42:38 +0000
Subject: [PATCH 2/2] Bugfix: dummywallet: Add -ignorepartialspends to list of
 ignored wallet options

---
 src/dummywallet.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/dummywallet.cpp b/src/dummywallet.cpp
index 4526c1e48..eeec6dec2 100644
--- a/src/dummywallet.cpp
+++ b/src/dummywallet.cpp
@@ -25,6 +25,7 @@ void DummyWalletInit::AddWalletOptions() const
 {
     gArgs.AddHiddenArgs({
         "-addresstype",
+        "-avoidpartialspends",
         "-changetype",
         "-disablewallet",
         "-discardfee=<amt>",