milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Replace hex_script macro with a helper function 

Remove the macro hex_script and replace with a function.  Using
track_caller to accuretly report the test name and line number
during a panic is used in place of a macro.
This commit is contained in:
yancy 2023-10-20 09:52:59 +02:00
parent 7f26439e20
commit b163d9b59a
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bitcoin/tests/psbt.rs
View File

@ -20,18 +20,15 @@ use bitcoin::{
const NETWORK: Network = Network::Testnet; const NETWORK: Network = Network::Testnet;
macro_rules! hex_script {
($s:expr) => {
<ScriptBuf>::from_hex($s).unwrap()
};
}
#[track_caller] #[track_caller]
fn hex_psbt(s: &str) -> Psbt { fn hex_psbt(s: &str) -> Psbt {
let v: Vec<u8> = Vec::from_hex(s).expect("valid hex digits"); let v: Vec<u8> = Vec::from_hex(s).expect("valid hex digits");
Psbt::deserialize(&v).expect("valid magic and valid separators") Psbt::deserialize(&v).expect("valid magic and valid separators")
} }
#[track_caller]
fn hex_script(s: &str) -> ScriptBuf { ScriptBuf::from_hex(s).expect("valid hex digits") }
#[test] #[test]
fn bip174_psbt_workflow() { fn bip174_psbt_workflow() {
let secp = Secp256k1::new(); let secp = Secp256k1::new();
@ -244,7 +241,7 @@ fn update_psbt(mut psbt: Psbt, fingerprint: Fingerprint) -> Psbt {
let v = Vec::from_hex(previous_tx_1).unwrap(); let v = Vec::from_hex(previous_tx_1).unwrap();
let tx: Transaction = deserialize(&v).unwrap(); let tx: Transaction = deserialize(&v).unwrap();
input_0.non_witness_utxo = Some(tx); input_0.non_witness_utxo = Some(tx);
input_0.redeem_script = Some(hex_script!(redeem_script_0)); input_0.redeem_script = Some(hex_script(redeem_script_0));
input_0.bip32_derivation = bip32_derivation(fingerprint, &pk_path, vec![0, 1]); input_0.bip32_derivation = bip32_derivation(fingerprint, &pk_path, vec![0, 1]);
let mut input_1 = psbt.inputs[1].clone(); let mut input_1 = psbt.inputs[1].clone();
@ -253,8 +250,8 @@ fn update_psbt(mut psbt: Psbt, fingerprint: Fingerprint) -> Psbt {
let tx: Transaction = deserialize(&v).unwrap(); let tx: Transaction = deserialize(&v).unwrap();
input_1.witness_utxo = Some(tx.output[1].clone()); input_1.witness_utxo = Some(tx.output[1].clone());
input_1.redeem_script = Some(hex_script!(redeem_script_1)); input_1.redeem_script = Some(hex_script(redeem_script_1));
input_1.witness_script = Some(hex_script!(witness_script)); input_1.witness_script = Some(hex_script(witness_script));
input_1.bip32_derivation = bip32_derivation(fingerprint, &pk_path, vec![2, 3]); input_1.bip32_derivation = bip32_derivation(fingerprint, &pk_path, vec![2, 3]);
psbt.inputs = vec![input_0, input_1]; psbt.inputs = vec![input_0, input_1];