Restore ScriptBuf and Witness test imports - #1755
Merged
spacebear21 merged 1 commit intoJul 22, 2026
Merged
Conversation
The v2 receive test module lost `ScriptBuf` and `Witness` from its bitcoin import after two branches merged with a silent semantic conflict. Commit 4548e25 shrank the import to `{Amount, FeeRate}` because it deleted the code that used them, while PR payjoin#1718 (merged against a stale base) added new test code that uses `ScriptBuf` and `Witness`. The 3-way merge kept master's shrunken import alongside the PR's new usages, breaking `cargo test` compilation on master. Re-add both types to the import so the lib test build compiles.
Collaborator
Coverage Report for CI Build 29880922014Warning No base build found for commit Coverage: 86.374%Details
Uncovered ChangesNo uncovered changes found. Coverage RegressionsRequires a base build to compare against. How to fix this → Coverage Stats
💛 - Coveralls |
Member
|
what the skibidi how did this not get caught? |
DanGould
approved these changes
Jul 22, 2026
DanGould
left a comment
DanGould
left a comment
Member
There was a problem hiding this comment.
caused by stape base CI. I see
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
3 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.
The v2 receive test module lost
ScriptBufandWitnessfrom its bitcoin import after two branches merged with a silent semantic conflict. Commit 4548e25 shrank the import to{Amount, FeeRate}because it deleted the code that used them, while PR #1718 (merged against a stale base) added new test code that usesScriptBufandWitness. The 3-way merge kept master's shrunken import alongside the PR's new usages, breakingcargo testcompilation on master.Re-add both types to the import so the lib test build compiles.
Authored by Claude Opus 4.8
Pull Request Checklist
Please confirm the following before requesting review:
AI
in the body of this PR.