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

Merge rust-bitcoin/rust-bitcoin#698: util/address: remove unused generic type 

8b1dbf5c9f util/address: remove unused generic type (Marko Bencun)

Pull request description:

ACKs for top commit:
  sanket1729:
    utACK 8b1dbf5c9f

Tree-SHA512: 7a3d38d75d2fd8658453562e1b879dd5576a404e2fdbd9ff4bd297146041e53961c9d9835180312a81164b882f1b5aa2622d3d58a421363c0fcbb158ba23ee46
This commit is contained in:
sanket1729 2021-11-15 12:05:15 -08:00
parent abc242dfe1 8b1dbf5c9f
commit 5aabd6371e
No known key found for this signature in database
GPG Key ID: 648FFB183E0870A2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/util/address.rs
View File

@ -515,9 +515,9 @@ impl Address {
/// Create a pay to taproot address from untweaked key
pub fn p2tr<C: Verification>(
secp: Secp256k1<C>,
internal_key: UntweakedPublicKey,
merkle_root: Option<TapBranchHash>,
secp: Secp256k1<C>,
internal_key: UntweakedPublicKey,
merkle_root: Option<TapBranchHash>,
network: Network
) -> Address {
Address {
@ -532,8 +532,8 @@ impl Address {
/// Create a pay to taproot address from a pre-tweaked output key.
///
/// This method is not recommended for use and [Address::p2tr()] should be used where possible.
pub fn p2tr_tweaked<C: Verification>(
output_key: TweakedPublicKey,
pub fn p2tr_tweaked(
output_key: TweakedPublicKey,
network: Network
) -> Address {
Address {