Merge pull request lightningdevkit#3545 from TheBlueMatt/2024-12-0.1-bindings

0.1 bindings

Author: TheBlueMatt

fuzz/src/chanmon_consistency.rs

@@ -48,13 +48,13 @@ use lightning::ln::channel::FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE;
 use lightning::ln::channel_state::ChannelDetails;
 use lightning::ln::channelmanager::{
 	ChainParameters, ChannelManager, ChannelManagerReadArgs, PaymentId, RecentPaymentDetails,
-	RecipientOnionFields, Retry,
 };
 use lightning::ln::functional_test_utils::*;
 use lightning::ln::inbound_payment::ExpandedKey;
 use lightning::ln::msgs::{
 	self, ChannelMessageHandler, CommitmentUpdate, DecodeError, Init, UpdateAddHTLC,
 };
+use lightning::ln::outbound_payment::{RecipientOnionFields, Retry};
 use lightning::ln::script::ShutdownScript;
 use lightning::ln::types::ChannelId;
 use lightning::offers::invoice::UnsignedBolt12Invoice;

fuzz/src/full_stack.rs

@@ -39,12 +39,11 @@ use lightning::chain::transaction::OutPoint;
 use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
 use lightning::events::Event;
 use lightning::ln::channel_state::ChannelDetails;
-use lightning::ln::channelmanager::{
-	ChainParameters, ChannelManager, InterceptId, PaymentId, RecipientOnionFields, Retry,
-};
+use lightning::ln::channelmanager::{ChainParameters, ChannelManager, InterceptId, PaymentId};
 use lightning::ln::functional_test_utils::*;
 use lightning::ln::inbound_payment::ExpandedKey;
 use lightning::ln::msgs::{self, DecodeError};
+use lightning::ln::outbound_payment::{RecipientOnionFields, Retry};
 use lightning::ln::peer_handler::{
 	IgnoringMessageHandler, MessageHandler, PeerManager, SocketDescriptor,
 };

fuzz/src/onion_message.rs

@@ -133,7 +133,7 @@ impl AsyncPaymentsMessageHandler for TestAsyncPaymentsMessageHandler {
 	fn handle_release_held_htlc(&self, _message: ReleaseHeldHtlc, _context: AsyncPaymentsContext) {}
 }
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 struct TestCustomMessage {}
 
 const CUSTOM_MESSAGE_TYPE: u64 = 4242;

lightning-background-processor/src/lib.rs

@@ -924,7 +924,7 @@ impl BackgroundProcessor {
 		SC: for<'b> WriteableScore<'b>,
 	>(
 		persister: PS, event_handler: EH, chain_monitor: M, channel_manager: CM,
-		onion_messenger: Option<OM>, gossip_sync: GossipSync<PGS, RGS, G, UL, L>, peer_manager: PM,
+		onion_messenger: OM, gossip_sync: GossipSync<PGS, RGS, G, UL, L>, peer_manager: PM,
 		logger: L, scorer: Option<S>,
 	) -> Self
 	where
@@ -961,34 +961,27 @@ impl BackgroundProcessor {
 				}
 				event_handler.handle_event(event)
 			};
+			let om_opt = Some(&*onion_messenger);
 			define_run_body!(
 				persister,
 				chain_monitor,
 				chain_monitor.process_pending_events(&event_handler),
 				channel_manager,
 				channel_manager.get_cm().process_pending_events(&event_handler),
-				onion_messenger,
-				if let Some(om) = &onion_messenger {
-					om.get_om().process_pending_events(&event_handler)
-				},
+				om_opt,
+				onion_messenger.get_om().process_pending_events(&event_handler),
 				peer_manager,
 				gossip_sync,
 				logger,
 				scorer,
 				stop_thread.load(Ordering::Acquire),
 				{
-					let sleeper = if let Some(om) = onion_messenger.as_ref() {
+					let sleeper =
 						Sleeper::from_three_futures(
 							&channel_manager.get_cm().get_event_or_persistence_needed_future(),
 							&chain_monitor.get_update_future(),
-							&om.get_om().get_update_future(),
-						)
-					} else {
-						Sleeper::from_two_futures(
-							&channel_manager.get_cm().get_event_or_persistence_needed_future(),
-							&chain_monitor.get_update_future(),
-						)
-					};
+							&onion_messenger.get_om().get_update_future(),
+						);
 					sleeper.wait_timeout(Duration::from_millis(100));
 				},
 				|_| Instant::now(),
@@ -1141,8 +1134,6 @@ mod tests {
 				Arc<test_utils::TestLogger>,
 				Arc<KeysManager>,
 				Arc<LockingWrapper<TestScorer>>,
-				(),
-				TestScorer,
 			>,
 		>,
 		Arc<
@@ -1412,10 +1403,11 @@ mod tests {
 	}
 
 	impl ScoreLookUp for TestScorer {
+		#[cfg(not(c_bindings))]
 		type ScoreParams = ();
 		fn channel_penalty_msat(
 			&self, _candidate: &CandidateRouteHop, _usage: ChannelUsage,
-			_score_params: &Self::ScoreParams,
+			_score_params: &lightning::routing::scoring::ProbabilisticScoringFeeParameters,
 		) -> u64 {
 			unimplemented!();
 		}

lightning-dns-resolver/src/lib.rs

@@ -162,9 +162,10 @@ mod test {
 	use lightning::blinded_path::message::{BlindedMessagePath, MessageContext};
 	use lightning::blinded_path::NodeIdLookUp;
 	use lightning::events::{Event, PaymentPurpose};
-	use lightning::ln::channelmanager::{PaymentId, Retry};
+	use lightning::ln::channelmanager::PaymentId;
 	use lightning::ln::functional_test_utils::*;
 	use lightning::ln::msgs::{ChannelMessageHandler, Init, OnionMessageHandler};
+	use lightning::ln::outbound_payment::Retry;
 	use lightning::ln::peer_handler::IgnoringMessageHandler;
 	use lightning::onion_message::dns_resolution::{HumanReadableName, OMNameResolver};
 	use lightning::onion_message::messenger::{

lightning-invoice/src/lib.rs

@@ -86,7 +86,9 @@ pub use crate::ser::Base32Iterable;
 #[allow(missing_docs)]
 #[derive(PartialEq, Eq, Debug, Clone)]
 pub enum Bolt11ParseError {
-	Bech32Error(CheckedHrpstringError),
+	Bech32Error(
+		/// This is not exported to bindings users as the specific error isn't all that useful.
+		CheckedHrpstringError),
 	ParseAmountError(ParseIntError),
 	MalformedSignature(bitcoin::secp256k1::Error),
 	BadPrefix,

lightning-liquidity/tests/common/mod.rs

@@ -80,8 +80,6 @@ type ChannelManager = channelmanager::ChannelManager<
 			Arc<test_utils::TestLogger>,
 			Arc<KeysManager>,
 			Arc<LockingWrapper<TestScorer>>,
-			(),
-			TestScorer,
 		>,
 	>,
 	Arc<
@@ -286,10 +284,11 @@ impl lightning::util::ser::Writeable for TestScorer {
 }
 
 impl ScoreLookUp for TestScorer {
+	#[cfg(not(c_bindings))]
 	type ScoreParams = ();
 	fn channel_penalty_msat(
 		&self, _candidate: &CandidateRouteHop, _usage: ChannelUsage,
-		_score_params: &Self::ScoreParams,
+		_score_params: &lightning::routing::scoring::ProbabilisticScoringFeeParameters,
 	) -> u64 {
 		unimplemented!();
 	}

lightning-transaction-sync/src/electrum.rs

@@ -5,6 +5,8 @@
 // http://opensource.org/licenses/MIT>, at your option. You may not use this file except in
 // accordance with one or both of these licenses.
 
+//! Chain sync using the electrum protocol
+
 use crate::common::{ConfirmedTx, FilterQueue, SyncState};
 use crate::error::{InternalError, TxSyncError};
 

lightning-transaction-sync/src/error.rs

@@ -5,6 +5,8 @@
 // http://opensource.org/licenses/MIT>, at your option. You may not use this file except in
 // accordance with one or both of these licenses.
 
+//! Common error types
+
 use std::fmt;
 
 #[derive(Debug)]

lightning-transaction-sync/src/esplora.rs

@@ -5,6 +5,8 @@
 // http://opensource.org/licenses/MIT>, at your option. You may not use this file except in
 // accordance with one or both of these licenses.
 
+//! Chain sync using the Esplora API
+
 use crate::common::{ConfirmedTx, FilterQueue, SyncState};
 use crate::error::{InternalError, TxSyncError};