Skip to content

Bump payjoin-directory version to 0.0.3#840

Merged
DanGould merged 2 commits intopayjoin:masterfrom
arminsabouri:bump-payjoin-directory-0.0.3
Jul 2, 2025
Merged

Bump payjoin-directory version to 0.0.3#840
DanGould merged 2 commits intopayjoin:masterfrom
arminsabouri:bump-payjoin-directory-0.0.3

Conversation

@arminsabouri
Copy link
Collaborator

Related ticket: #839

@coveralls
Copy link
Collaborator

coveralls commented Jul 1, 2025

Pull Request Test Coverage Report for Build 16026369436

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 84.896%

Totals Coverage Status
Change from base Build 16014856746: 0.0%
Covered Lines: 7251
Relevant Lines: 8541

💛 - Coveralls

@arminsabouri
Copy link
Collaborator Author

Need to cherry pick #824

@arminsabouri
Copy link
Collaborator Author

And there is something funky going on with the crates.io patches causing the tests to fail

@DanGould
Copy link
Contributor

DanGould commented Jul 2, 2025

Yes patches were written assuming we had 2 workspaces when really we have one. Rather than exclude payjoin-ffi by default I think we want to just selectively exclude it during MSRV testing, and otherwise include it. Then we can do all of the patching at the top level workspace instead of the jank we have now where it's done in both the top level workspace and payjoin-ffi

@spacebear21
Copy link
Collaborator

spacebear21 commented Jul 2, 2025

I think it's more complicated than selectively excluding payjoin-ffi for MSRV testing, for example running cargo check in nightly/stable results in:

error[E0599]: no method named `required` found for struct `clap::Command` in the current scope
  --> /Users/spacebear/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/uniffi-0.29.3/src/cli/swift.rs:42:9
   |
42 | #[group(required = true, multiple = true)]
   |         ^^^^^^^^ method not found in `Command`

For more information about this error, try `rustc --explain E0599`.
error: could not compile `uniffi` (lib) due to 1 previous error
warning: build failed, waiting for other jobs to finish...

Because a clap version is specified in payjoin-cli, but uniffi uses features from a different clap version. But upgrading the clap version in payjoin-cli would break MSRV. (This was also discussed here)

@DanGould
Copy link
Contributor

DanGould commented Jul 2, 2025

Need to cherry pick #824

Why? I don't think that will produce any conflict

I'd like to understand the nature of @spacebear21 's ack. if this is failing I feel like w need some justification for merging. I want to at least understand the nature of the failure before merge if not address it.

@spacebear21
Copy link
Collaborator

I meant to approve as a concept ACK for bumping the directory version. We should fix the CI failures before merging.

@arminsabouri
Copy link
Collaborator Author

Why? I don't think that will produce any conflict

I figured we would want to include it in this directory release.

@arminsabouri
Copy link
Collaborator Author

The simplest solution for this appears to be adding another patch to the ffi cargo.toml

[patch.crates-io]
payjoin = { path = "../payjoin" }
payjoin-test-utils = { path = "../payjoin-test-utils" }
+ payjoin-directory = { path = "../payjoin-directory" }

This patch changes the dependency from using a published version from
crates.io to using a local path dependency. This ensures that we can
still compile the ffi crate with newer versions of the test-utils (which
depends on payjoin-directory) even if the newer versions of the
workspace dependencies are not available on crates.io.
@arminsabouri arminsabouri force-pushed the bump-payjoin-directory-0.0.3 branch from 70de237 to da825ca Compare July 2, 2025 13:23
@arminsabouri arminsabouri requested a review from spacebear21 July 2, 2025 13:42
Copy link
Collaborator

@spacebear21 spacebear21 left a comment

Choose a reason for hiding this comment

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

ACK da825ca

@DanGould DanGould merged commit efda6ba into payjoin:master Jul 2, 2025
13 checks passed
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.

4 participants