wallet: Fix typo in assert that is compile-time true

MarcoFalke · MarcoFalke · commit fa47cf9d95dc · 2020-05-04T10:40:48.000-04:00
diff --git a/src/test/script_standard_tests.cpp b/src/test/script_standard_tests.cpp
@@ -13,6 +13,12 @@
 
 BOOST_FIXTURE_TEST_SUITE(script_standard_tests, BasicTestingSetup)
 
+BOOST_AUTO_TEST_CASE(dest_default_is_no_dest)
+{
+    CTxDestination dest;
+    BOOST_CHECK(!IsValidDestination(dest));
+}
+
 BOOST_AUTO_TEST_CASE(script_standard_Solver_success)
 {
     CKey keys[3];
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2777,7 +2777,10 @@ bool CWallet::CreateTransaction(interfaces::Chain::Lock& locked_chain, const std
                     strFailReason = _("Transaction needs a change address, but we can't generate it. Please call keypoolrefill first.").translated;
                 }
                 scriptChange = GetScriptForDestination(dest);
-                assert(!dest.empty() || scriptChange.empty());
+                // A valid destination implies a change script (and
+                // vice-versa). An empty change script will abort later, if the
+                // change keypool ran out, but change is required.
+                CHECK_NONFATAL(IsValidDestination(dest) != scriptChange.empty());
             }
             CTxOut change_prototype_txout(0, scriptChange);
             coin_selection_params.change_output_size = GetSerializeSize(change_prototype_txout);
@@ -2994,7 +2997,7 @@ bool CWallet::CreateTransaction(interfaces::Chain::Lock& locked_chain, const std
                 continue;
             }
 
-            // Give up if change keypool ran out and we failed to find a solution without change:
+            // Give up if change keypool ran out and change is required
             if (scriptChange.empty() && nChangePosInOut != -1) {
                 return false;
             }

Original file line number	Diff line number	Diff line change
`@@ -2777,7 +2777,10 @@ bool CWallet::CreateTransaction(interfaces::Chain::Lock& locked_chain, const std`
`2777`	`2777`	`strFailReason = _("Transaction needs a change address, but we can't generate it. Please call keypoolrefill first.").translated;`
`2778`	`2778`	`}`
`2779`	`2779`	`scriptChange = GetScriptForDestination(dest);`
`2780`		`- assert(!dest.empty() \|\| scriptChange.empty());`
	`2780`	`+ // A valid destination implies a change script (and`
	`2781`	`+ // vice-versa). An empty change script will abort later, if the`
	`2782`	`+ // change keypool ran out, but change is required.`
	`2783`	`+ CHECK_NONFATAL(IsValidDestination(dest) != scriptChange.empty());`
`2781`	`2784`	`}`
`2782`	`2785`	`CTxOut change_prototype_txout(0, scriptChange);`
`2783`	`2786`	`coin_selection_params.change_output_size = GetSerializeSize(change_prototype_txout);`
`@@ -2994,7 +2997,7 @@ bool CWallet::CreateTransaction(interfaces::Chain::Lock& locked_chain, const std`
`2994`	`2997`	`continue;`
`2995`	`2998`	`}`
`2996`	`2999`
`2997`		`- // Give up if change keypool ran out and we failed to find a solution without change:`
	`3000`	`+ // Give up if change keypool ran out and change is required`
`2998`	`3001`	`if (scriptChange.empty() && nChangePosInOut != -1) {`
`2999`	`3002`	`return false;`
`3000`	`3003`	`}`