@@ -790,7 +790,7 @@ $vis trait AChannelManager {
790
790
type NS : Deref <Target = Self :: NodeSigner >;
791
791
type Signer : WriteableEcdsaChannelSigner + Sized ;
792
792
type SignerProvider : SignerProvider <Signer = Self :: Signer > + ?Sized ;
793
- type SP : Deref <Target = Self :: SignerProvider > + Clone ;
793
+ type SP : Deref <Target = Self :: SignerProvider >;
794
794
type FeeEstimator : FeeEstimator + ?Sized ;
795
795
type F : Deref <Target = Self :: FeeEstimator >;
796
796
type Router : Router + ?Sized ;
@@ -804,7 +804,7 @@ $vis trait AChannelManager {
804
804
define_test_pub_trait ! ( pub ) ;
805
805
#[ cfg( not( any( test, feature = "_test_utils" ) ) ) ]
806
806
define_test_pub_trait ! ( pub ( crate ) ) ;
807
- impl < M : Deref , T : Deref , ES : Deref , NS : Deref , SP : Deref + Clone , F : Deref , R : Deref , L : Deref > AChannelManager
807
+ impl < M : Deref , T : Deref , ES : Deref , NS : Deref , SP : Deref , F : Deref , R : Deref , L : Deref > AChannelManager
808
808
for ChannelManager < M , T , ES , NS , SP , F , R , L >
809
809
where
810
810
M :: Target : chain:: Watch < <SP :: Target as SignerProvider >:: Signer > ,
@@ -926,7 +926,7 @@ where
926
926
// | |
927
927
// | |__`pending_background_events`
928
928
//
929
- pub struct ChannelManager < M : Deref , T : Deref , ES : Deref , NS : Deref , SP : Deref + Clone , F : Deref , R : Deref , L : Deref >
929
+ pub struct ChannelManager < M : Deref , T : Deref , ES : Deref , NS : Deref , SP : Deref , F : Deref , R : Deref , L : Deref >
930
930
where
931
931
M :: Target : chain:: Watch < <SP :: Target as SignerProvider >:: Signer > ,
932
932
T :: Target : BroadcasterInterface ,
@@ -2047,7 +2047,7 @@ macro_rules! process_events_body {
2047
2047
}
2048
2048
}
2049
2049
2050
- impl < M : Deref , T : Deref , ES : Deref , NS : Deref , SP : Deref + Clone , F : Deref , R : Deref , L : Deref > ChannelManager < M , T , ES , NS , SP , F , R , L >
2050
+ impl < M : Deref , T : Deref , ES : Deref , NS : Deref , SP : Deref , F : Deref , R : Deref , L : Deref > ChannelManager < M , T , ES , NS , SP , F , R , L >
2051
2051
where
2052
2052
M :: Target : chain:: Watch < <SP :: Target as SignerProvider >:: Signer > ,
2053
2053
T :: Target : BroadcasterInterface ,
@@ -2202,7 +2202,7 @@ where
2202
2202
let outbound_scid_alias = self . create_and_insert_outbound_scid_alias ( ) ;
2203
2203
let their_features = & peer_state. latest_features ;
2204
2204
let config = if override_config. is_some ( ) { override_config. as_ref ( ) . unwrap ( ) } else { & self . default_configuration } ;
2205
- match OutboundV1Channel :: new ( & self . fee_estimator , & self . entropy_source , self . signer_provider . clone ( ) , their_network_key,
2205
+ match OutboundV1Channel :: new ( & self . fee_estimator , & self . entropy_source , & self . signer_provider , their_network_key,
2206
2206
their_features, channel_value_satoshis, push_msat, user_channel_id, config,
2207
2207
self . best_block . read ( ) . unwrap ( ) . height ( ) , outbound_scid_alias)
2208
2208
{
@@ -2396,7 +2396,7 @@ where
2396
2396
let funding_txo_opt = chan_entry. get ( ) . context . get_funding_txo ( ) ;
2397
2397
let their_features = & peer_state. latest_features ;
2398
2398
let ( shutdown_msg, mut monitor_update_opt, htlcs) = chan_entry. get_mut ( )
2399
- . get_shutdown ( self . signer_provider . clone ( ) , their_features, target_feerate_sats_per_1000_weight, override_shutdown_script) ?;
2399
+ . get_shutdown ( & self . signer_provider , their_features, target_feerate_sats_per_1000_weight, override_shutdown_script) ?;
2400
2400
failed_htlcs = htlcs;
2401
2401
2402
2402
// We can send the `shutdown` message before updating the `ChannelMonitor`
@@ -5314,7 +5314,7 @@ where
5314
5314
msg. temporary_channel_id . clone ( ) ) ) ;
5315
5315
}
5316
5316
5317
- let mut channel = match InboundV1Channel :: new ( & self . fee_estimator , & self . entropy_source , self . signer_provider . clone ( ) ,
5317
+ let mut channel = match InboundV1Channel :: new ( & self . fee_estimator , & self . entropy_source , & self . signer_provider ,
5318
5318
counterparty_node_id. clone ( ) , & self . channel_type_features ( ) , & peer_state. latest_features , msg, user_channel_id,
5319
5319
& self . default_configuration , best_block_height, & self . logger , outbound_scid_alias)
5320
5320
{
@@ -5401,7 +5401,7 @@ where
5401
5401
let ( chan, funding_msg, monitor) =
5402
5402
match peer_state. inbound_v1_channel_by_id . remove ( & msg. temporary_channel_id ) {
5403
5403
Some ( inbound_chan) => {
5404
- match inbound_chan. funding_created ( msg, best_block, self . signer_provider . clone ( ) , & self . logger ) {
5404
+ match inbound_chan. funding_created ( msg, best_block, & self . signer_provider , & self . logger ) {
5405
5405
Ok ( res) => res,
5406
5406
Err ( ( mut inbound_chan, err) ) => {
5407
5407
// We've already removed this inbound channel from the map in `PeerState`
@@ -5480,7 +5480,7 @@ where
5480
5480
match peer_state. channel_by_id . entry ( msg. channel_id ) {
5481
5481
hash_map:: Entry :: Occupied ( mut chan) => {
5482
5482
let monitor = try_chan_entry ! ( self ,
5483
- chan. get_mut( ) . funding_signed( & msg, best_block, self . signer_provider. clone ( ) , & self . logger) , chan) ;
5483
+ chan. get_mut( ) . funding_signed( & msg, best_block, & self . signer_provider, & self . logger) , chan) ;
5484
5484
let update_res = self . chain_monitor . watch_channel ( chan. get ( ) . context . get_funding_txo ( ) . unwrap ( ) , monitor) ;
5485
5485
let mut res = handle_new_monitor_update ! ( self , update_res, peer_state_lock, peer_state, per_peer_state, chan, INITIAL_MONITOR ) ;
5486
5486
if let Err ( MsgHandleErrInternal { ref mut shutdown_finish, .. } ) = res {
@@ -5576,7 +5576,7 @@ where
5576
5576
5577
5577
let funding_txo_opt = chan_entry. get ( ) . context . get_funding_txo ( ) ;
5578
5578
let ( shutdown, monitor_update_opt, htlcs) = try_chan_entry ! ( self ,
5579
- chan_entry. get_mut( ) . shutdown( self . signer_provider. clone ( ) , & peer_state. latest_features, & msg) , chan_entry) ;
5579
+ chan_entry. get_mut( ) . shutdown( & self . signer_provider, & peer_state. latest_features, & msg) , chan_entry) ;
5580
5580
dropped_htlcs = htlcs;
5581
5581
5582
5582
if let Some ( msg) = shutdown {
@@ -6601,7 +6601,7 @@ where
6601
6601
}
6602
6602
}
6603
6603
6604
- impl < M : Deref , T : Deref , ES : Deref , NS : Deref , SP : Deref + Clone , F : Deref , R : Deref , L : Deref > MessageSendEventsProvider for ChannelManager < M , T , ES , NS , SP , F , R , L >
6604
+ impl < M : Deref , T : Deref , ES : Deref , NS : Deref , SP : Deref , F : Deref , R : Deref , L : Deref > MessageSendEventsProvider for ChannelManager < M , T , ES , NS , SP , F , R , L >
6605
6605
where
6606
6606
M :: Target : chain:: Watch < <SP :: Target as SignerProvider >:: Signer > ,
6607
6607
T :: Target : BroadcasterInterface ,
@@ -6663,7 +6663,7 @@ where
6663
6663
}
6664
6664
}
6665
6665
6666
- impl < M : Deref , T : Deref , ES : Deref , NS : Deref , SP : Deref + Clone , F : Deref , R : Deref , L : Deref > EventsProvider for ChannelManager < M , T , ES , NS , SP , F , R , L >
6666
+ impl < M : Deref , T : Deref , ES : Deref , NS : Deref , SP : Deref , F : Deref , R : Deref , L : Deref > EventsProvider for ChannelManager < M , T , ES , NS , SP , F , R , L >
6667
6667
where
6668
6668
M :: Target : chain:: Watch < <SP :: Target as SignerProvider >:: Signer > ,
6669
6669
T :: Target : BroadcasterInterface ,
@@ -6684,7 +6684,7 @@ where
6684
6684
}
6685
6685
}
6686
6686
6687
- impl < M : Deref , T : Deref , ES : Deref , NS : Deref , SP : Deref + Clone , F : Deref , R : Deref , L : Deref > chain:: Listen for ChannelManager < M , T , ES , NS , SP , F , R , L >
6687
+ impl < M : Deref , T : Deref , ES : Deref , NS : Deref , SP : Deref , F : Deref , R : Deref , L : Deref > chain:: Listen for ChannelManager < M , T , ES , NS , SP , F , R , L >
6688
6688
where
6689
6689
M :: Target : chain:: Watch < <SP :: Target as SignerProvider >:: Signer > ,
6690
6690
T :: Target : BroadcasterInterface ,
@@ -6725,7 +6725,7 @@ where
6725
6725
}
6726
6726
}
6727
6727
6728
- impl < M : Deref , T : Deref , ES : Deref , NS : Deref , SP : Deref + Clone , F : Deref , R : Deref , L : Deref > chain:: Confirm for ChannelManager < M , T , ES , NS , SP , F , R , L >
6728
+ impl < M : Deref , T : Deref , ES : Deref , NS : Deref , SP : Deref , F : Deref , R : Deref , L : Deref > chain:: Confirm for ChannelManager < M , T , ES , NS , SP , F , R , L >
6729
6729
where
6730
6730
M :: Target : chain:: Watch < <SP :: Target as SignerProvider >:: Signer > ,
6731
6731
T :: Target : BroadcasterInterface ,
@@ -6820,7 +6820,7 @@ where
6820
6820
}
6821
6821
}
6822
6822
6823
- impl < M : Deref , T : Deref , ES : Deref , NS : Deref , SP : Deref + Clone , F : Deref , R : Deref , L : Deref > ChannelManager < M , T , ES , NS , SP , F , R , L >
6823
+ impl < M : Deref , T : Deref , ES : Deref , NS : Deref , SP : Deref , F : Deref , R : Deref , L : Deref > ChannelManager < M , T , ES , NS , SP , F , R , L >
6824
6824
where
6825
6825
M :: Target : chain:: Watch < <SP :: Target as SignerProvider >:: Signer > ,
6826
6826
T :: Target : BroadcasterInterface ,
@@ -7040,7 +7040,7 @@ where
7040
7040
}
7041
7041
}
7042
7042
7043
- impl < M : Deref , T : Deref , ES : Deref , NS : Deref , SP : Deref + Clone , F : Deref , R : Deref , L : Deref >
7043
+ impl < M : Deref , T : Deref , ES : Deref , NS : Deref , SP : Deref , F : Deref , R : Deref , L : Deref >
7044
7044
ChannelMessageHandler for ChannelManager < M , T , ES , NS , SP , F , R , L >
7045
7045
where
7046
7046
M :: Target : chain:: Watch < <SP :: Target as SignerProvider >:: Signer > ,
@@ -7892,7 +7892,7 @@ impl_writeable_tlv_based!(PendingInboundPayment, {
7892
7892
( 8 , min_value_msat, required) ,
7893
7893
} ) ;
7894
7894
7895
- impl < M : Deref , T : Deref , ES : Deref , NS : Deref , SP : Deref + Clone , F : Deref , R : Deref , L : Deref > Writeable for ChannelManager < M , T , ES , NS , SP , F , R , L >
7895
+ impl < M : Deref , T : Deref , ES : Deref , NS : Deref , SP : Deref , F : Deref , R : Deref , L : Deref > Writeable for ChannelManager < M , T , ES , NS , SP , F , R , L >
7896
7896
where
7897
7897
M :: Target : chain:: Watch < <SP :: Target as SignerProvider >:: Signer > ,
7898
7898
T :: Target : BroadcasterInterface ,
@@ -8285,7 +8285,7 @@ where
8285
8285
8286
8286
// Implement ReadableArgs for an Arc'd ChannelManager to make it a bit easier to work with the
8287
8287
// SipmleArcChannelManager type:
8288
- impl < ' a , M : Deref , T : Deref , ES : Deref , NS : Deref , SP : Deref + Clone , F : Deref , R : Deref , L : Deref >
8288
+ impl < ' a , M : Deref , T : Deref , ES : Deref , NS : Deref , SP : Deref , F : Deref , R : Deref , L : Deref >
8289
8289
ReadableArgs < ChannelManagerReadArgs < ' a , M , T , ES , NS , SP , F , R , L > > for ( BlockHash , Arc < ChannelManager < M , T , ES , NS , SP , F , R , L > > )
8290
8290
where
8291
8291
M :: Target : chain:: Watch < <SP :: Target as SignerProvider >:: Signer > ,
@@ -8303,7 +8303,7 @@ where
8303
8303
}
8304
8304
}
8305
8305
8306
- impl < ' a , M : Deref , T : Deref , ES : Deref , NS : Deref , SP : Deref + Clone , F : Deref , R : Deref , L : Deref >
8306
+ impl < ' a , M : Deref , T : Deref , ES : Deref , NS : Deref , SP : Deref , F : Deref , R : Deref , L : Deref >
8307
8307
ReadableArgs < ChannelManagerReadArgs < ' a , M , T , ES , NS , SP , F , R , L > > for ( BlockHash , ChannelManager < M , T , ES , NS , SP , F , R , L > )
8308
8308
where
8309
8309
M :: Target : chain:: Watch < <SP :: Target as SignerProvider >:: Signer > ,
0 commit comments