Added a test for the pruning of extraneous inputs after ApproximateBestSet

murchandamus · murchandamus · commit fc0f52d78085 · 2015-12-07T20:08:37.000+01:00
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
@@ -328,4 +328,22 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
     empty_wallet();
 }
 
+BOOST_AUTO_TEST_CASE(pruning_in_ApproximateBestSet)
+{
+    CoinSet setCoinsRet;
+    CAmount nValueRet;
+
+    LOCK(wallet.cs_wallet);
+
+    empty_wallet();
+    for (int i = 0; i < 12; i++) 
+    {
+        add_coin(10*CENT);
+    }
+    add_coin(100*CENT);
+    add_coin(100*CENT);
+    BOOST_CHECK(wallet.SelectCoinsMinConf(221*CENT, 1, 6, vCoins, setCoinsRet, nValueRet));
+    BOOST_CHECK_EQUAL(nValueRet, 230*CENT);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1605,7 +1605,7 @@ static void ApproximateBestSubset(vector<pair<CAmount, pair<const CWalletTx*,uns
         bool fReachedTarget = false;
         for (int nPass = 0; nPass < 2 && !fReachedTarget; nPass++)
         {
-            for (unsigned int i = 0; i < vValue.size() && !fReachedTarget; i++)
+            for (unsigned int i = 0; i < vValue.size(); i++)
             {
                 //The solver here uses a randomized algorithm,
                 //the randomness serves no real security purpose but is just
@@ -1625,6 +1625,8 @@ static void ApproximateBestSubset(vector<pair<CAmount, pair<const CWalletTx*,uns
                             nBest = nTotal;
                             vfBest = vfIncluded;
                         }
+                        nTotal -= vValue[i].first;
+                        vfIncluded[i] = false;
                     }
                 }
             }
@@ -1634,11 +1636,11 @@ static void ApproximateBestSubset(vector<pair<CAmount, pair<const CWalletTx*,uns
     //Reduces the approximate best subset by removing any inputs that are smaller than the surplus of nTotal beyond nTargetValue. 
     for (unsigned int i = 0; i < vValue.size(); i++)
     {                        
-	if (vfBest[i] && (nBest - vValue[i].first) >= nTargetValue )
-	{
-	    vfBest[i] = false;
-	    nBest -= vValue[i].first;
-	}
+        if (vfBest[i] && (nBest - vValue[i].first) >= nTargetValue )
+        {
+            vfBest[i] = false;
+            nBest -= vValue[i].first;
+        }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1605,7 +1605,7 @@ static void ApproximateBestSubset(vector<pair<CAmount, pair<const CWalletTx*,uns`
`1605`	`1605`	`bool fReachedTarget = false;`
`1606`	`1606`	`for (int nPass = 0; nPass < 2 && !fReachedTarget; nPass++)`
`1607`	`1607`	`{`
`1608`		`- for (unsigned int i = 0; i < vValue.size() && !fReachedTarget; i++)`
	`1608`	`+ for (unsigned int i = 0; i < vValue.size(); i++)`
`1609`	`1609`	`{`
`1610`	`1610`	`//The solver here uses a randomized algorithm,`
`1611`	`1611`	`//the randomness serves no real security purpose but is just`
`@@ -1625,6 +1625,8 @@ static void ApproximateBestSubset(vector<pair<CAmount, pair<const CWalletTx*,uns`
`1625`	`1625`	`nBest = nTotal;`
`1626`	`1626`	`vfBest = vfIncluded;`
`1627`	`1627`	`}`
	`1628`	`+ nTotal -= vValue[i].first;`
	`1629`	`+ vfIncluded[i] = false;`
`1628`	`1630`	`}`
`1629`	`1631`	`}`
`1630`	`1632`	`}`
`@@ -1634,11 +1636,11 @@ static void ApproximateBestSubset(vector<pair<CAmount, pair<const CWalletTx*,uns`
`1634`	`1636`	`//Reduces the approximate best subset by removing any inputs that are smaller than the surplus of nTotal beyond nTargetValue.`
`1635`	`1637`	`for (unsigned int i = 0; i < vValue.size(); i++)`
`1636`	`1638`	`{`
`1637`		`- if (vfBest[i] && (nBest - vValue[i].first) >= nTargetValue )`
`1638`		`- {`
`1639`		`- vfBest[i] = false;`
`1640`		`- nBest -= vValue[i].first;`
`1641`		`- }`
	`1639`	`+ if (vfBest[i] && (nBest - vValue[i].first) >= nTargetValue )`
	`1640`	`+ {`
	`1641`	`+ vfBest[i] = false;`
	`1642`	`+ nBest -= vValue[i].first;`
	`1643`	`+ }`
`1642`	`1644`	`}`
`1643`	`1645`	`}`
`1644`	`1646`