Merge branch 'master' of git.jimmykiselak.com:/usr/git/ncc into real

This commit is contained in:
Jimmy Kiselak 2016-02-18 18:30:33 -05:00
commit 7143199c4a
2 changed files with 4 additions and 3 deletions

View file

@ -154,7 +154,8 @@ public:
bool IsDust(const CFeeRate &minRelayTxFee) const bool IsDust(const CFeeRate &minRelayTxFee) const
{ {
return (nValue < GetDustThreshold(minRelayTxFee)); return false;
// return (nValue < GetDustThreshold(minRelayTxFee));
} }
friend bool operator==(const CTxOut& a, const CTxOut& b) friend bool operator==(const CTxOut& a, const CTxOut& b)

View file

@ -342,8 +342,8 @@ BOOST_AUTO_TEST_CASE(test_IsStandard)
string reason; string reason;
BOOST_CHECK(IsStandardTx(t, reason)); BOOST_CHECK(IsStandardTx(t, reason));
t.vout[0].nValue = 501; // dust //t.vout[0].nValue = 501; // dust
BOOST_CHECK(!IsStandardTx(t, reason)); //BOOST_CHECK(!IsStandardTx(t, reason));
t.vout[0].nValue = 2730; // not dust t.vout[0].nValue = 2730; // not dust
BOOST_CHECK(IsStandardTx(t, reason)); BOOST_CHECK(IsStandardTx(t, reason));