Skip to content

Commit 3168e46

Browse files
committed
Merge rust-bitcoin#4684: bitcoin: Remove re-export of Denomination
496d7df bitcoin: Remove re-export of Denomination (Tobin C. Harding) Pull request description: `units::Denomination` does not exist, it is only at `units::amount::Denomination`. Our policy is to make the following three equivalent `bitcoin::Foo`, `primitives::Foo`, and `units::Foo` therefor we should not re-export `Denomination` at the crate root of `bitcoin`. ACKs for top commit: apoelstra: ACK 496d7df; successfully ran local tests; will one-ACK merge; seems trivially correct Tree-SHA512: b16f0b4bd0c8f118f062b51cde0473f8ffdae594dddc55bf4e2247968c02cd25c7693b32814378370b97434abb91f95caf4ed55aa8e2f0cce70a0cd0e7c7359c
2 parents f7274a5 + 496d7df commit 3168e46

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

bitcoin/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ pub use primitives::{
131131
};
132132
#[doc(inline)]
133133
pub use units::{
134-
amount::{Amount, Denomination, SignedAmount},
134+
amount::{Amount, SignedAmount},
135135
block::{BlockHeight, BlockHeightInterval, BlockMtp},
136136
fee_rate::FeeRate,
137137
time::{self, BlockTime},

bitcoin/tests/bip_174.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
44
use std::collections::BTreeMap;
55

6+
use bitcoin::amount::{Amount, Denomination};
67
use bitcoin::bip32::{Fingerprint, IntoDerivationPath, KeySource, Xpriv, Xpub};
78
use bitcoin::consensus::encode::{deserialize, serialize_hex};
89
use bitcoin::hex::FromHex;
@@ -11,7 +12,7 @@ use bitcoin::psbt::{Psbt, PsbtSighashType};
1112
use bitcoin::script::{PushBytes, ScriptBufExt as _};
1213
use bitcoin::secp256k1::Secp256k1;
1314
use bitcoin::{
14-
absolute, script, transaction, Amount, Denomination, NetworkKind, OutPoint, PrivateKey,
15+
absolute, script, transaction, NetworkKind, OutPoint, PrivateKey,
1516
PublicKey, ScriptBuf, Sequence, Transaction, TxIn, TxOut, Witness,
1617
};
1718

0 commit comments

Comments
 (0)