Expose Bolt11PaymentError

We previously changed the BOLT11 payment API, also introducing a new
error type in `outbound_payment`. However, we didn't actualy re-export
that in `ChannelManager`, so it's currently inaccessible.

Author: tnull

lightning/src/ln/channelmanager.rs

@@ -82,13 +82,12 @@ use crate::ln::our_peer_storage::EncryptedOurPeerStorage;
 #[cfg(test)]
 use crate::ln::outbound_payment;
 use crate::ln::outbound_payment::{
-	Bolt11PaymentError, OutboundPayments, PendingOutboundPayment, RetryableInvoiceRequest,
-	SendAlongPathArgs, StaleExpiration,
+	OutboundPayments, PendingOutboundPayment, RetryableInvoiceRequest, SendAlongPathArgs,
+	StaleExpiration,
 };
-use crate::ln::types::ChannelId;
-use crate::offers::flow::OffersMessageFlow;
 use crate::offers::invoice::{
-	Bolt12Invoice, DerivedSigningPubkey, InvoiceBuilder, DEFAULT_RELATIVE_EXPIRY,
+	Bolt12Invoice, DerivedSigningPubkey, ExplicitSigningPubkey, InvoiceBuilder,
+	UnsignedBolt12Invoice, DEFAULT_RELATIVE_EXPIRY,
 };
 use crate::offers::invoice_error::InvoiceError;
 use crate::offers::invoice_request::InvoiceRequest;
@@ -174,6 +173,8 @@ use alloc::collections::{btree_map, BTreeMap};
 
 use crate::io;
 use crate::io::Read;
+#[cfg(any(test, feature = "_externalize_tests"))]
+pub(crate) use crate::ln::outbound_payment::PaymentSendFailure;
 use crate::prelude::*;
 use crate::sync::{Arc, FairRwLock, LockHeldState, LockTestExt, Mutex, RwLock, RwLockReadGuard};
 use bitcoin::hex::impl_fmt_traits;
@@ -183,12 +184,13 @@ use core::ops::Deref;
 use core::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 use core::time::Duration;
 use core::{cmp, mem};
+
 // Re-export this for use in the public API.
-#[cfg(any(test, feature = "_externalize_tests"))]
-pub(crate) use crate::ln::outbound_payment::PaymentSendFailure;
 pub use crate::ln::outbound_payment::{
-	Bolt12PaymentError, ProbeSendFailure, RecipientOnionFields, Retry, RetryableSendFailure,
+	Bolt11PaymentError, Bolt12PaymentError, ProbeSendFailure, RecipientOnionFields, Retry,
+	RetryableSendFailure,
 };
+
 use crate::ln::script::ShutdownScript;
 
 // We hold various information about HTLC relay in the HTLC objects in Channel itself: