Deduplicate payjoin URI creation logic#812
Closed
Mshehu5 wants to merge 0 commit into
Closed
Conversation
Collaborator
Pull Request Test Coverage Report for Build 15911058532Details
💛 - Coveralls |
nothingmuch
approved these changes
Jun 27, 2025
| session_context: &SessionContext, | ||
| output_substitution: OutputSubstitution, | ||
| ) -> crate::PjUri<'a> { | ||
| use crate::uri::{PayjoinExtras, UrlExt}; |
Contributor
There was a problem hiding this comment.
this is pure bikeshedding, but importing bitcoin_uri::Uri here would be a teensy bit more consistent IMO
arminsabouri
approved these changes
Jun 27, 2025
arminsabouri
left a comment
arminsabouri
left a comment
Contributor
There was a problem hiding this comment.
Thanks for picking this up. Approach looks good. I had one comment about the output sub param which can either be addressed in this PR or followed up.
utACK
| } | ||
| SessionEvent::Created(session_context) => Some(crate::receive::v2::create_pj_uri( | ||
| session_context, | ||
| OutputSubstitution::Disabled, |
Contributor
There was a problem hiding this comment.
Thanks for pointing out the mismatch. Output substitution defaults to enabled, unless the Payjoin version is v1. We record the version in the UncheckedProposal session event. So the correct behavior should be: if the session log contains UncheckedProposal, we inspect its version and disable output substitution if it's v1, otherwise leave it enabled. If UncheckedProposal is missing, we default to enabling output substitution.
Contributor
There was a problem hiding this comment.
This can be done in a follow up or included in this PR. I'm inclined to just merge this as is.
| } | ||
|
|
||
| /// Creates a Payjoin URI from a session context | ||
| pub fn create_pj_uri<'a>( |
Contributor
There was a problem hiding this comment.
Nit: I would remove the verb here and just cal lit pj_uri to be more consistent with the rest of the codebase
Collaborator
Mshehu5
added a commit
to Mshehu5/rust-payjoin
that referenced
this pull request
Jun 30, 2025
- Add direct import of `bitcoin_uri::Uri` instead of using relative imports - Fix output substitution handling to properly default to enabled for v2 and disabled for v1 This addresses the review comments from @nothingmuch and @0xBEEFCAF3.
Mshehu5
added a commit
to Mshehu5/rust-payjoin
that referenced
this pull request
Jun 30, 2025
- Add direct import of `bitcoin_uri::Uri` instead of using relative imports - Fix output substitution handling to properly default to enabled for v2 and disabled for v1 This addresses the review comments from @nothingmuch and @0xBEEFCAF3.
Mshehu5
added a commit
to Mshehu5/rust-payjoin
that referenced
this pull request
Jun 30, 2025
- Add direct import of `bitcoin_uri::Uri` instead of using relative imports - Fix output substitution handling to properly default to enabled for v2 and disabled for v1 This addresses the review comments from @nothingmuch and @0xBEEFCAF3.
Mshehu5
added a commit
to Mshehu5/rust-payjoin
that referenced
this pull request
Jun 30, 2025
- Add direct import of `bitcoin_uri::Uri` instead of using relative imports - Fix output substitution handling to properly default to enabled for v2 and disabled for v1 This addresses the review comments from the reviewers
Mshehu5
added a commit
to Mshehu5/rust-payjoin
that referenced
this pull request
Jun 30, 2025
- Add direct import of `bitcoin_uri::Uri` instead of using relative imports - Fix output substitution handling to properly default to enabled for v2 and disabled for v1 This addresses the review comments from reviewers
Mshehu5
added a commit
to Mshehu5/rust-payjoin
that referenced
this pull request
Jun 30, 2025
- Add direct import of `bitcoin_uri::Uri` instead of using relative imports - Fix output substitution handling to properly default to enabled for v2 and disabled for v1 This addresses the review comments from the reviews
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
5 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.
This PR introduces a helper function
create_pj_uriin the v2 module that centralizes the logic for creating Payjoin URIs from aSessionContext. This eliminates code duplication betweenSessionHistory::pj_uriandReceiver<WithContext>::pj_uri.Changes
create_pj_uriinpayjoin/src/receive/v2/mod.rsReceiver<WithContext>::pj_urito use the helper functionSessionHistory::pj_urito use the helper functionsubdirfromsession.rsBenefits
Testing
The existing test
test_v2_pj_uripasses, confirming that the refactored code behaves identically to the original implementation.Related Issues
Resolves #804