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

Simplify fee_rate serde deserialize opt 

We can just call through to the `deserialize` function. Reduces code
duplication and increases maintainability.

Refactor only, no logic change.
This commit is contained in:
Tobin C. Harding 2025-05-14 12:25:33 +10:00
parent 87d6f1718c
commit d6940497fd
No known key found for this signature in database
GPG Key ID: 40BF9E4C269D6607
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
units/src/fee_rate/serde.rs
View File

@ -50,7 +50,7 @@ pub mod as_sat_per_kwu {
use core::fmt; use core::fmt;
use serde::{de, Deserialize, Deserializer, Serializer}; use serde::{de, Deserializer, Serializer};
use crate::FeeRate; use crate::FeeRate;
@ -83,7 +83,7 @@ pub mod as_sat_per_kwu {
where where
D: Deserializer<'de>, D: Deserializer<'de>,
{ {
Ok(Some(FeeRate::from_sat_per_kwu(u64::deserialize(d)?))) Ok(Some(super::deserialize(d)?))
} }
} }
d.deserialize_option(VisitOpt) d.deserialize_option(VisitOpt)
@ -121,9 +121,8 @@ pub mod as_sat_per_vb_floor {
use core::fmt; use core::fmt;
use serde::{de, Deserialize, Deserializer, Serializer}; use serde::{de, Deserializer, Serializer};
use crate::fee_rate::serde::OverflowError;
use crate::fee_rate::FeeRate; use crate::fee_rate::FeeRate;
#[allow(clippy::ref_option)] // API forced by serde. #[allow(clippy::ref_option)] // API forced by serde.
@ -155,11 +154,7 @@ pub mod as_sat_per_vb_floor {
where where
D: Deserializer<'de>, D: Deserializer<'de>,
{ {
Ok(Some( Ok(Some(super::deserialize(d)?))
FeeRate::from_sat_per_vb(u64::deserialize(d)?)
.ok_or(OverflowError)
.map_err(serde::de::Error::custom)?,
))
} }
} }
d.deserialize_option(VisitOpt) d.deserialize_option(VisitOpt)
@ -197,9 +192,8 @@ pub mod as_sat_per_vb_ceil {
use core::fmt; use core::fmt;
use serde::{de, Deserialize, Deserializer, Serializer}; use serde::{de, Deserializer, Serializer};
use crate::fee_rate::serde::OverflowError;
use crate::fee_rate::FeeRate; use crate::fee_rate::FeeRate;
#[allow(clippy::ref_option)] // API forced by serde. #[allow(clippy::ref_option)] // API forced by serde.
@ -231,11 +225,7 @@ pub mod as_sat_per_vb_ceil {
where where
D: Deserializer<'de>, D: Deserializer<'de>,
{ {
Ok(Some( Ok(Some(super::deserialize(d)?))
FeeRate::from_sat_per_vb(u64::deserialize(d)?)
.ok_or(OverflowError)
.map_err(serde::de::Error::custom)?,
))
} }
} }
d.deserialize_option(VisitOpt) d.deserialize_option(VisitOpt)