EXPERIMENT: Try to use bitcoin::FeeRate

.. at the cost of `from_sat_per_vb`.

Author: tnull

bindings/ldk_node.udl

@@ -169,18 +169,11 @@ interface OnchainPayment {
 interface FeeRate {
 	[Name=from_sat_per_kwu]
 	constructor(u64 sat_kwu);
-	[Name=from_sat_per_vb, Throws=FeeRateError]
-	constructor(u64 sat_vb);
 	[Name=from_sat_per_vb_unchecked]
 	constructor(u64 sat_vb);
-	u64 as_sat_per_kwu();
-	u64 as_sat_per_vb_floor();
-	u64 as_sat_per_vb_ceil();
-};
-
-[Error]
-enum FeeRateError {
-	"ConversionError",
+	u64 to_sat_per_kwu();
+	u64 to_sat_per_vb_floor();
+	u64 to_sat_per_vb_ceil();
 };
 
 interface UnifiedQrPayment {

src/payment/onchain.rs

@@ -20,7 +20,7 @@ use std::sync::{Arc, RwLock};
 #[cfg(not(feature = "uniffi"))]
 type FeeRate = bitcoin::FeeRate;
 #[cfg(feature = "uniffi")]
-type FeeRate = Arc<crate::uniffi_types::FeeRate>;
+type FeeRate = Arc<bitcoin::FeeRate>;
 
 macro_rules! maybe_map_fee_rate_opt {
 	($fee_rate_opt: expr) => {{
@@ -30,7 +30,7 @@ macro_rules! maybe_map_fee_rate_opt {
 		}
 		#[cfg(feature = "uniffi")]
 		{
-			$fee_rate_opt.map(|f| f.0)
+			$fee_rate_opt.as_ref().map(|f| **f)
 		}
 	}};
 }

src/uniffi_types.rs

@@ -30,7 +30,7 @@ pub use lightning_types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
 
 pub use lightning_invoice::Bolt11Invoice;
 
-pub use bitcoin::{Address, BlockHash, Network, OutPoint, Txid};
+pub use bitcoin::{Address, BlockHash, FeeRate, Network, OutPoint, Txid};
 
 pub use bip39::Mnemonic;
 
@@ -51,7 +51,6 @@ use lightning::util::ser::Writeable;
 use lightning_invoice::SignedRawBolt11Invoice;
 
 use std::convert::TryInto;
-use std::fmt;
 use std::str::FromStr;
 
 impl UniffiCustomTypeConverter for PublicKey {
@@ -346,61 +345,3 @@ impl UniffiCustomTypeConverter for NodeAlias {
 		obj.to_string()
 	}
 }
-
-/// Represents fee rate.
-///
-/// This is a simple wrapper around [`bitcoin::FeeRate`], only used for UniFFI bindings.
-#[derive(Debug, Clone, Copy, Eq, PartialEq)]
-pub struct FeeRate(pub(crate) bitcoin::FeeRate);
-
-impl FeeRate {
-	/// Constructs `FeeRate` from satoshis per 1000 weight units.
-	pub const fn from_sat_per_kwu(sat_kwu: u64) -> Self {
-		Self(bitcoin::FeeRate::from_sat_per_kwu(sat_kwu))
-	}
-
-	/// Constructs `FeeRate` from satoshis per virtual bytes.
-	///
-	/// # Errors
-	///
-	/// Returns [`FeeRateError::ConversionError`] on arithmetic overflow.
-	pub fn from_sat_per_vb(sat_vb: u64) -> Result<Self, FeeRateError> {
-		Ok(Self(bitcoin::FeeRate::from_sat_per_vb(sat_vb).ok_or(FeeRateError::ConversionError)?))
-	}
-
-	/// Constructs `FeeRate` from satoshis per virtual bytes without overflow check.
-	pub const fn from_sat_per_vb_unchecked(sat_vb: u64) -> Self {
-		Self(bitcoin::FeeRate::from_sat_per_vb_unchecked(sat_vb))
-	}
-
-	/// Returns raw fee rate as satoshis per 1000 weight units.
-	pub const fn as_sat_per_kwu(&self) -> u64 {
-		self.0.to_sat_per_kwu()
-	}
-
-	/// Converts to sat/vB rounding down.
-	pub const fn as_sat_per_vb_floor(&self) -> u64 {
-		self.0.to_sat_per_vb_floor()
-	}
-
-	/// Converts to sat/vB rounding up.
-	pub const fn as_sat_per_vb_ceil(self) -> u64 {
-		self.0.to_sat_per_vb_ceil()
-	}
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-/// A fee rate error that possibly needs to be handled by the user.
-pub enum FeeRateError {
-	ConversionError,
-}
-
-impl std::error::Error for FeeRateError {}
-
-impl fmt::Display for FeeRateError {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		match self {
-			Self::ConversionError => write!(f, "Fee-rate conversion failed."),
-		}
-	}
-}