@@ -56,28 +56,28 @@ use std::ops::Deref;
56
56
/// [`chain::Watch`]: ../trait.Watch.html
57
57
/// [`ChannelManager`]: ../../ln/channelmanager/struct.ChannelManager.html
58
58
/// [module-level documentation]: index.html
59
- pub struct ChainMonitor < ChanSigner : Sign , C : Deref , T : Deref , F : Deref , L : Deref , P : Deref >
59
+ pub struct ChainMonitor < ChannelSigner : Sign , C : Deref , T : Deref , F : Deref , L : Deref , P : Deref >
60
60
where C :: Target : chain:: Filter ,
61
61
T :: Target : BroadcasterInterface ,
62
62
F :: Target : FeeEstimator ,
63
63
L :: Target : Logger ,
64
- P :: Target : channelmonitor:: Persist < ChanSigner > ,
64
+ P :: Target : channelmonitor:: Persist < ChannelSigner > ,
65
65
{
66
66
/// The monitors
67
- pub monitors : Mutex < HashMap < OutPoint , ChannelMonitor < ChanSigner > > > ,
67
+ pub monitors : Mutex < HashMap < OutPoint , ChannelMonitor < ChannelSigner > > > ,
68
68
chain_source : Option < C > ,
69
69
broadcaster : T ,
70
70
logger : L ,
71
71
fee_estimator : F ,
72
72
persister : P ,
73
73
}
74
74
75
- impl < ChanSigner : Sign , C : Deref , T : Deref , F : Deref , L : Deref , P : Deref > ChainMonitor < ChanSigner , C , T , F , L , P >
75
+ impl < ChannelSigner : Sign , C : Deref , T : Deref , F : Deref , L : Deref , P : Deref > ChainMonitor < ChannelSigner , C , T , F , L , P >
76
76
where C :: Target : chain:: Filter ,
77
77
T :: Target : BroadcasterInterface ,
78
78
F :: Target : FeeEstimator ,
79
79
L :: Target : Logger ,
80
- P :: Target : channelmonitor:: Persist < ChanSigner > ,
80
+ P :: Target : channelmonitor:: Persist < ChannelSigner > ,
81
81
{
82
82
/// Dispatches to per-channel monitors, which are responsible for updating their on-chain view
83
83
/// of a channel and reacting accordingly based on transactions in the connected block. See
@@ -140,13 +140,13 @@ where C::Target: chain::Filter,
140
140
}
141
141
}
142
142
143
- impl < ChanSigner : Sign , C : Deref + Sync + Send , T : Deref + Sync + Send , F : Deref + Sync + Send , L : Deref + Sync + Send , P : Deref + Sync + Send >
144
- chain:: Watch < ChanSigner > for ChainMonitor < ChanSigner , C , T , F , L , P >
143
+ impl < ChannelSigner : Sign , C : Deref + Sync + Send , T : Deref + Sync + Send , F : Deref + Sync + Send , L : Deref + Sync + Send , P : Deref + Sync + Send >
144
+ chain:: Watch < ChannelSigner > for ChainMonitor < ChannelSigner , C , T , F , L , P >
145
145
where C :: Target : chain:: Filter ,
146
146
T :: Target : BroadcasterInterface ,
147
147
F :: Target : FeeEstimator ,
148
148
L :: Target : Logger ,
149
- P :: Target : channelmonitor:: Persist < ChanSigner > ,
149
+ P :: Target : channelmonitor:: Persist < ChannelSigner > ,
150
150
{
151
151
/// Adds the monitor that watches the channel referred to by the given outpoint.
152
152
///
@@ -156,7 +156,7 @@ where C::Target: chain::Filter,
156
156
/// monitors lock.
157
157
///
158
158
/// [`chain::Filter`]: ../trait.Filter.html
159
- fn watch_channel ( & self , funding_outpoint : OutPoint , monitor : ChannelMonitor < ChanSigner > ) -> Result < ( ) , ChannelMonitorUpdateErr > {
159
+ fn watch_channel ( & self , funding_outpoint : OutPoint , monitor : ChannelMonitor < ChannelSigner > ) -> Result < ( ) , ChannelMonitorUpdateErr > {
160
160
let mut monitors = self . monitors . lock ( ) . unwrap ( ) ;
161
161
let entry = match monitors. entry ( funding_outpoint) {
162
162
hash_map:: Entry :: Occupied ( _) => {
@@ -232,12 +232,12 @@ where C::Target: chain::Filter,
232
232
}
233
233
}
234
234
235
- impl < ChanSigner : Sign , C : Deref , T : Deref , F : Deref , L : Deref , P : Deref > events:: EventsProvider for ChainMonitor < ChanSigner , C , T , F , L , P >
235
+ impl < ChannelSigner : Sign , C : Deref , T : Deref , F : Deref , L : Deref , P : Deref > events:: EventsProvider for ChainMonitor < ChannelSigner , C , T , F , L , P >
236
236
where C :: Target : chain:: Filter ,
237
237
T :: Target : BroadcasterInterface ,
238
238
F :: Target : FeeEstimator ,
239
239
L :: Target : Logger ,
240
- P :: Target : channelmonitor:: Persist < ChanSigner > ,
240
+ P :: Target : channelmonitor:: Persist < ChannelSigner > ,
241
241
{
242
242
fn get_and_clear_pending_events ( & self ) -> Vec < Event > {
243
243
let mut pending_events = Vec :: new ( ) ;
0 commit comments