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

Merge rust-bitcoin/rust-bitcoin#2857: Remove repetition from sha256t_hash_newtype macro 

8aa893ebd0 Remove repetition from sha256t_hash_newtype macro (Tobin C. Harding)

Pull request description:

  The `sha256t_hash_newtype` macro is hard to reason about because we allow repetition so which tag goes with which type is slightly obscure.

  Remove repetition and call the macro three times.

  Internal change in `bitcoin`, API change in `hashes`.

  Fix #2811

ACKs for top commit:
  apoelstra:
    ACK 8aa893ebd0 nice, small diff

Tree-SHA512: b38e7c307ac7288b4a5c1c3170ad6aa54c62bd3198922ec8bb091867b230bb9149f7dc996766fc8fa20a1af18b318c475b3e83e2689d322b7f4af0d5cb588e50
This commit is contained in:
Andrew Poelstra 2024-06-11 19:10:32 +00:00
parent 138778c539 8aa893ebd0
commit cd768303dc
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bitcoin/src/taproot/mod.rs
View File

@ -36,14 +36,18 @@ sha256t_hash_newtype! {
///
/// This is used for computing tapscript script spend hash.
pub struct TapLeafHash(_);
}
sha256t_hash_newtype! {
pub struct TapBranchTag = hash_str("TapBranch");
/// Tagged hash used in taproot trees.
///
/// See BIP-340 for tagging rules.
pub struct TapNodeHash(_);
}
sha256t_hash_newtype! {
pub struct TapTweakTag = hash_str("TapTweak");
/// Taproot-tagged hash with tag \"TapTweak\".

4
hashes/src/sha256t.rs
View File

@ -126,8 +126,7 @@ fn from_engine<T: Tag>(e: sha256::HashEngine) -> Hash<T> {
/// [`hash_newtype`]: crate::hash_newtype
#[macro_export]
macro_rules! sha256t_hash_newtype {
($($(#[$($tag_attr:tt)*])* $tag_vis:vis struct $tag:ident = $constructor:tt($($tag_value:tt)+); $(#[$($hash_attr:tt)*])* $hash_vis:vis struct $hash_name:ident($(#[$($field_attr:tt)*])* _);)+) => {
$(
($(#[$($tag_attr:tt)*])* $tag_vis:vis struct $tag:ident = $constructor:tt($($tag_value:tt)+); $(#[$($hash_attr:tt)*])* $hash_vis:vis struct $hash_name:ident($(#[$($field_attr:tt)*])* _);) => {
$crate::sha256t_hash_newtype_tag!($tag_vis, $tag, stringify!($hash_name), $(#[$($tag_attr)*])*);
impl $crate::sha256t::Tag for $tag {
@ -144,7 +143,6 @@ macro_rules! sha256t_hash_newtype {
$(#[$($hash_attr)*])*
$hash_vis struct $hash_name($(#[$($field_attr)*])* $crate::sha256t::Hash<$tag>);
}
)+
}
}