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

Merge rust-bitcoin/rust-bitcoin#4126: Add additional re-exports 

5da506b506 Add additional re-exports (Tobin C. Harding)

Pull request description:

  As we do for other types add two new alias' at the crate root of `primitives` and mirror it in `bitcoin`:

  - `BlockVersion`
  - `TransactionVersion`

ACKs for top commit:
  apoelstra:
    ACK 5da506b506aa41b88aa7e8ecdffdcc0478ec72b6; successfully ran local tests
  Kixunil:
    ACK 5da506b506

Tree-SHA512: 5f91e3aae87b1128256b528d20d9aab562bf054131ed8028e0db789e2b487863ad4c89aaca080d0fbcf760dd160815a1843046c5fab0ed1483230fdedc66402e
This commit is contained in:
merge-script 2025-03-06 23:13:42 +00:00
parent fa8eaf0257 5da506b506
commit 631ea1a2a9
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bitcoin/src/lib.rs
View File

@ -120,13 +120,14 @@ pub mod taproot;
pub use primitives::{ pub use primitives::{
block::{ block::{
Block, BlockHash, Checked as BlockChecked, Header as BlockHeader, Block, BlockHash, Checked as BlockChecked, Header as BlockHeader,
Unchecked as BlockUnchecked, Validation as BlockValidation, WitnessCommitment, Unchecked as BlockUnchecked, Validation as BlockValidation, Version as BlockVersion,
WitnessCommitment,
}, },
merkle_tree::{TxMerkleNode, WitnessMerkleNode}, merkle_tree::{TxMerkleNode, WitnessMerkleNode},
pow::CompactTarget, // No `pow` module outside of `primitives`. pow::CompactTarget, // No `pow` module outside of `primitives`.
script::{Script, ScriptBuf}, script::{Script, ScriptBuf},
sequence::{self, Sequence}, // No `sequence` module outside of `primitives`. sequence::{self, Sequence}, // No `sequence` module outside of `primitives`.
transaction::{OutPoint, Transaction, TxIn, TxOut, Txid, Wtxid}, transaction::{OutPoint, Transaction, TxIn, TxOut, Txid, Version as TransactionVersion, Wtxid},
witness::Witness, witness::Witness,
}; };
#[doc(inline)] #[doc(inline)]

4
primitives/src/lib.rs
View File

@ -74,12 +74,12 @@ pub use self::{
}; };
#[doc(inline)] #[doc(inline)]
pub use self::{ pub use self::{
block::{BlockHash, Header as BlockHeader, WitnessCommitment}, block::{BlockHash, Header as BlockHeader, Version as BlockVersion, WitnessCommitment},
locktime::{absolute, relative}, locktime::{absolute, relative},
merkle_tree::{TxMerkleNode, WitnessMerkleNode}, merkle_tree::{TxMerkleNode, WitnessMerkleNode},
pow::CompactTarget, pow::CompactTarget,
sequence::Sequence, sequence::Sequence,
transaction::{OutPoint, Txid, Wtxid}, transaction::{OutPoint, Txid, Version as TransactionVersion, Wtxid},
}; };
#[rustfmt::skip] #[rustfmt::skip]