Skip to content

Commit 8d01184

Browse files
committed
Restore ScriptBuf and Witness test imports
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 #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.
1 parent d35ee58 commit 8d01184

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

  • payjoin/src/core/receive/v2

payjoin/src/core/receive/v2/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1652,7 +1652,7 @@ pub(crate) fn pj_uri<'a>(
16521652
pub mod test {
16531653
use std::str::FromStr;
16541654

1655-
use bitcoin::{Amount, FeeRate};
1655+
use bitcoin::{Amount, FeeRate, ScriptBuf, Witness};
16561656
use once_cell::sync::Lazy;
16571657
use payjoin_test_utils::{
16581658
BoxError, EXAMPLE_URL, ORIGINAL_PSBT, PARSED_ORIGINAL_PSBT, PARSED_PAYJOIN_PROPOSAL,

0 commit comments

Comments
 (0)