@@ -240,7 +240,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool) {
240
240
new_chain_monitor = test_utils:: TestChainMonitor :: new ( Some ( nodes[ 0 ] . chain_source ) , nodes[ 0 ] . tx_broadcaster . clone ( ) , nodes[ 0 ] . logger , node_cfgs[ 0 ] . fee_estimator , & persister, keys_manager) ;
241
241
nodes[ 0 ] . chain_monitor = & new_chain_monitor;
242
242
let mut chan_0_monitor_read = & chan_0_monitor_serialized. 0 [ ..] ;
243
- let ( _, mut chan_0_monitor) = <( BlockHash , ChannelMonitor < EnforcingSigner > ) >:: read (
243
+ let ( _, mut chan_0_monitor) = <( Option < BlockHash > , ChannelMonitor < EnforcingSigner > ) >:: read (
244
244
& mut chan_0_monitor_read, keys_manager) . unwrap ( ) ;
245
245
assert ! ( chan_0_monitor_read. is_empty( ) ) ;
246
246
@@ -249,14 +249,16 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool) {
249
249
nodes_0_deserialized = {
250
250
let mut channel_monitors = HashMap :: new ( ) ;
251
251
channel_monitors. insert ( chan_0_monitor. get_funding_txo ( ) . 0 , & mut chan_0_monitor) ;
252
- <( BlockHash , ChannelManager < EnforcingSigner , & test_utils:: TestChainMonitor , & test_utils:: TestBroadcaster , & test_utils:: TestKeysInterface , & test_utils:: TestFeeEstimator , & test_utils:: TestLogger > ) >:: read ( & mut nodes_0_read, ChannelManagerReadArgs {
253
- default_config : config,
254
- keys_manager,
255
- fee_estimator : node_cfgs[ 0 ] . fee_estimator ,
256
- chain_monitor : nodes[ 0 ] . chain_monitor ,
257
- tx_broadcaster : nodes[ 0 ] . tx_broadcaster . clone ( ) ,
258
- logger : nodes[ 0 ] . logger ,
259
- channel_monitors,
252
+ <( Option < BlockHash > , ChannelManager < EnforcingSigner , & test_utils:: TestChainMonitor , & test_utils:: TestBroadcaster ,
253
+ & test_utils:: TestKeysInterface , & test_utils:: TestFeeEstimator , & test_utils:: TestLogger > ) >:: read (
254
+ & mut nodes_0_read, ChannelManagerReadArgs {
255
+ default_config : config,
256
+ keys_manager,
257
+ fee_estimator : node_cfgs[ 0 ] . fee_estimator ,
258
+ chain_monitor : nodes[ 0 ] . chain_monitor ,
259
+ tx_broadcaster : nodes[ 0 ] . tx_broadcaster . clone ( ) ,
260
+ logger : nodes[ 0 ] . logger ,
261
+ channel_monitors,
260
262
} ) . unwrap ( ) . 1
261
263
} ;
262
264
nodes[ 0 ] . node = & nodes_0_deserialized;
0 commit comments