Skip to content

Backport of #818 to 12.3 #819

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Jul 21, 2025

Conversation

philipr-za
Copy link
Contributor

A backport of #818 to the 12.3 branch

@apoelstra
Copy link
Member

In b6593d6:

I'm struggling to understand this commit. It seems like it just changes an error type from Infallible to () without actually changing anything, but it's labeled as "backporting a unit test".

@apoelstra
Copy link
Member

1874266 looks good otherwise

@philipr-za
Copy link
Contributor Author

philipr-za commented May 14, 2025

In b6593d6:

I'm struggling to understand this commit. It seems like it just changes an error type from Infallible to () without actually changing anything, but it's labeled as "backporting a unit test".

The main change was actually going from the

    type TargetPk = DefiniteDescriptorKey;
    type Error = core::convert::Infallible;

back to the generics of impl Translator<bitcoin::PublicKey, DefiniteDescriptorKey, ()> for TranslateFullPk {

I went from Infallible to () just to be consistent with all the other Translator impl's in the 12.3 branch.

There was also a cargo fmt effect because of that change.

@apoelstra
Copy link
Member

Ohh, I see, you're modifying tests that you just added in the previous commit.

Please squash these commits. Otherwise the first one won't compile.

@philipr-za philipr-za force-pushed the philip-backport-818 branch from 1874266 to be0dff7 Compare May 15, 2025 08:05
@philipr-za philipr-za force-pushed the philip-backport-818 branch from be0dff7 to cd283d0 Compare July 21, 2025 16:11
@philipr-za philipr-za force-pushed the philip-backport-818 branch from cd283d0 to 3cdd25f Compare July 21, 2025 16:19
@philipr-za
Copy link
Contributor Author

@apoelstra sorry I forgot about this backport PR, I have rebased it and rejiggered the minor version

Copy link
Member

@apoelstra apoelstra left a comment

Choose a reason for hiding this comment

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

ACK 3cdd25f; successfully ran local tests

@apoelstra apoelstra merged commit 63a4047 into rust-bitcoin:release-12.x Jul 21, 2025
13 checks passed
@apoelstra
Copy link
Member

Tagged and published.

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants