Skip to content

Merge Cancel and Failure variants - #1607

Merged
DanGould merged 3 commits into
payjoin:masterfrom
benalleng:remove-outcome-field
Jun 5, 2026
Merged

DanGould merged 3 commits into
payjoin:masterfrom
benalleng:remove-outcome-field

Conversation

@benalleng

@benalleng benalleng commented Jun 5, 2026 •

Copy link
Copy Markdown
Collaborator

Closes #1606

Referencing this chain of comments #1558 (comment) I have merged the Cancel and Failure variants in the sender and receiver for a unified Aborted variant in SessionOutcome. As the outcome can now be inferred from the event log we no longer need outcome to be explicitly in the PendingFallback struct as well.

Deepseek coded this one up with the expectation that this was mostly a rewiring of the existing variants to be merged.

Pull Request Checklist

Please confirm the following before requesting review:

@coveralls

coveralls commented Jun 5, 2026 •

Copy link
Copy Markdown
Collaborator

Coverage Report for CI Build 27018036514

Coverage increased (+0.02%) to 85.413%

Details

  • Coverage increased (+0.02%) from the base build.
  • Patch coverage: 22 uncovered changes across 4 files (75 of 97 lines covered, 77.32%).
  • 3 coverage regressions across 2 files.

Uncovered Changes

File Changed Covered %
payjoin/src/core/receive/v2/mod.rs 46 36 78.26%
payjoin-cli/src/app/v2/mod.rs 6 0 0.0%
payjoin/src/core/send/v2/mod.rs 7 2 28.57%
payjoin/src/core/send/v2/session.rs 3 2 66.67%
Total (5 files) 97 75 77.32%

Coverage Regressions

3 previously-covered lines in 2 files lost coverage.

File Lines Losing Coverage Coverage
payjoin-cli/src/app/v2/mod.rs 2 51.75%
payjoin/src/core/receive/v2/mod.rs 1 91.16%

Coverage Stats

Coverage Status
Relevant Lines: 14602
Covered Lines: 12472
Line Coverage: 85.41%
Coverage Strength: 373.66 hits per line

💛 - Coveralls

@benalleng benalleng changed the title Remove outcome field Merge Cancel and Failure variants Jun 5, 2026
@DanGould
DanGould self-requested a review June 5, 2026 13:06

@DanGould DanGould left a comment •

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The meat of it looks ok, but DeepSeek may have not picked up on our CONTRIBUTORS.md conventions. Weird history

It's small enough that I'm ok squashing and merging and writing a commit here on GitHub but worth flagging for the future

I lied, I didn't see the sender/receiver distinction

@benalleng

Copy link
Copy Markdown
Collaborator Author

Nope thats on me lol I can fix it 😅

@DanGould

DanGould commented Jun 5, 2026

Copy link
Copy Markdown
Member

Oh no I've made this mistake before I overlooked that the sender/receiver words are different here. It think it's actually fine on second glance

Comment thread payjoin/src/core/receive/v2/session.rs Resolved
@benalleng
benalleng force-pushed the remove-outcome-field branch 2 times, most recently from 5da9b71 to 94b61bc Compare June 5, 2026 13:31
@benalleng
benalleng force-pushed the remove-outcome-field branch from 94b61bc to cc3e046 Compare June 5, 2026 13:35

@DanGould DanGould left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK cc3e046

clean history, pretty test, net delete 👍

@DanGould
DanGould merged commit 9dd34a5 into payjoin:master Jun 5, 2026
23 checks passed
@benalleng benalleng mentioned this pull request Jun 7, 2026
17 tasks done
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Remove cancel/failure SessionOutcome variants

3 participants