Merge branch 'v0.11.1.x' of https://github.com/darkcoin/darkcoin into v0.11.1.x

This commit is contained in:
Evan Duffield 2015-02-07 20:04:43 -07:00
commit e4b5b6c5f6

View File

@ -1471,18 +1471,17 @@ bool CWallet::SelectCoinsMinConf(int64_t nTargetValue, int nConfMine, int nConfT
nValueRet += coinLowestLarger.first;
}
else {
string s = "CWallet::SelectCoinsMinConf best subset: ";
for (unsigned int i = 0; i < vValue.size(); i++)
{
if (vfBest[i])
{
setCoinsRet.insert(vValue[i].second);
nValueRet += vValue[i].first;
s += FormatMoney(vValue[i].first);
}
LogPrint("selectcoins", "SelectCoins() best subset: ");
for (unsigned int i = 0; i < vValue.size(); i++)
if (vfBest[i])
LogPrint("selectcoins", "%s ", FormatMoney(vValue[i].first));
LogPrint("selectcoins", "total %s\n", FormatMoney(nBest));
}
LogPrintf("%s - total %s\n", s, FormatMoney(nBest));
}
return true;