refactor: consolidate SwapCompleted/SwapTimedOut into single branch#302
Open
Tet-9 wants to merge 1 commit intoentrius:testfrom
Open
refactor: consolidate SwapCompleted/SwapTimedOut into single branch#302Tet-9 wants to merge 1 commit intoentrius:testfrom
Tet-9 wants to merge 1 commit intoentrius:testfrom
Conversation
The two elif branches for SwapCompleted and SwapTimedOut shared
identical extraction, guard, insert_swap_outcome, apply_busy_delta,
bootstrapped_swap_ids.discard, and swap_tracker.resolve calls —
differing only in completed=True/False and SwapStatus.COMPLETED/TIMED_OUT.
Merge into a single elif name in ('SwapCompleted', 'SwapTimedOut')
branch with completed=(name == 'SwapCompleted') so future changes
to the resolution path only need to be applied once.
Fixes entrius#76
|
@anderdc , on for review 🫡 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Summary
ContractEventWatcher.apply_event()had two near-duplicateelifbranches for
SwapCompletedandSwapTimedOut— identical extraction,guard,
insert_swap_outcome,apply_busy_delta,bootstrapped_swap_ids.discard, andswap_tracker.resolvecalls,differing only in
completed=True/FalseandSwapStatus.COMPLETED/TIMED_OUT.Fix
Merge into a single
elif name in ('SwapCompleted', 'SwapTimedOut')branch with
completed = name == 'SwapCompleted'andstatus = SwapStatus.COMPLETED if completed else SwapStatus.TIMED_OUT.Future changes to the resolution path now only need to be applied once.
Fixes #76