f: make sync sub mod

Author: joostjager

lightning/src/events/bump_transaction.rs

@@ -11,6 +11,8 @@
 //!
 //! [`Event`]: crate::events::Event
 
+pub mod sync;
+
 use alloc::collections::BTreeMap;
 use core::ops::Deref;
 
@@ -991,7 +993,7 @@ where
 mod tests {
 	use super::*;
 
-	use crate::events::bump_transaction_sync::{
+	use crate::events::bump_transaction::sync::{
 		BumpTransactionEventHandlerSync, CoinSelectionSourceSync,
 	};
 	use crate::io::Cursor;

lightning/src/events/bump_transaction_sync.rs renamed to lightning/src/events/bump_transaction/sync.rs

@@ -14,11 +14,11 @@ use crate::util::logger::Logger;
 
 use bitcoin::{Psbt, ScriptBuf, Transaction, TxOut};
 
-use super::bump_transaction::{
+use super::BumpTransactionEvent;
+use super::{
 	BumpTransactionEventHandler, CoinSelection, CoinSelectionSource, Input, Utxo, Wallet,
 	WalletSource,
 };
-use super::BumpTransactionEvent;
 
 /// A synchronous version of the [`WalletSource`] trait. Implementations of this trait should be wrapped in
 /// WalletSourceSyncWrapper for it to be used within rust-lightning.

lightning/src/events/mod.rs

@@ -15,7 +15,6 @@
 //! few other things.
 
 pub mod bump_transaction;
-pub mod bump_transaction_sync;
 
 pub use bump_transaction::BumpTransactionEvent;
 

lightning/src/ln/async_signer_tests.rs

@@ -20,7 +20,7 @@ use bitcoin::transaction::Version;
 
 use crate::chain::channelmonitor::LATENCY_GRACE_PERIOD_BLOCKS;
 use crate::chain::ChannelMonitorUpdateStatus;
-use crate::events::bump_transaction_sync::WalletSourceSync;
+use crate::events::bump_transaction::sync::WalletSourceSync;
 use crate::events::{ClosureReason, Event};
 use crate::ln::chan_utils::ClosingTransaction;
 use crate::ln::channel::DISCONNECT_PEER_AWAITING_RESPONSE_TICKS;

lightning/src/ln/functional_test_utils.rs

@@ -17,7 +17,7 @@ use crate::chain::channelmonitor::ChannelMonitor;
 use crate::chain::transaction::OutPoint;
 use crate::events::{ClaimedHTLC, ClosureReason, Event, HTLCHandlingFailureType, PaidBolt12Invoice, PathFailure, PaymentFailureReason, PaymentPurpose};
 use crate::events::bump_transaction::{BumpTransactionEvent};
-use crate::events::bump_transaction_sync::{BumpTransactionEventHandlerSync, WalletSourceSync, WalletSync};
+use crate::events::bump_transaction::sync::{BumpTransactionEventHandlerSync, WalletSourceSync, WalletSync};
 use crate::ln::types::ChannelId;
 use crate::types::features::ChannelTypeFeatures;
 use crate::types::payment::{PaymentPreimage, PaymentHash, PaymentSecret};

lightning/src/ln/functional_tests.rs

@@ -1473,7 +1473,7 @@ pub fn claim_htlc_outputs() {
 // This is a regression test for https://github.com/lightningdevkit/rust-lightning/issues/3537.
 #[xtest(feature = "_externalize_tests")]
 pub fn test_multiple_package_conflicts() {
-	use crate::events::bump_transaction_sync::WalletSourceSync;
+	use crate::events::bump_transaction::sync::WalletSourceSync;
 
 	let chanmon_cfgs = create_chanmon_cfgs(3);
 	let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);

lightning/src/ln/monitor_tests.rs

@@ -11,7 +11,7 @@
 
 //! Further functional tests which test blockchain reorganizations.
 
-use crate::events::bump_transaction_sync::WalletSourceSync;
+use crate::events::bump_transaction::sync::WalletSourceSync;
 use crate::sign::{ecdsa::EcdsaChannelSigner, OutputSpender, SignerProvider, SpendableOutputDescriptor};
 use crate::chain::channelmonitor::{ANTI_REORG_DELAY, ARCHIVAL_DELAY_BLOCKS,LATENCY_GRACE_PERIOD_BLOCKS, COUNTERPARTY_CLAIMABLE_WITHIN_BLOCKS_PINNABLE, Balance, BalanceSource, ChannelMonitorUpdateStep};
 use crate::chain::transaction::OutPoint;

lightning/src/util/test_utils.rs

@@ -21,8 +21,8 @@ use crate::chain::channelmonitor::{
 };
 use crate::chain::transaction::OutPoint;
 use crate::chain::WatchedOutput;
+use crate::events::bump_transaction::sync::WalletSourceSync;
 use crate::events::bump_transaction::Utxo;
-use crate::events::bump_transaction_sync::WalletSourceSync;
 #[cfg(any(test, feature = "_externalize_tests"))]
 use crate::ln::chan_utils::CommitmentTransaction;
 use crate::ln::channel_state::ChannelDetails;