instantsend: Partially revert 3987, add more tests for CL vs IS conflicts #4146
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
May 14, 2021
…icts (dashpay#4146) * tests: Check that CLs override ISes which invalidated non-CLed blocks earlier * partial revert 3987: Do not mark blocks which conflict with ISes as "conflicting"
gades
pushed a commit
to cosanta/cosanta-core
that referenced
this pull request
May 4, 2022
…icts (dashpay#4146) * tests: Check that CLs override ISes which invalidated non-CLed blocks earlier * partial revert 3987: Do not mark blocks which conflict with ISes as "conflicting"
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
I think I got it wrong in #3987 - we bail out on CL vs IS conflicts earlier actually and the patched part of
ResolveBlockConflictswas about IS vs a regular block conflicts only.developworks both with and without c3c59e4 which proves the patch did not fix anything, 5e12fb6 extends tests a bit and fails without c3c59e4 which proves the old patch introduced a bug 🙈