Merge rust-bitcoin/rust-bitcoin#3562: Re-export `block::Header` as `BlockHeader`

85942c355d Re-export block::Header as BlockHeader (Tobin C. Harding)

Pull request description:

  For users who want to just grab stuff from the crate root it makes total sense for there to be a `BlockHeader`.

  Another nice thing, in the HMTL docs it makes BlockHeader be in the struct list right along with `Block`, `BlockHash`, and `BlockHeight`.

  Close: #3548

ACKs for top commit:
  apoelstra:
    ACK 85942c355dfdcf9ddf9a46202f4db56794dcc85d; successfully ran local tests
  jamillambert:
    ACK 85942c355d

Tree-SHA512: 6fbaf7936062323d31940179ffcbc62951b21f53955a42dca2e28476bda0cebeb041db0e1b4f1ceeac32e43d94fe5476ef055595ae88dc6cfc266d32082bdf4d
This commit is contained in:
merge-script 2024-11-03 17:02:38 +00:00
commit 794fb75497
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
2 changed files with 2 additions and 2 deletions

View File

@ -121,7 +121,7 @@ pub use crate::{
amount::{Amount, Denomination, SignedAmount}, amount::{Amount, Denomination, SignedAmount},
bip158::{FilterHash, FilterHeader}, bip158::{FilterHash, FilterHeader},
bip32::XKeyIdentifier, bip32::XKeyIdentifier,
blockdata::block::{self, Block, BlockHash, WitnessCommitment}, blockdata::block::{self, Block, BlockHash, Header as BlockHeader, WitnessCommitment},
blockdata::constants, blockdata::constants,
blockdata::fee_rate::FeeRate, blockdata::fee_rate::FeeRate,
blockdata::locktime::{self, absolute, relative}, blockdata::locktime::{self, absolute, relative},

View File

@ -55,7 +55,7 @@ pub use units::{
#[doc(inline)] #[doc(inline)]
pub use self::{ pub use self::{
block::{BlockHash, WitnessCommitment}, block::{BlockHash, Header as BlockHeader, WitnessCommitment},
merkle_tree::{TxMerkleNode, WitnessMerkleNode}, merkle_tree::{TxMerkleNode, WitnessMerkleNode},
pow::CompactTarget, pow::CompactTarget,
sequence::Sequence, sequence::Sequence,