Skip to content

Commit ecad4cc

Browse files
dr-orlovskydr-orlovsky
committed
Fix unused arg in PSBT impl_psbt_get_pair macro
Closes #754
1 parent 5e80b85 commit ecad4cc

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
@@ -305,80 +305,79 @@ impl Map for Input {
305305
let mut rv: Vec<raw::Pair> = Default::default();
306306

307307
impl_psbt_get_pair! {
308-
rv.push(self.non_witness_utxo as <PSBT_IN_NON_WITNESS_UTXO, _>|<Transaction>)
308+
rv.push(self.non_witness_utxo, PSBT_IN_NON_WITNESS_UTXO)
309309
}
310310

311311
impl_psbt_get_pair! {
312-
rv.push(self.witness_utxo as <PSBT_IN_WITNESS_UTXO, _>|<TxOut>)
312+
rv.push(self.witness_utxo, PSBT_IN_WITNESS_UTXO)
313313
}
314314

315315
impl_psbt_get_pair! {
316-
rv.push(self.partial_sigs as <PSBT_IN_PARTIAL_SIG, PublicKey>|<EcdsaSig>)
316+
rv.push_map(self.partial_sigs, PSBT_IN_PARTIAL_SIG)
317317
}
318318

319319
impl_psbt_get_pair! {
320-
rv.push(self.sighash_type as <PSBT_IN_SIGHASH_TYPE, _>|<SigHashType>)
320+
rv.push(self.sighash_type, PSBT_IN_SIGHASH_TYPE)
321321
}
322322

323323
impl_psbt_get_pair! {
324-
rv.push(self.redeem_script as <PSBT_IN_REDEEM_SCRIPT, _>|<Script>)
324+
rv.push(self.redeem_script, PSBT_IN_REDEEM_SCRIPT)
325325
}
326326

327327
impl_psbt_get_pair! {
328-
rv.push(self.witness_script as <PSBT_IN_WITNESS_SCRIPT, _>|<Script>)
328+
rv.push(self.witness_script, PSBT_IN_WITNESS_SCRIPT)
329329
}
330330

331331
impl_psbt_get_pair! {
332-
rv.push(self.bip32_derivation as <PSBT_IN_BIP32_DERIVATION, secp256k1::PublicKey>|<KeySource>)
332+
rv.push_map(self.bip32_derivation, PSBT_IN_BIP32_DERIVATION)
333333
}
334334

335335
impl_psbt_get_pair! {
336-
rv.push(self.final_script_sig as <PSBT_IN_FINAL_SCRIPTSIG, _>|<Script>)
336+
rv.push(self.final_script_sig, PSBT_IN_FINAL_SCRIPTSIG)
337337
}
338338

339339
impl_psbt_get_pair! {
340-
rv.push(self.final_script_witness as <PSBT_IN_FINAL_SCRIPTWITNESS, _>|<Witness>)
340+
rv.push(self.final_script_witness, PSBT_IN_FINAL_SCRIPTWITNESS)
341341
}
342342

343343
impl_psbt_get_pair! {
344-
rv.push(self.ripemd160_preimages as <PSBT_IN_RIPEMD160, ripemd160::Hash>|<Vec<u8>>)
344+
rv.push_map(self.ripemd160_preimages, PSBT_IN_RIPEMD160)
345345
}
346346

347347
impl_psbt_get_pair! {
348-
rv.push(self.sha256_preimages as <PSBT_IN_SHA256, sha256::Hash>|<Vec<u8>>)
348+
rv.push_map(self.sha256_preimages, PSBT_IN_SHA256)
349349
}
350350

351351
impl_psbt_get_pair! {
352-
rv.push(self.hash160_preimages as <PSBT_IN_HASH160, hash160::Hash>|<Vec<u8>>)
352+
rv.push_map(self.hash160_preimages, PSBT_IN_HASH160)
353353
}
354354

355355
impl_psbt_get_pair! {
356-
rv.push(self.hash256_preimages as <PSBT_IN_HASH256, sha256d::Hash>|<Vec<u8>>)
356+
rv.push_map(self.hash256_preimages, PSBT_IN_HASH256)
357357
}
358358

359359
impl_psbt_get_pair! {
360-
rv.push(self.tap_key_sig as <PSBT_IN_TAP_KEY_SIG, _>|<SchnorrSig>)
360+
rv.push(self.tap_key_sig, PSBT_IN_TAP_KEY_SIG)
361361
}
362362

363363
impl_psbt_get_pair! {
364-
rv.push(self.tap_script_sigs as <PSBT_IN_TAP_SCRIPT_SIG, (XOnlyPublicKey, TapLeafHash)>|<SchnorrSig>)
364+
rv.push_map(self.tap_script_sigs, PSBT_IN_TAP_SCRIPT_SIG)
365365
}
366366

367367
impl_psbt_get_pair! {
368-
rv.push(self.tap_scripts as <PSBT_IN_TAP_LEAF_SCRIPT, ControlBlock>|<(Script, LeafVersion)>)
368+
rv.push_map(self.tap_scripts, PSBT_IN_TAP_LEAF_SCRIPT)
369369
}
370370

371371
impl_psbt_get_pair! {
372-
rv.push(self.tap_key_origins as <PSBT_IN_TAP_BIP32_DERIVATION,
373-
XOnlyPublicKey>|<(Vec<TapLeafHash>, KeySource)>)
372+
rv.push_map(self.tap_key_origins, PSBT_IN_TAP_BIP32_DERIVATION)
374373
}
375374

376375
impl_psbt_get_pair! {
377-
rv.push(self.tap_internal_key as <PSBT_IN_TAP_INTERNAL_KEY, _>|<XOnlyPublicKey>)
376+
rv.push(self.tap_internal_key, PSBT_IN_TAP_INTERNAL_KEY)
378377
}
379378

380379
impl_psbt_get_pair! {
381-
rv.push(self.tap_merkle_root as <PSBT_IN_TAP_MERKLE_ROOT, _>|<TapBranchHash>)
380+
rv.push(self.tap_merkle_root, PSBT_IN_TAP_MERKLE_ROOT)
382381
}
383382
for (key, value) in self.proprietary.iter() {
384383
rv.push(raw::Pair {

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

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

180180
impl_psbt_get_pair! {
181-
rv.push(self.redeem_script as <PSBT_OUT_REDEEM_SCRIPT, _>|<Script>)
181+
rv.push(self.redeem_script, PSBT_OUT_REDEEM_SCRIPT)
182182
}
183183

184184
impl_psbt_get_pair! {
185-
rv.push(self.witness_script as <PSBT_OUT_WITNESS_SCRIPT, _>|<Script>)
185+
rv.push(self.witness_script, PSBT_OUT_WITNESS_SCRIPT)
186186
}
187187

188188
impl_psbt_get_pair! {
189-
rv.push(self.bip32_derivation as <PSBT_OUT_BIP32_DERIVATION, secp256k1::PublicKey>|<KeySource>)
189+
rv.push_map(self.bip32_derivation, PSBT_OUT_BIP32_DERIVATION)
190190
}
191191

192192
impl_psbt_get_pair! {
193-
rv.push(self.tap_internal_key as <PSBT_OUT_TAP_INTERNAL_KEY, _>|<schnorr::PublicKey>)
193+
rv.push(self.tap_internal_key, PSBT_OUT_TAP_INTERNAL_KEY)
194194
}
195195

196196
impl_psbt_get_pair! {
197-
rv.push(self.tap_tree as <PSBT_OUT_TAP_TREE, _>|<TaprootBuilder>)
197+
rv.push(self.tap_tree, PSBT_OUT_TAP_TREE)
198198
}
199199

200200
impl_psbt_get_pair! {
201-
rv.push(self.tap_key_origins as <PSBT_OUT_TAP_BIP32_DERIVATION,
202-
schnorr::PublicKey>|<(Vec<TapLeafHash>, KeySource)>)
201+
rv.push_map(self.tap_key_origins, PSBT_OUT_TAP_BIP32_DERIVATION)
203202
}
204203

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

0 commit comments

Comments
 (0)