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

Refactor CompareTxMemPoolEntryByDescendantScore

Browse source
This commit is contained in:
Suhas Daftuar 2018-01-09 11:53:40 -05:00
parent c991b304de
commit 6773f92b30
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/txmempool.h
View file

@ -206,18 +206,14 @@ class CompareTxMemPoolEntryByDescendantScore
public: public:
bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
{ {
bool fUseADescendants = UseDescendantScore(a); double a_mod_fee, a_size, b_mod_fee, b_size;
bool fUseBDescendants = UseDescendantScore(b);
double aModFee = fUseADescendants ? a.GetModFeesWithDescendants() : a.GetModifiedFee(); GetModFeeAndSize(a, a_mod_fee, a_size);
double aSize = fUseADescendants ? a.GetSizeWithDescendants() : a.GetTxSize(); GetModFeeAndSize(b, b_mod_fee, b_size);
double bModFee = fUseBDescendants ? b.GetModFeesWithDescendants() : b.GetModifiedFee();
double bSize = fUseBDescendants ? b.GetSizeWithDescendants() : b.GetTxSize();
// Avoid division by rewriting (a/b > c/d) as (a*d > c*b). // Avoid division by rewriting (a/b > c/d) as (a*d > c*b).
double f1 = aModFee * bSize; double f1 = a_mod_fee * b_size;
double f2 = aSize * bModFee; double f2 = a_size * b_mod_fee;
if (f1 == f2) { if (f1 == f2) {
return a.GetTime() >= b.GetTime(); return a.GetTime() >= b.GetTime();
@ -225,12 +221,21 @@ public:
return f1 < f2; return f1 < f2;
} }
// Calculate which score to use for an entry (avoiding division). // Return the fee/size we're using for sorting this entry.
bool UseDescendantScore(const CTxMemPoolEntry &a) const void GetModFeeAndSize(const CTxMemPoolEntry &a, double &mod_fee, double &size) const
{ {
// Compare feerate with descendants to feerate of the transaction, and
// return the fee/size for the max.
double f1 = (double)a.GetModifiedFee() * a.GetSizeWithDescendants(); double f1 = (double)a.GetModifiedFee() * a.GetSizeWithDescendants();
double f2 = (double)a.GetModFeesWithDescendants() * a.GetTxSize(); double f2 = (double)a.GetModFeesWithDescendants() * a.GetTxSize();
return f2 > f1;
if (f2 > f1) {
mod_fee = a.GetModFeesWithDescendants();
size = a.GetSizeWithDescendants();
} else {
mod_fee = a.GetModifiedFee();
size = a.GetTxSize();
}
} }
}; };