Skip to content

Commit 60cc69a

Browse files
apoelstraapoelstra
committed
Merge rust-bitcoin/rust-bitcoin#786: Fix unused arg in PSBT impl_psbt_get_pair macro
1b77e36 Fix unused arg in PSBT impl_psbt_get_pair macro (Dr Maxim Orlovsky) Pull request description: Closes #754 ACKs for top commit: apoelstra: ACK 1b77e36 RCasatta: utACK 1b77e36 Kixunil: ACK 1b77e36 Tree-SHA512: 339aae0a9b6adef34bc6bca27ea19eb89205c4b4694e3a95721590696b7eefbfded9294fd9101a66110b4bdfb69da7a7ef97a8e8321d9e05b3777c3fa9afff7c
2 parents a60218a + ecad4cc commit 60cc69a

File tree

3 files changed

+27
-29
lines changed

3 files changed

+27
-29
lines changed

‎src/util/psbt/macros.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ macro_rules! impl_psbt_insert_pair {
125125

126126
#[cfg_attr(rustfmt, rustfmt_skip)]
127127
macro_rules! impl_psbt_get_pair {
128-
($rv:ident.push($slf:ident.$unkeyed_name:ident as <$unkeyed_typeval:expr, _>|<$unkeyed_value_type:ty>)) => {
128+
($rv:ident.push($slf:ident.$unkeyed_name:ident, $unkeyed_typeval:ident)) => {
129129
if let Some(ref $unkeyed_name) = $slf.$unkeyed_name {
130130
$rv.push($crate::util::psbt::raw::Pair {
131131
key: $crate::util::psbt::raw::Key {
@@ -136,7 +136,7 @@ macro_rules! impl_psbt_get_pair {
136136
});
137137
}
138138
};
139-
($rv:ident.push($slf:ident.$keyed_name:ident as <$keyed_typeval:expr, $keyed_key_type:ty>|<$keyed_value_type:ty>)) => {
139+
($rv:ident.push_map($slf:ident.$keyed_name:ident, $keyed_typeval:ident)) => {
140140
for (key, val) in &$slf.$keyed_name {
141141
$rv.push($crate::util::psbt::raw::Pair {
142142
key: $crate::util::psbt::raw::Key {

‎src/util/psbt/map/input.rs

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -310,80 +310,79 @@ impl Map for Input {
310310
let mut rv: Vec<raw::Pair> = Default::default();
311311

312312
impl_psbt_get_pair! {
313-
rv.push(self.non_witness_utxo as <PSBT_IN_NON_WITNESS_UTXO, _>|<Transaction>)
313+
rv.push(self.non_witness_utxo, PSBT_IN_NON_WITNESS_UTXO)
314314
}
315315

316316
impl_psbt_get_pair! {
317-
rv.push(self.witness_utxo as <PSBT_IN_WITNESS_UTXO, _>|<TxOut>)
317+
rv.push(self.witness_utxo, PSBT_IN_WITNESS_UTXO)
318318
}
319319

320320
impl_psbt_get_pair! {
321-
rv.push(self.partial_sigs as <PSBT_IN_PARTIAL_SIG, PublicKey>|<EcdsaSig>)
321+
rv.push_map(self.partial_sigs, PSBT_IN_PARTIAL_SIG)
322322
}
323323

324324
impl_psbt_get_pair! {
325-
rv.push(self.sighash_type as <PSBT_IN_SIGHASH_TYPE, _>|<SigHashType>)
325+
rv.push(self.sighash_type, PSBT_IN_SIGHASH_TYPE)
326326
}
327327

328328
impl_psbt_get_pair! {
329-
rv.push(self.redeem_script as <PSBT_IN_REDEEM_SCRIPT, _>|<Script>)
329+
rv.push(self.redeem_script, PSBT_IN_REDEEM_SCRIPT)
330330
}
331331

332332
impl_psbt_get_pair! {
333-
rv.push(self.witness_script as <PSBT_IN_WITNESS_SCRIPT, _>|<Script>)
333+
rv.push(self.witness_script, PSBT_IN_WITNESS_SCRIPT)
334334
}
335335

336336
impl_psbt_get_pair! {
337-
rv.push(self.bip32_derivation as <PSBT_IN_BIP32_DERIVATION, secp256k1::PublicKey>|<KeySource>)
337+
rv.push_map(self.bip32_derivation, PSBT_IN_BIP32_DERIVATION)
338338
}
339339

340340
impl_psbt_get_pair! {
341-
rv.push(self.final_script_sig as <PSBT_IN_FINAL_SCRIPTSIG, _>|<Script>)
341+
rv.push(self.final_script_sig, PSBT_IN_FINAL_SCRIPTSIG)
342342
}
343343

344344
impl_psbt_get_pair! {
345-
rv.push(self.final_script_witness as <PSBT_IN_FINAL_SCRIPTWITNESS, _>|<Witness>)
345+
rv.push(self.final_script_witness, PSBT_IN_FINAL_SCRIPTWITNESS)
346346
}
347347

348348
impl_psbt_get_pair! {
349-
rv.push(self.ripemd160_preimages as <PSBT_IN_RIPEMD160, ripemd160::Hash>|<Vec<u8>>)
349+
rv.push_map(self.ripemd160_preimages, PSBT_IN_RIPEMD160)
350350
}
351351

352352
impl_psbt_get_pair! {
353-
rv.push(self.sha256_preimages as <PSBT_IN_SHA256, sha256::Hash>|<Vec<u8>>)
353+
rv.push_map(self.sha256_preimages, PSBT_IN_SHA256)
354354
}
355355

356356
impl_psbt_get_pair! {
357-
rv.push(self.hash160_preimages as <PSBT_IN_HASH160, hash160::Hash>|<Vec<u8>>)
357+
rv.push_map(self.hash160_preimages, PSBT_IN_HASH160)
358358
}
359359

360360
impl_psbt_get_pair! {
361-
rv.push(self.hash256_preimages as <PSBT_IN_HASH256, sha256d::Hash>|<Vec<u8>>)
361+
rv.push_map(self.hash256_preimages, PSBT_IN_HASH256)
362362
}
363363

364364
impl_psbt_get_pair! {
365-
rv.push(self.tap_key_sig as <PSBT_IN_TAP_KEY_SIG, _>|<SchnorrSig>)
365+
rv.push(self.tap_key_sig, PSBT_IN_TAP_KEY_SIG)
366366
}
367367

368368
impl_psbt_get_pair! {
369-
rv.push(self.tap_script_sigs as <PSBT_IN_TAP_SCRIPT_SIG, (XOnlyPublicKey, TapLeafHash)>|<SchnorrSig>)
369+
rv.push_map(self.tap_script_sigs, PSBT_IN_TAP_SCRIPT_SIG)
370370
}
371371

372372
impl_psbt_get_pair! {
373-
rv.push(self.tap_scripts as <PSBT_IN_TAP_LEAF_SCRIPT, ControlBlock>|<(Script, LeafVersion)>)
373+
rv.push_map(self.tap_scripts, PSBT_IN_TAP_LEAF_SCRIPT)
374374
}
375375

376376
impl_psbt_get_pair! {
377-
rv.push(self.tap_key_origins as <PSBT_IN_TAP_BIP32_DERIVATION,
378-
XOnlyPublicKey>|<(Vec<TapLeafHash>, KeySource)>)
377+
rv.push_map(self.tap_key_origins, PSBT_IN_TAP_BIP32_DERIVATION)
379378
}
380379

381380
impl_psbt_get_pair! {
382-
rv.push(self.tap_internal_key as <PSBT_IN_TAP_INTERNAL_KEY, _>|<XOnlyPublicKey>)
381+
rv.push(self.tap_internal_key, PSBT_IN_TAP_INTERNAL_KEY)
383382
}
384383

385384
impl_psbt_get_pair! {
386-
rv.push(self.tap_merkle_root as <PSBT_IN_TAP_MERKLE_ROOT, _>|<TapBranchHash>)
385+
rv.push(self.tap_merkle_root, PSBT_IN_TAP_MERKLE_ROOT)
387386
}
388387
for (key, value) in self.proprietary.iter() {
389388
rv.push(raw::Pair {

‎src/util/psbt/map/output.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -184,28 +184,27 @@ impl Map for Output {
184184
let mut rv: Vec<raw::Pair> = Default::default();
185185

186186
impl_psbt_get_pair! {
187-
rv.push(self.redeem_script as <PSBT_OUT_REDEEM_SCRIPT, _>|<Script>)
187+
rv.push(self.redeem_script, PSBT_OUT_REDEEM_SCRIPT)
188188
}
189189

190190
impl_psbt_get_pair! {
191-
rv.push(self.witness_script as <PSBT_OUT_WITNESS_SCRIPT, _>|<Script>)
191+
rv.push(self.witness_script, PSBT_OUT_WITNESS_SCRIPT)
192192
}
193193

194194
impl_psbt_get_pair! {
195-
rv.push(self.bip32_derivation as <PSBT_OUT_BIP32_DERIVATION, secp256k1::PublicKey>|<KeySource>)
195+
rv.push_map(self.bip32_derivation, PSBT_OUT_BIP32_DERIVATION)
196196
}
197197

198198
impl_psbt_get_pair! {
199-
rv.push(self.tap_internal_key as <PSBT_OUT_TAP_INTERNAL_KEY, _>|<schnorr::PublicKey>)
199+
rv.push(self.tap_internal_key, PSBT_OUT_TAP_INTERNAL_KEY)
200200
}
201201

202202
impl_psbt_get_pair! {
203-
rv.push(self.tap_tree as <PSBT_OUT_TAP_TREE, _>|<TaprootBuilder>)
203+
rv.push(self.tap_tree, PSBT_OUT_TAP_TREE)
204204
}
205205

206206
impl_psbt_get_pair! {
207-
rv.push(self.tap_key_origins as <PSBT_OUT_TAP_BIP32_DERIVATION,
208-
schnorr::PublicKey>|<(Vec<TapLeafHash>, KeySource)>)
207+
rv.push_map(self.tap_key_origins, PSBT_OUT_TAP_BIP32_DERIVATION)
209208
}
210209

211210
for (key, value) in self.proprietary.iter() {

0 commit comments

Comments
 (0)