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

Merge rust-bitcoin/rust-bitcoin#1897: Rename `TaprootSpendInfo::as_script_map` to `script_map` 

ccb6e3eeba Rename TaprootSpendInfo::as_script_map to script_map (Tobin C. Harding)

Pull request description:

  The `as_script_map` is a getter not a conversion function (to/into/as), as such it should not include the prefix `as_`.

  Deprecate `as_script_map` in favour of `script_map`.

ACKs for top commit:
  yancyribbens:
    ACK ccb6e3eeba
  Kixunil:
    ACK ccb6e3eeba
  apoelstra:
    ACK ccb6e3eeba

Tree-SHA512: 4e14fbfff413ee1d1a396597be6c0d65d1294406291e09c06ad69836c495e6556f2c4ca1bbeca869607f1757b01de85321a8857c9e5157ae25c57f709e572178
This commit is contained in:
Andrew Poelstra 2023-06-04 17:34:55 +00:00
parent 6a04ca12e0 ccb6e3eeba
commit 15f2cb6694
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bitcoin/src/taproot.rs
View File

@ -251,6 +251,9 @@ impl TaprootSpendInfo {
/// Returns the parity of the output key. See also [`TaprootSpendInfo::output_key`]. /// Returns the parity of the output key. See also [`TaprootSpendInfo::output_key`].
pub fn output_key_parity(&self) -> secp256k1::Parity { self.output_key_parity } pub fn output_key_parity(&self) -> secp256k1::Parity { self.output_key_parity }
/// Returns a reference to the internal script map.
pub fn script_map(&self) -> &ScriptMerkleProofMap { &self.script_map }
/// Computes the [`TaprootSpendInfo`] from `internal_key` and `node`. /// Computes the [`TaprootSpendInfo`] from `internal_key` and `node`.
/// ///
/// This is useful when you want to manually build a taproot tree without using /// This is useful when you want to manually build a taproot tree without using
@ -289,7 +292,8 @@ impl TaprootSpendInfo {
} }
/// Returns the internal script map. /// Returns the internal script map.
pub fn as_script_map(&self) -> &ScriptMerkleProofMap { &self.script_map } #[deprecated(since = "0.31.0", note = "use Self::script_map instead")]
pub fn as_script_map(&self) -> &ScriptMerkleProofMap { self.script_map() }
/// Constructs a [`ControlBlock`] for particular script with the given version. /// Constructs a [`ControlBlock`] for particular script with the given version.
/// ///