Skip to content

Commit ca9ca75

Browse files
wpaulinowpaulino
committed
Move events.rs into its own top-level module
This is largely motivated by some follow-up work for anchors that will introduce an event handler for `BumpTransaction` events, which we can now include in this new top-level `events` module.
1 parent 3d479c9 commit ca9ca75

34 files changed

+94
-95
lines changed

‎fuzz/src/chanmon_consistency.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ use lightning::chain::channelmonitor::{ChannelMonitor, MonitorEvent};
3838
use lightning::chain::transaction::OutPoint;
3939
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
4040
use lightning::chain::keysinterface::{KeyMaterial, InMemorySigner, Recipient, EntropySource, NodeSigner, SignerProvider};
41+
use lightning::events;
42+
use lightning::events::MessageSendEventsProvider;
4143
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
4244
use lightning::ln::channelmanager::{ChainParameters, ChannelDetails, ChannelManager, PaymentSendFailure, ChannelManagerReadArgs, PaymentId};
4345
use lightning::ln::channel::FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE;
4446
use lightning::ln::msgs::{self, CommitmentUpdate, ChannelMessageHandler, DecodeError, UpdateAddHTLC, Init};
4547
use lightning::ln::script::ShutdownScript;
4648
use lightning::util::enforcing_trait_impls::{EnforcingSigner, EnforcementState};
4749
use lightning::util::errors::APIError;
48-
use lightning::util::events;
4950
use lightning::util::logger::Logger;
5051
use lightning::util::config::UserConfig;
51-
use lightning::util::events::MessageSendEventsProvider;
5252
use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};
5353
use lightning::routing::router::{InFlightHtlcs, Route, RouteHop, RouteParameters, Router};
5454

‎fuzz/src/full_stack.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget,
3535
use lightning::chain::chainmonitor;
3636
use lightning::chain::transaction::OutPoint;
3737
use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeyMaterial, EntropySource, NodeSigner, SignerProvider};
38+
use lightning::events::Event;
3839
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
3940
use lightning::ln::channelmanager::{ChainParameters, ChannelDetails, ChannelManager, PaymentId};
4041
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,IgnoringMessageHandler};
@@ -46,7 +47,6 @@ use lightning::routing::router::{find_route, InFlightHtlcs, PaymentParameters, R
4647
use lightning::routing::scoring::FixedPenaltyScorer;
4748
use lightning::util::config::UserConfig;
4849
use lightning::util::errors::APIError;
49-
use lightning::util::events::Event;
5050
use lightning::util::enforcing_trait_impls::{EnforcingSigner, EnforcementState};
5151
use lightning::util::logger::Logger;
5252
use lightning::util::ser::{Readable, Writeable};

‎lightning-background-processor/src/lib.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ use lightning::chain;
2626
use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
2727
use lightning::chain::chainmonitor::{ChainMonitor, Persist};
2828
use lightning::chain::keysinterface::{EntropySource, NodeSigner, SignerProvider};
29+
use lightning::events::{Event, PathFailure};
30+
#[cfg(feature = "std")]
31+
use lightning::events::{EventHandler, EventsProvider};
2932
use lightning::ln::channelmanager::ChannelManager;
3033
use lightning::ln::msgs::{ChannelMessageHandler, OnionMessageHandler, RoutingMessageHandler};
3134
use lightning::ln::peer_handler::{CustomMessageHandler, PeerManager, SocketDescriptor};
3235
use lightning::routing::gossip::{NetworkGraph, P2PGossipSync};
3336
use lightning::routing::utxo::UtxoLookup;
3437
use lightning::routing::router::Router;
3538
use lightning::routing::scoring::{Score, WriteableScore};
36-
use lightning::util::events::{Event, PathFailure};
37-
#[cfg(feature = "std")]
38-
use lightning::util::events::{EventHandler, EventsProvider};
3939
use lightning::util::logger::Logger;
4040
use lightning::util::persist::Persister;
4141
use lightning_rapid_gossip_sync::RapidGossipSync;
@@ -80,7 +80,7 @@ use alloc::vec::Vec;
8080
/// unilateral chain closure fees are at risk.
8181
///
8282
/// [`ChannelMonitor`]: lightning::chain::channelmonitor::ChannelMonitor
83-
/// [`Event`]: lightning::util::events::Event
83+
/// [`Event`]: lightning::events::Event
8484
#[cfg(feature = "std")]
8585
#[must_use = "BackgroundProcessor will immediately stop on drop. It should be stored until shutdown."]
8686
pub struct BackgroundProcessor {
@@ -663,6 +663,7 @@ mod tests {
663663
use lightning::chain::channelmonitor::ANTI_REORG_DELAY;
664664
use lightning::chain::keysinterface::{InMemorySigner, KeysManager};
665665
use lightning::chain::transaction::OutPoint;
666+
use lightning::events::{Event, PathFailure, MessageSendEventsProvider, MessageSendEvent};
666667
use lightning::get_event_msg;
667668
use lightning::ln::PaymentHash;
668669
use lightning::ln::channelmanager;
@@ -674,7 +675,6 @@ mod tests {
674675
use lightning::routing::router::{DefaultRouter, RouteHop};
675676
use lightning::routing::scoring::{ChannelUsage, Score};
676677
use lightning::util::config::UserConfig;
677-
use lightning::util::events::{Event, PathFailure, MessageSendEventsProvider, MessageSendEvent};
678678
use lightning::util::ser::Writeable;
679679
use lightning::util::test_utils;
680680
use lightning::util::persist::KVStorePersister;

‎lightning-invoice/src/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,12 +665,12 @@ mod test {
665665
use bitcoin_hashes::{Hash, sha256};
666666
use bitcoin_hashes::sha256::Hash as Sha256;
667667
use lightning::chain::keysinterface::{EntropySource, PhantomKeysManager};
668+
use lightning::events::{MessageSendEvent, MessageSendEventsProvider, Event};
668669
use lightning::ln::{PaymentPreimage, PaymentHash};
669670
use lightning::ln::channelmanager::{PhantomRouteHints, MIN_FINAL_CLTV_EXPIRY_DELTA, PaymentId};
670671
use lightning::ln::functional_test_utils::*;
671672
use lightning::ln::msgs::ChannelMessageHandler;
672673
use lightning::routing::router::{PaymentParameters, RouteParameters, find_route};
673-
use lightning::util::events::{MessageSendEvent, MessageSendEventsProvider, Event};
674674
use lightning::util::test_utils;
675675
use lightning::util::config::UserConfig;
676676
use crate::utils::create_invoice_from_channelmanager_and_duration_since_epoch;

‎lightning-net-tokio/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
//! ```
2525
//! use std::net::TcpStream;
2626
//! use bitcoin::secp256k1::PublicKey;
27-
//! use lightning::util::events::{Event, EventHandler, EventsProvider};
27+
//! use lightning::events::{Event, EventHandler, EventsProvider};
2828
//! use std::net::SocketAddr;
2929
//! use std::sync::Arc;
3030
//!
@@ -586,7 +586,7 @@ mod tests {
586586
use lightning::ln::peer_handler::{MessageHandler, PeerManager};
587587
use lightning::ln::features::NodeFeatures;
588588
use lightning::routing::gossip::NodeId;
589-
use lightning::util::events::*;
589+
use lightning::events::*;
590590
use lightning::util::test_utils::TestNodeSigner;
591591
use bitcoin::secp256k1::{Secp256k1, SecretKey, PublicKey};
592592

‎lightning-persister/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ mod tests {
143143
use lightning::chain::chainmonitor::Persist;
144144
use lightning::chain::transaction::OutPoint;
145145
use lightning::{check_closed_broadcast, check_closed_event, check_added_monitors};
146+
use lightning::events::{ClosureReason, MessageSendEventsProvider};
146147
use lightning::ln::functional_test_utils::*;
147-
use lightning::util::events::{ClosureReason, MessageSendEventsProvider};
148148
use lightning::util::test_utils;
149149
use std::fs;
150150
use bitcoin::hashes::Hash;

‎lightning/src/chain/chainmonitor.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ use crate::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
3232
use crate::chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, Balance, MonitorEvent, TransactionOutputs, LATENCY_GRACE_PERIOD_BLOCKS};
3333
use crate::chain::transaction::{OutPoint, TransactionData};
3434
use crate::chain::keysinterface::WriteableEcdsaChannelSigner;
35+
use crate::events;
36+
use crate::events::{Event, EventHandler};
3537
use crate::util::atomic_counter::AtomicCounter;
3638
use crate::util::logger::Logger;
3739
use crate::util::errors::APIError;
38-
use crate::util::events;
39-
use crate::util::events::{Event, EventHandler};
4040
use crate::ln::channelmanager::ChannelDetails;
4141

4242
use crate::prelude::*;
@@ -490,7 +490,7 @@ where C::Target: chain::Filter,
490490

491491
#[cfg(any(test, fuzzing, feature = "_test_utils"))]
492492
pub fn get_and_clear_pending_events(&self) -> Vec<events::Event> {
493-
use crate::util::events::EventsProvider;
493+
use crate::events::EventsProvider;
494494
let events = core::cell::RefCell::new(Vec::new());
495495
let event_handler = |event: events::Event| events.borrow_mut().push(event);
496496
self.process_pending_events(&event_handler);
@@ -502,7 +502,7 @@ where C::Target: chain::Filter,
502502
///
503503
/// See the trait-level documentation of [`EventsProvider`] for requirements.
504504
///
505-
/// [`EventsProvider`]: crate::util::events::EventsProvider
505+
/// [`EventsProvider`]: crate::events::EventsProvider
506506
pub async fn process_pending_events_async<Future: core::future::Future, H: Fn(Event) -> Future>(
507507
&self, handler: H
508508
) {
@@ -792,11 +792,11 @@ mod tests {
792792
use crate::{get_htlc_update_msgs, get_local_commitment_txn, get_revoke_commit_msgs, get_route_and_payment_hash, unwrap_send_err};
793793
use crate::chain::{ChannelMonitorUpdateStatus, Confirm, Watch};
794794
use crate::chain::channelmonitor::LATENCY_GRACE_PERIOD_BLOCKS;
795+
use crate::events::{Event, ClosureReason, MessageSendEvent, MessageSendEventsProvider};
795796
use crate::ln::channelmanager::{PaymentSendFailure, PaymentId};
796797
use crate::ln::functional_test_utils::*;
797798
use crate::ln::msgs::ChannelMessageHandler;
798799
use crate::util::errors::APIError;
799-
use crate::util::events::{Event, ClosureReason, MessageSendEvent, MessageSendEventsProvider};
800800

801801
#[test]
802802
fn test_async_ooo_offchain_updates() {

‎lightning/src/chain/channelmonitor.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ use crate::chain::Filter;
5151
use crate::util::logger::Logger;
5252
use crate::util::ser::{Readable, ReadableArgs, RequiredWrapper, MaybeReadable, UpgradableRequired, Writer, Writeable, U48};
5353
use crate::util::byte_utils;
54-
use crate::util::events::Event;
54+
use crate::events::Event;
5555
#[cfg(anchors)]
56-
use crate::util::events::{AnchorDescriptor, HTLCDescriptor, BumpTransactionEvent};
56+
use crate::events::{AnchorDescriptor, HTLCDescriptor, BumpTransactionEvent};
5757

5858
use crate::prelude::*;
5959
use core::{cmp, mem};
@@ -1279,7 +1279,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
12791279
/// This is called by the [`EventsProvider::process_pending_events`] implementation for
12801280
/// [`ChainMonitor`].
12811281
///
1282-
/// [`EventsProvider::process_pending_events`]: crate::util::events::EventsProvider::process_pending_events
1282+
/// [`EventsProvider::process_pending_events`]: crate::events::EventsProvider::process_pending_events
12831283
/// [`ChainMonitor`]: crate::chain::chainmonitor::ChainMonitor
12841284
pub fn get_and_clear_pending_events(&self) -> Vec<Event> {
12851285
self.inner.lock().unwrap().get_and_clear_pending_events()
@@ -4005,14 +4005,14 @@ mod tests {
40054005
use crate::chain::package::{weight_offered_htlc, weight_received_htlc, weight_revoked_offered_htlc, weight_revoked_received_htlc, WEIGHT_REVOKED_OUTPUT};
40064006
use crate::chain::transaction::OutPoint;
40074007
use crate::chain::keysinterface::InMemorySigner;
4008+
use crate::events::ClosureReason;
40084009
use crate::ln::{PaymentPreimage, PaymentHash};
40094010
use crate::ln::chan_utils;
40104011
use crate::ln::chan_utils::{HTLCOutputInCommitment, ChannelPublicKeys, ChannelTransactionParameters, HolderCommitmentTransaction, CounterpartyChannelTransactionParameters};
40114012
use crate::ln::channelmanager::{PaymentSendFailure, PaymentId};
40124013
use crate::ln::functional_test_utils::*;
40134014
use crate::ln::script::ShutdownScript;
40144015
use crate::util::errors::APIError;
4015-
use crate::util::events::ClosureReason;
40164016
use crate::util::test_utils::{TestLogger, TestBroadcaster, TestFeeEstimator};
40174017
use crate::util::ser::{ReadableArgs, Writeable};
40184018
use crate::sync::{Arc, Mutex};

‎lightning/src/chain/keysinterface.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ use bitcoin::{PackedLockTime, secp256k1, Sequence, Witness};
3434
use crate::util::transaction_utils;
3535
use crate::util::crypto::{hkdf_extract_expand_twice, sign};
3636
use crate::util::ser::{Writeable, Writer, Readable};
37-
#[cfg(anchors)]
38-
use crate::util::events::HTLCDescriptor;
3937
use crate::chain::transaction::OutPoint;
38+
#[cfg(anchors)]
39+
use crate::events::HTLCDescriptor;
4040
use crate::ln::channel::ANCHOR_OUTPUT_VALUE_SATOSHI;
4141
use crate::ln::{chan_utils, PaymentPreimage};
4242
use crate::ln::chan_utils::{HTLCOutputInCommitment, make_funding_redeemscript, ChannelPublicKeys, HolderCommitmentTransaction, ChannelTransactionParameters, CommitmentTransaction, ClosingTransaction};
@@ -135,7 +135,7 @@ impl_writeable_tlv_based!(StaticPaymentOutputDescriptor, {
135135
/// outpoint describing which `txid` and output `index` is available, the full output which exists
136136
/// at that `txid`/`index`, and any keys or other information required to sign.
137137
///
138-
/// [`SpendableOutputs`]: crate::util::events::Event::SpendableOutputs
138+
/// [`SpendableOutputs`]: crate::events::Event::SpendableOutputs
139139
#[derive(Clone, Debug, PartialEq, Eq)]
140140
pub enum SpendableOutputDescriptor {
141141
/// An output to a script which was provided via [`SignerProvider`] directly, either from

‎lightning/src/util/events.rs renamed to ‎lightning/src/events/mod.rs

File renamed without changes.

‎lightning/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ pub mod ln;
8181
pub mod offers;
8282
pub mod routing;
8383
pub mod onion_message;
84+
pub mod events;
8485

8586
#[cfg(feature = "std")]
8687
/// Re-export of either `core2::io` or `std::io`, depending on the `std` feature flag.

‎lightning/src/ln/chanmon_update_fail_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ use bitcoin::network::constants::Network;
1919
use crate::chain::channelmonitor::{ANTI_REORG_DELAY, ChannelMonitor};
2020
use crate::chain::transaction::OutPoint;
2121
use crate::chain::{ChannelMonitorUpdateStatus, Listen, Watch};
22+
use crate::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose, ClosureReason, HTLCDestination};
2223
use crate::ln::channelmanager::{ChannelManager, RAACommitmentOrder, PaymentSendFailure, PaymentId};
2324
use crate::ln::channel::AnnouncementSigsState;
2425
use crate::ln::msgs;
2526
use crate::ln::msgs::{ChannelMessageHandler, RoutingMessageHandler};
2627
use crate::util::enforcing_trait_impls::EnforcingSigner;
27-
use crate::util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose, ClosureReason, HTLCDestination};
2828
use crate::util::errors::APIError;
2929
use crate::util::ser::{ReadableArgs, Writeable};
3030
use crate::util::test_utils::TestBroadcaster;

‎lightning/src/ln/channel.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ use crate::chain::chaininterface::{FeeEstimator, ConfirmationTarget, LowerBounde
3636
use crate::chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateStep, LATENCY_GRACE_PERIOD_BLOCKS};
3737
use crate::chain::transaction::{OutPoint, TransactionData};
3838
use crate::chain::keysinterface::{WriteableEcdsaChannelSigner, EntropySource, ChannelSigner, SignerProvider, NodeSigner, Recipient};
39+
use crate::events::ClosureReason;
3940
use crate::routing::gossip::NodeId;
40-
use crate::util::events::ClosureReason;
4141
use crate::util::ser::{Readable, ReadableArgs, Writeable, Writer, VecWriter};
4242
use crate::util::logger::Logger;
4343
use crate::util::errors::APIError;

‎lightning/src/ln/channelmanager.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ use crate::chain::{Confirm, ChannelMonitorUpdateStatus, Watch, BestBlock};
3535
use crate::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator, LowerBoundedFeeEstimator};
3636
use crate::chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateStep, HTLC_FAIL_BACK_BUFFER, CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS, ANTI_REORG_DELAY, MonitorEvent, CLOSED_CHANNEL_UPDATE_ID};
3737
use crate::chain::transaction::{OutPoint, TransactionData};
38+
use crate::events;
39+
use crate::events::{Event, EventHandler, EventsProvider, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination};
3840
// Since this struct is returned in `list_channels` methods, expose it here in case users want to
3941
// construct one themselves.
4042
use crate::ln::{inbound_payment, PaymentHash, PaymentPreimage, PaymentSecret};
@@ -55,8 +57,6 @@ use crate::ln::outbound_payment::{OutboundPayments, PaymentAttempts, PendingOutb
5557
use crate::ln::wire::Encode;
5658
use crate::chain::keysinterface::{EntropySource, KeysManager, NodeSigner, Recipient, SignerProvider, ChannelSigner, WriteableEcdsaChannelSigner};
5759
use crate::util::config::{UserConfig, ChannelConfig};
58-
use crate::util::events::{Event, EventHandler, EventsProvider, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination};
59-
use crate::util::events;
6060
use crate::util::wakers::{Future, Notifier};
6161
use crate::util::scid_utils::fake_scid;
6262
use crate::util::string::UntrustedString;
@@ -1947,7 +1947,7 @@ where
19471947
/// [`ChannelConfig::force_close_avoidance_max_fee_satoshis`]: crate::util::config::ChannelConfig::force_close_avoidance_max_fee_satoshis
19481948
/// [`Background`]: crate::chain::chaininterface::ConfirmationTarget::Background
19491949
/// [`Normal`]: crate::chain::chaininterface::ConfirmationTarget::Normal
1950-
/// [`SendShutdown`]: crate::util::events::MessageSendEvent::SendShutdown
1950+
/// [`SendShutdown`]: crate::events::MessageSendEvent::SendShutdown
19511951
pub fn close_channel(&self, channel_id: &[u8; 32], counterparty_node_id: &PublicKey) -> Result<(), APIError> {
19521952
self.close_channel_internal(channel_id, counterparty_node_id, None)
19531953
}
@@ -1971,7 +1971,7 @@ where
19711971
/// [`ChannelConfig::force_close_avoidance_max_fee_satoshis`]: crate::util::config::ChannelConfig::force_close_avoidance_max_fee_satoshis
19721972
/// [`Background`]: crate::chain::chaininterface::ConfirmationTarget::Background
19731973
/// [`Normal`]: crate::chain::chaininterface::ConfirmationTarget::Normal
1974-
/// [`SendShutdown`]: crate::util::events::MessageSendEvent::SendShutdown
1974+
/// [`SendShutdown`]: crate::events::MessageSendEvent::SendShutdown
19751975
pub fn close_channel_with_target_feerate(&self, channel_id: &[u8; 32], counterparty_node_id: &PublicKey, target_feerate_sats_per_1000_weight: u32) -> Result<(), APIError> {
19761976
self.close_channel_internal(channel_id, counterparty_node_id, Some(target_feerate_sats_per_1000_weight))
19771977
}
@@ -2845,8 +2845,8 @@ where
28452845
/// implemented by Bitcoin Core wallet. See <https://bitcoinops.org/en/topics/fee-sniping/>
28462846
/// for more details.
28472847
///
2848-
/// [`Event::FundingGenerationReady`]: crate::util::events::Event::FundingGenerationReady
2849-
/// [`Event::ChannelClosed`]: crate::util::events::Event::ChannelClosed
2848+
/// [`Event::FundingGenerationReady`]: crate::events::Event::FundingGenerationReady
2849+
/// [`Event::ChannelClosed`]: crate::events::Event::ChannelClosed
28502850
pub fn funding_transaction_generated(&self, temporary_channel_id: &[u8; 32], counterparty_node_id: &PublicKey, funding_transaction: Transaction) -> Result<(), APIError> {
28512851
let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
28522852

@@ -3905,8 +3905,8 @@ where
39053905
/// event matches your expectation. If you fail to do so and call this method, you may provide
39063906
/// the sender "proof-of-payment" when they did not fulfill the full expected payment.
39073907
///
3908-
/// [`Event::PaymentClaimable`]: crate::util::events::Event::PaymentClaimable
3909-
/// [`Event::PaymentClaimed`]: crate::util::events::Event::PaymentClaimed
3908+
/// [`Event::PaymentClaimable`]: crate::events::Event::PaymentClaimable
3909+
/// [`Event::PaymentClaimed`]: crate::events::Event::PaymentClaimed
39103910
/// [`process_pending_events`]: EventsProvider::process_pending_events
39113911
/// [`create_inbound_payment`]: Self::create_inbound_payment
39123912
/// [`create_inbound_payment_for_hash`]: Self::create_inbound_payment_for_hash
@@ -7874,14 +7874,14 @@ mod tests {
78747874
use bitcoin::secp256k1::{PublicKey, Secp256k1, SecretKey};
78757875
use core::time::Duration;
78767876
use core::sync::atomic::Ordering;
7877+
use crate::events::{Event, HTLCDestination, MessageSendEvent, MessageSendEventsProvider, ClosureReason};
78777878
use crate::ln::{PaymentPreimage, PaymentHash, PaymentSecret};
78787879
use crate::ln::channelmanager::{inbound_payment, PaymentId, PaymentSendFailure, InterceptId};
78797880
use crate::ln::functional_test_utils::*;
78807881
use crate::ln::msgs;
78817882
use crate::ln::msgs::ChannelMessageHandler;
78827883
use crate::routing::router::{PaymentParameters, RouteParameters, find_route};
78837884
use crate::util::errors::APIError;
7884-
use crate::util::events::{Event, HTLCDestination, MessageSendEvent, MessageSendEventsProvider, ClosureReason};
78857885
use crate::util::test_utils;
78867886
use crate::util::config::ChannelConfig;
78877887
use crate::chain::keysinterface::EntropySource;
@@ -8782,14 +8782,14 @@ pub mod bench {
87828782
use crate::chain::Listen;
87838783
use crate::chain::chainmonitor::{ChainMonitor, Persist};
87848784
use crate::chain::keysinterface::{EntropySource, KeysManager, InMemorySigner};
8785+
use crate::events::{Event, MessageSendEvent, MessageSendEventsProvider};
87858786
use crate::ln::channelmanager::{self, BestBlock, ChainParameters, ChannelManager, PaymentHash, PaymentPreimage, PaymentId};
87868787
use crate::ln::functional_test_utils::*;
87878788
use crate::ln::msgs::{ChannelMessageHandler, Init};
87888789
use crate::routing::gossip::NetworkGraph;
87898790
use crate::routing::router::{PaymentParameters, get_route};
87908791
use crate::util::test_utils;
87918792
use crate::util::config::UserConfig;
8792-
use crate::util::events::{Event, MessageSendEvent, MessageSendEventsProvider};
87938793

87948794
use bitcoin::hashes::Hash;
87958795
use bitcoin::hashes::sha256::Hash as Sha256;

0 commit comments

Comments
 (0)