@@ -192,15 +192,20 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
192
192
keys_manager : self . keys_manager ,
193
193
fee_estimator : & test_utils:: TestFeeEstimator { sat_per_kw : 253 } ,
194
194
chain_monitor : self . chain_monitor ,
195
- tx_broadcaster : self . tx_broadcaster . clone ( ) ,
195
+ tx_broadcaster : & test_utils:: TestBroadcaster {
196
+ txn_broadcasted : Mutex :: new ( self . tx_broadcaster . txn_broadcasted . lock ( ) . unwrap ( ) . clone ( ) )
197
+ } ,
196
198
logger : & test_utils:: TestLogger :: new ( ) ,
197
199
channel_monitors,
198
200
} ) . unwrap ( ) ;
199
201
}
200
202
201
203
let persister = test_utils:: TestPersister :: new ( ) ;
204
+ let broadcaster = test_utils:: TestBroadcaster {
205
+ txn_broadcasted : Mutex :: new ( self . tx_broadcaster . txn_broadcasted . lock ( ) . unwrap ( ) . clone ( ) )
206
+ } ;
202
207
let chain_source = test_utils:: TestChainSource :: new ( Network :: Testnet ) ;
203
- let chain_monitor = test_utils:: TestChainMonitor :: new ( Some ( & chain_source) , self . tx_broadcaster . clone ( ) , & self . logger , & feeest, & persister) ;
208
+ let chain_monitor = test_utils:: TestChainMonitor :: new ( Some ( & chain_source) , & broadcaster , & self . logger , & feeest, & persister) ;
204
209
for deserialized_monitor in deserialized_monitors. drain ( ..) {
205
210
if let Err ( _) = chain_monitor. watch_channel ( deserialized_monitor. get_funding_txo ( ) . 0 , deserialized_monitor) {
206
211
panic ! ( ) ;
@@ -1150,7 +1155,7 @@ pub fn create_node_chanmgrs<'a, 'b>(node_count: usize, cfgs: &'a Vec<NodeCfg<'b>
1150
1155
default_config. channel_options . announced_channel = true ;
1151
1156
default_config. peer_channel_config_limits . force_announced_channel_preference = false ;
1152
1157
default_config. own_channel_config . our_htlc_minimum_msat = 1000 ; // sanitization being done by the sender, to exerce receiver logic we need to lift of limit
1153
- let node = ChannelManager :: new ( Network :: Testnet , cfgs[ i] . fee_estimator , & cfgs[ i] . chain_monitor , cfgs[ i] . tx_broadcaster , cfgs[ i] . logger . clone ( ) , & cfgs[ i] . keys_manager , if node_config[ i] . is_some ( ) { node_config[ i] . clone ( ) . unwrap ( ) } else { default_config } , 0 ) ;
1158
+ let node = ChannelManager :: new ( Network :: Testnet , cfgs[ i] . fee_estimator , & cfgs[ i] . chain_monitor , cfgs[ i] . tx_broadcaster , cfgs[ i] . logger , & cfgs[ i] . keys_manager , if node_config[ i] . is_some ( ) { node_config[ i] . clone ( ) . unwrap ( ) } else { default_config } , 0 ) ;
1154
1159
chanmgrs. push ( node) ;
1155
1160
}
1156
1161
0 commit comments