From: Matt Corallo <git@bluematt.me>
Date: Tue, 25 Apr 2023 17:40:40 +0000 (+0000)
Subject: Add some no-exporting of more offers code
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=934378ea00931ddbbca3663cb222a266a8349538;p=rust-lightning

Add some no-exporting of more offers code

These really could be handled in the bindings, but for lack of
immediate users there's not a strong reason to, so instead we just
disable them for now.
---

diff --git a/lightning/src/offers/invoice.rs b/lightning/src/offers/invoice.rs
index c6fd5d056..fb47fd8c5 100644
--- a/lightning/src/offers/invoice.rs
+++ b/lightning/src/offers/invoice.rs
@@ -314,6 +314,8 @@ impl<'a, S: SigningPubkeyStrategy> InvoiceBuilder<'a, S> {
 	///
 	/// Successive calls to this method will add another address. Caller is responsible for not
 	/// adding duplicate addresses and only calling if capable of receiving to P2TR addresses.
+	///
+	/// This is not exported to bindings users as TweakedPublicKey isn't yet mapped.
 	pub fn fallback_v1_p2tr_tweaked(mut self, output_key: &TweakedPublicKey) -> Self {
 		let address = FallbackAddress {
 			version: WitnessVersion::V1.to_num(),
@@ -678,6 +680,8 @@ macro_rules! invoice_accessors { ($self: ident, $contents: expr) => {
 
 	/// Fallback addresses for paying the invoice on-chain, in order of most-preferred to
 	/// least-preferred.
+	///
+	/// This is not exported to bindings users as Address is not yet mapped
 	pub fn fallbacks(&$self) -> Vec<Address> {
 		$contents.fallbacks()
 	}
diff --git a/lightning/src/offers/offer.rs b/lightning/src/offers/offer.rs
index 8e0d46261..6b85cba35 100644
--- a/lightning/src/offers/offer.rs
+++ b/lightning/src/offers/offer.rs
@@ -767,6 +767,9 @@ pub enum Amount {
 	/// An amount of currency specified using ISO 4712.
 	Currency {
 		/// The currency that the amount is denominated in.
+		///
+		/// This is not exported to bindings users as bindings have troubles with type aliases to
+		/// byte arrays.
 		iso4217_code: CurrencyCode,
 		/// The amount in the currency unit adjusted by the ISO 4712 exponent (e.g., USD cents).
 		amount: u64,
@@ -774,7 +777,7 @@ pub enum Amount {
 }
 
 /// An ISO 4712 three-letter currency code (e.g., USD).
-pub type CurrencyCode = [u8; 3];
+pub(crate) type CurrencyCode = [u8; 3];
 
 /// Quantity of items supported by an [`Offer`].
 #[derive(Clone, Copy, Debug, PartialEq)]
@@ -784,7 +787,8 @@ pub enum Quantity {
 	///
 	/// May be used with `NonZeroU64::new(1)` but prefer to use [`Quantity::One`] if only one item
 	/// is supported.
-	Bounded(NonZeroU64),
+	Bounded(/// This is not exported to bindings users as builder patterns don't map outside of move semantics.
+		NonZeroU64),
 	/// One or more items. Use when more than one item can be requested without any limit.
 	Unbounded,
 	/// Only one item. Use when only a single item can be requested.
diff --git a/lightning/src/offers/parse.rs b/lightning/src/offers/parse.rs
index c85c2f326..fcb4f1fc6 100644
--- a/lightning/src/offers/parse.rs
+++ b/lightning/src/offers/parse.rs
@@ -125,7 +125,8 @@ pub enum Bolt12ParseError {
 	/// being parsed.
 	InvalidBech32Hrp,
 	/// The string could not be bech32 decoded.
-	Bech32(bech32::Error),
+	Bech32(/// This is not exported to bindings users as the details don't matter much
+		bech32::Error),
 	/// The bech32 decoded string could not be decoded as the expected message type.
 	Decode(DecodeError),
 	/// The parsed message has invalid semantics.