Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor comments update on Mempool class #556

Merged
merged 9 commits into from
Jan 17, 2019
Merged

Minor comments update on Mempool class #556

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cea73a2
Minnor comment update on Mempool class
vncoelho Jan 17, 2019
fc0e55a
minor change in the description
vncoelho Jan 17, 2019
3960910
Merge branch 'master' into mempool-minorcomment-fix
vncoelho Jan 17, 2019
122386a
Other minor comment changes
vncoelho Jan 17, 2019
31d9237
Merge branch 'master' into mempool-minorcomment-fix
vncoelho Jan 17, 2019
7fc0eb3
Updating comment
vncoelho Jan 17, 2019
a007552
Update MemoryPool.cs
jsolman Jan 17, 2019
d39c638
Adding dot and passive
vncoelho Jan 17, 2019
9d71bd1
Update MemoryPool.cs
jsolman Jan 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions neo/Ledger/MemoryPool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public int CompareTo(PoolItem otherItem)
}
}

// Allow reverified transactions to be rebroadcast if it has been this many block times since last broadcast.
// Allow a reverified transaction to be rebroadcasted if it has been this many block times since last broadcast.
private const int BlocksTillRebroadcastLowPriorityPoolTx = 30;
private const int BlocksTillRebroadcastHighPriorityPoolTx = 10;
private int RebroadcastMultiplierThreshold => Capacity / 10;
Expand Down Expand Up @@ -82,7 +82,6 @@ public int CompareTo(PoolItem otherItem)
/// </summary>
private readonly SortedSet<PoolItem> _sortedLowPrioTransactions = new SortedSet<PoolItem>();


/// <summary>
/// Store the unverified transactions currently in the pool.
///
Expand All @@ -94,13 +93,12 @@ public int CompareTo(PoolItem otherItem)
private readonly SortedSet<PoolItem> _unverifiedSortedHighPriorityTransactions = new SortedSet<PoolItem>();
private readonly SortedSet<PoolItem> _unverifiedSortedLowPriorityTransactions = new SortedSet<PoolItem>();

// internal methods to aid in unit testing
// Internal methods to aid in unit testing
internal int SortedHighPrioTxCount => _sortedHighPrioTransactions.Count;
internal int SortedLowPrioTxCount => _sortedLowPrioTransactions.Count;
internal int UnverifiedSortedHighPrioTxCount => _unverifiedSortedHighPriorityTransactions.Count;
internal int UnverifiedSortedLowPrioTxCount => _unverifiedSortedLowPriorityTransactions.Count;


private int _maxTxPerBlock;
private int _maxLowPriorityTxPerBlock;

Expand Down Expand Up @@ -429,15 +427,15 @@ internal void UpdatePoolForBlockPersisted(Block block, Snapshot snapshot)
SortedSet<PoolItem> unverifiedSortedTxPool, int count, double secondsTimeout, Snapshot snapshot)
{
DateTime reverifyCutOffTimeStamp = DateTime.UtcNow.AddSeconds(secondsTimeout);

List<PoolItem> reverifiedItems = new List<PoolItem>(count);
List<PoolItem> invalidItems = new List<PoolItem>();

// Since unverifiedSortedTxPool is ordered in an ascending manner, we take from the end.
foreach (PoolItem item in unverifiedSortedTxPool.Reverse().Take(count))
{
// Re-verify the top fee max high priority transactions that can be verified in a block
if (item.Transaction.Verify(snapshot, _unsortedTransactions.Select(p => p.Value.Transaction)))
reverifiedItems.Add(item);
else // Transaction no longer valid -- will be removed from unverifiedTxPool.
else // Transaction no longer valid -- it will be removed from unverifiedTxPool.
invalidItems.Add(item);

if (DateTime.UtcNow > reverifyCutOffTimeStamp) break;
Expand Down