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

Use fully qualified path in macro 

Using fully qualified paths in macros reduces maintenance burden. We
have one macro where we use relative path to access the `psbt` module.

Refactor only, no external change.
This commit is contained in:
Tobin C. Harding 2024-10-23 09:29:22 +11:00
parent 2edfcedde1
commit 025a8773bf
No known key found for this signature in database
GPG Key ID: 40BF9E4C269D6607
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bitcoin/src/psbt/macros.rs
View File

@ -115,14 +115,14 @@ macro_rules! impl_psbt_insert_pair {
macro_rules! psbt_insert_hash_pair {
(&mut $slf:ident.$map:ident <= $raw_key:ident|$raw_value:ident|$hash:path|$hash_type_error:path) => {
if $raw_key.key_data.is_empty() {
return Err(psbt::Error::InvalidKey($raw_key));
return Err($crate::psbt::Error::InvalidKey($raw_key));
}
let key_val: $hash = Deserialize::deserialize(&$raw_key.key_data)?;
match $slf.$map.entry(key_val) {
btree_map::Entry::Vacant(empty_key) => {
let val: Vec<u8> = Deserialize::deserialize(&$raw_value)?;
if <$hash as hashes::GeneralHash>::hash(&val) != key_val {
return Err(psbt::Error::InvalidPreimageHashPair {
return Err($crate::psbt::Error::InvalidPreimageHashPair {
preimage: val.into_boxed_slice(),
hash: Box::from(key_val.borrow()),
hash_type: $hash_type_error,
@ -130,7 +130,7 @@ macro_rules! psbt_insert_hash_pair {
}
empty_key.insert(val);
}
btree_map::Entry::Occupied(_) => return Err(psbt::Error::DuplicateKey($raw_key)),
btree_map::Entry::Occupied(_) => return Err($crate::psbt::Error::DuplicateKey($raw_key)),
}
}
}

2
bitcoin/src/psbt/map/input.rs
View File

@ -12,7 +12,7 @@ use crate::crypto::{ecdsa, taproot};
use crate::prelude::{btree_map, BTreeMap, Borrow, Box, ToOwned, Vec};
use crate::psbt::map::Map;
use crate::psbt::serialize::Deserialize;
use crate::psbt::{self, error, raw, Error};
use crate::psbt::{error, raw, Error};
use crate::script::ScriptBuf;
use crate::sighash::{
EcdsaSighashType, InvalidSighashTypeError, NonStandardSighashTypeError, SighashTypeParseError,