This repository has been archived by the owner on Nov 2, 2018. It is now read-only.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There are two things going on here:
ConsensusChange
now has aTryTransactionSet
field, which is an unexported (i.e. unlocked) version of the consensus set'sTryTransactionSet
function. This allows the transaction pool to callTryTransactionSet
even under lock, namely duringProcessConsensusChange
.LockedTryTransactionSet
, which read-locks the consensus set and calls the supplied function, passing it an unlocked version ofTryTransactionSet
. However, this function is not part of theConsensusSet
interface. This allows the transaction pool to callTryTransactionSet
multiple times without unlocking the consensus set. More importantly, it means the transaction pool can lock the consensus set first, before locking itself. This prevents a deadlock.The effect of this is that the defrag test now passes. We may also see less NDFs.