Restore debug assertion removed due to lockorder restrictions #3943
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.
In 4582b20 we removed a debug assertion which tested that channels seeing HTLC claim replays on startup would be properly unblocked by later monitor update completion in the downstream chanel.
We did so because we couldn't pass our lockorder tests taking a
per_peer_state
read lock to check if a channel was closed while the aper_peer_state
read lock was already held.However, there's no actual reason for that, its just an arbitrary restriction of our lockorder tests.
Here we restore the removed debug assertion by simply enabling the skipping of lockorder checking in
#[cfg(test)]
code - we don't care if there's a theoretical deadlock in test-only code as long as none of our tests actually hit it.Note that we also take this opportunity to enable deadlock detection in
no-std
tests as even#[cfg(not(feature = "std"))]
test builds allow access tostd
.