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

Merge rust-bitcoin/rust-bitcoin#1333: Move amount module out of util 

b84e1d46c0 Move amount module out of util (Tobin C. Harding)

Pull request description:

  Done as part of flattening the `util` module. Simply move the `amount` module out of the `util` module and to the crate root. Justified by the fact that the `Amount` type is more-or-less a "primitive" bitcoin type.

ACKs for top commit:
  apoelstra:
    ACK b84e1d46c0
  Kixunil:
    ACK b84e1d46c0
  sanket1729:
    ACK b84e1d46c0

Tree-SHA512: 9ec707f49b7ab29f573be22b366d2ea9c1a8e4b27e80350d521b9c6607fca4142f079648cb739ba8590edd97c21a00029c3647c4c8cebe47cc2dfee1b10b8b39
This commit is contained in:
Andrew Poelstra 2022-11-05 13:12:37 +00:00
parent b27169979b b84e1d46c0
commit 279ae365d2
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bitcoin/src/util/amount.rs → bitcoin/src/amount.rs
View File

@ -1241,13 +1241,13 @@ pub mod serde {
//! #[derive(Serialize, Deserialize)] //! #[derive(Serialize, Deserialize)]
//! # #[serde(crate = "actual_serde")] //! # #[serde(crate = "actual_serde")]
//! pub struct HasAmount { //! pub struct HasAmount {
//! #[serde(with = "bitcoin::util::amount::serde::as_btc")] //! #[serde(with = "bitcoin::amount::serde::as_btc")]
//! pub amount: Amount, //! pub amount: Amount,
//! } //! }
//! ``` //! ```
use serde::{Deserialize, Deserializer, Serialize, Serializer}; use serde::{Deserialize, Deserializer, Serialize, Serializer};
use crate::util::amount::{Amount, Denomination, SignedAmount}; use crate::amount::{Amount, Denomination, SignedAmount};
/// This trait is used only to avoid code duplication and naming collisions /// This trait is used only to avoid code duplication and naming collisions
/// of the different serde serialization crates. /// of the different serde serialization crates.
@ -1334,7 +1334,7 @@ pub mod serde {
//! Use with `#[serde(with = "amount::serde::as_sat")]`. //! Use with `#[serde(with = "amount::serde::as_sat")]`.
use serde::{Deserializer, Serializer}; use serde::{Deserializer, Serializer};
use crate::util::amount::serde::SerdeAmount; use crate::amount::serde::SerdeAmount;
pub fn serialize<A: SerdeAmount, S: Serializer>(a: &A, s: S) -> Result<S::Ok, S::Error> { pub fn serialize<A: SerdeAmount, S: Serializer>(a: &A, s: S) -> Result<S::Ok, S::Error> {
a.ser_sat(s) a.ser_sat(s)
@ -1349,7 +1349,7 @@ pub mod serde {
//! Use with `#[serde(default, with = "amount::serde::as_sat::opt")]`. //! Use with `#[serde(default, with = "amount::serde::as_sat::opt")]`.
use serde::{Deserializer, Serializer, de}; use serde::{Deserializer, Serializer, de};
use crate::util::amount::serde::SerdeAmountForOpt; use crate::amount::serde::SerdeAmountForOpt;
use core::fmt; use core::fmt;
use core::marker::PhantomData; use core::marker::PhantomData;
@ -1398,7 +1398,7 @@ pub mod serde {
//! Use with `#[serde(with = "amount::serde::as_btc")]`. //! Use with `#[serde(with = "amount::serde::as_btc")]`.
use serde::{Deserializer, Serializer}; use serde::{Deserializer, Serializer};
use crate::util::amount::serde::SerdeAmount; use crate::amount::serde::SerdeAmount;
pub fn serialize<A: SerdeAmount, S: Serializer>(a: &A, s: S) -> Result<S::Ok, S::Error> { pub fn serialize<A: SerdeAmount, S: Serializer>(a: &A, s: S) -> Result<S::Ok, S::Error> {
a.ser_btc(s) a.ser_btc(s)
@ -1413,7 +1413,7 @@ pub mod serde {
//! Use with `#[serde(default, with = "amount::serde::as_btc::opt")]`. //! Use with `#[serde(default, with = "amount::serde::as_btc::opt")]`.
use serde::{Deserializer, Serializer, de}; use serde::{Deserializer, Serializer, de};
use crate::util::amount::serde::SerdeAmountForOpt; use crate::amount::serde::SerdeAmountForOpt;
use core::fmt; use core::fmt;
use core::marker::PhantomData; use core::marker::PhantomData;
@ -1957,9 +1957,9 @@ mod tests {
#[derive(Serialize, Deserialize, PartialEq, Debug)] #[derive(Serialize, Deserialize, PartialEq, Debug)]
#[serde(crate = "actual_serde")] #[serde(crate = "actual_serde")]
struct T { struct T {
#[serde(with = "crate::util::amount::serde::as_sat")] #[serde(with = "crate::amount::serde::as_sat")]
pub amt: Amount, pub amt: Amount,
#[serde(with = "crate::util::amount::serde::as_sat")] #[serde(with = "crate::amount::serde::as_sat")]
pub samt: SignedAmount, pub samt: SignedAmount,
} }
@ -1988,9 +1988,9 @@ mod tests {
#[derive(Serialize, Deserialize, PartialEq, Debug)] #[derive(Serialize, Deserialize, PartialEq, Debug)]
#[serde(crate = "actual_serde")] #[serde(crate = "actual_serde")]
struct T { struct T {
#[serde(with = "crate::util::amount::serde::as_btc")] #[serde(with = "crate::amount::serde::as_btc")]
pub amt: Amount, pub amt: Amount,
#[serde(with = "crate::util::amount::serde::as_btc")] #[serde(with = "crate::amount::serde::as_btc")]
pub samt: SignedAmount, pub samt: SignedAmount,
} }
@ -2024,9 +2024,9 @@ mod tests {
#[derive(Serialize, Deserialize, PartialEq, Debug, Eq)] #[derive(Serialize, Deserialize, PartialEq, Debug, Eq)]
#[serde(crate = "actual_serde")] #[serde(crate = "actual_serde")]
struct T { struct T {
#[serde(default, with = "crate::util::amount::serde::as_btc::opt")] #[serde(default, with = "crate::amount::serde::as_btc::opt")]
pub amt: Option<Amount>, pub amt: Option<Amount>,
#[serde(default, with = "crate::util::amount::serde::as_btc::opt")] #[serde(default, with = "crate::amount::serde::as_btc::opt")]
pub samt: Option<SignedAmount>, pub samt: Option<SignedAmount>,
} }
@ -2069,9 +2069,9 @@ mod tests {
#[derive(Serialize, Deserialize, PartialEq, Debug, Eq)] #[derive(Serialize, Deserialize, PartialEq, Debug, Eq)]
#[serde(crate = "actual_serde")] #[serde(crate = "actual_serde")]
struct T { struct T {
#[serde(default, with = "crate::util::amount::serde::as_sat::opt")] #[serde(default, with = "crate::amount::serde::as_sat::opt")]
pub amt: Option<Amount>, pub amt: Option<Amount>,
#[serde(default, with = "crate::util::amount::serde::as_sat::opt")] #[serde(default, with = "crate::amount::serde::as_sat::opt")]
pub samt: Option<SignedAmount>, pub samt: Option<SignedAmount>,
} }

3
bitcoin/src/lib.rs
View File

@ -85,6 +85,7 @@ mod serde_utils;
#[macro_use] #[macro_use]
pub mod network; pub mod network;
pub mod address; pub mod address;
pub mod amount;
pub mod bip152; pub mod bip152;
pub mod bip158; pub mod bip158;
pub mod bip32; pub mod bip32;
@ -116,7 +117,7 @@ pub use crate::consensus::encode::VarInt;
pub use crate::hash_types::*; pub use crate::hash_types::*;
pub use crate::network::constants::Network; pub use crate::network::constants::Network;
pub use crate::pow::{CompactTarget, Target, Work}; pub use crate::pow::{CompactTarget, Target, Work};
pub use crate::util::amount::{Amount, Denomination, SignedAmount}; pub use crate::amount::{Amount, Denomination, SignedAmount};
pub use crate::util::ecdsa::{self, EcdsaSig, EcdsaSigError}; pub use crate::util::ecdsa::{self, EcdsaSig, EcdsaSigError};
pub use crate::util::key::{KeyPair, PrivateKey, PublicKey, XOnlyPublicKey}; pub use crate::util::key::{KeyPair, PrivateKey, PublicKey, XOnlyPublicKey};
pub use crate::util::merkleblock::MerkleBlock; pub use crate::util::merkleblock::MerkleBlock;

1
bitcoin/src/util/mod.rs
View File

@ -9,7 +9,6 @@
pub mod key; pub mod key;
pub mod ecdsa; pub mod ecdsa;
pub mod schnorr; pub mod schnorr;
pub mod amount;
pub mod base58; pub mod base58;
pub mod merkleblock; pub mod merkleblock;
pub mod psbt; pub mod psbt;

8
fuzz/fuzz_targets/deserialize_amount.rs
View File

@ -4,22 +4,22 @@ fn do_test(data: &[u8]) {
let data_str = String::from_utf8_lossy(data); let data_str = String::from_utf8_lossy(data);
// signed // signed
let samt = match bitcoin::util::amount::SignedAmount::from_str(&data_str) { let samt = match bitcoin::amount::SignedAmount::from_str(&data_str) {
Ok(amt) => amt, Ok(amt) => amt,
Err(_) => return, Err(_) => return,
}; };
let samt_roundtrip = match bitcoin::util::amount::SignedAmount::from_str(&samt.to_string()) { let samt_roundtrip = match bitcoin::amount::SignedAmount::from_str(&samt.to_string()) {
Ok(amt) => amt, Ok(amt) => amt,
Err(_) => return, Err(_) => return,
}; };
assert_eq!(samt, samt_roundtrip); assert_eq!(samt, samt_roundtrip);
// unsigned // unsigned
let amt = match bitcoin::util::amount::Amount::from_str(&data_str) { let amt = match bitcoin::amount::Amount::from_str(&data_str) {
Ok(amt) => amt, Ok(amt) => amt,
Err(_) => return, Err(_) => return,
}; };
let amt_roundtrip = match bitcoin::util::amount::Amount::from_str(&amt.to_string()) { let amt_roundtrip = match bitcoin::amount::Amount::from_str(&amt.to_string()) {
Ok(amt) => amt, Ok(amt) => amt,
Err(_) => return, Err(_) => return,
}; };