Swap iterations and fUseInstantSend parameters in ApproximateBestSubset (#1819)

codablock · UdjinM6 · commit fa25499868cb · 2017-12-28T03:49:05.000+03:00
#1695 introduced a fix for a instant send related edge case. Somehow the parameters got mixed up and fUseInstantSend was passed as "iterations".
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2491,7 +2491,7 @@ void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed, const
 }
 
 static void ApproximateBestSubset(vector<pair<CAmount, pair<const CWalletTx*,unsigned int> > >vValue, const CAmount& nTotalLower, const CAmount& nTargetValue,
-                                  vector<char>& vfBest, CAmount& nBest, int iterations = 1000, bool fUseInstantSend = false)
+                                  vector<char>& vfBest, CAmount& nBest, bool fUseInstantSend = false, int iterations = 1000)
 {
     vector<char> vfIncluded;
 

Original file line number	Diff line number	Diff line change
`@@ -2491,7 +2491,7 @@ void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed, const`
`2491`	`2491`	`}`
`2492`	`2492`
`2493`	`2493`	`static void ApproximateBestSubset(vector<pair<CAmount, pair<const CWalletTx*,unsigned int> > >vValue, const CAmount& nTotalLower, const CAmount& nTargetValue,`
`2494`		`- vector<char>& vfBest, CAmount& nBest, int iterations = 1000, bool fUseInstantSend = false)`
	`2494`	`+ vector<char>& vfBest, CAmount& nBest, bool fUseInstantSend = false, int iterations = 1000)`
`2495`	`2495`	`{`
`2496`	`2496`	`vector<char> vfIncluded;`
`2497`	`2497`