LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Match va_start and va_end calls, pointed by clang-tidy #176

Closed
bvbfan wants to merge 277 commits from va_brach into master
pull from: va_brach
merge into: LBRYCommunity:master
Conversation 4 Commits 277 Files changed 117 +16 -9
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b89ff5f456 - Show all commits

14
src/primitives/transaction.h
View file

@ -170,15 +170,19 @@ public:
// 546*minRelayTxFee/1000 (in satoshis)
if (scriptPubKey.IsUnspendable())
return 0;
size_t nSize = GetSerializeSize(SER_DISK,0)+148u;
return 3*minRelayTxFee.GetFee(nSize);
// for lbrycrd this is mainly to prevent 0 value claims
// and some spam protection without limiting small
// lbrynet transactions
return 1;
// below is original bitcoin core code
//size_t nSize = GetSerializeSize(SER_DISK,0)+dd148u;
//return 3*minRelayTxFee.GetFee(nSize);
}
bool IsDust(const CFeeRate &minRelayTxFee) const
{
return false;
// return (nValue < GetDustThreshold(minRelayTxFee));
return (nValue < GetDustThreshold(minRelayTxFee));
}
friend bool operator==(const CTxOut& a, const CTxOut& b)

11
src/test/transaction_tests.cpp
View file

@ -337,11 +337,14 @@ BOOST_AUTO_TEST_CASE(test_IsStandard)
BOOST_CHECK(IsStandardTx(t, reason));
// Check dust with default relay fee:
CAmount nDustThreshold = 182 * minRelayTxFee.GetFeePerK()/1000 * 3;
BOOST_CHECK_EQUAL(nDustThreshold, 546);
//CAmount nDustThreshold = 182 * minRelayTxFee.GetFeePerK()/1000 * 3;
//BOOST_CHECK_EQUAL(nDustThreshold, 546);
// lbry dust is set to 1, regardless of minRelayTxfee
CAmount nDustThreshold = 1;
// dust:
//t.vout[0].nValue = nDustThreshold - 1;
//BOOST_CHECK(!IsStandardTx(t, reason));
t.vout[0].nValue = nDustThreshold - 1;
BOOST_CHECK(!IsStandardTx(t, reason));
// not dust:
t.vout[0].nValue = nDustThreshold;
BOOST_CHECK(IsStandardTx(t, reason));