instantsend: Partially revert 3987, add more tests for CL vs IS conflicts#4146

Merged

xdustinface merged 2 commits intodashpay:developfrom

UdjinM6:part_revert_3924

May 11, 2021

Commits on May 10, 2021

tests: Check that CLs override ISes which invalidated non-CLed blocks earlier
UdjinM6
committed
partial revert 3987: Do not mark blocks which conflict with ISes as "conflicting"
UdjinM6
committed