channelmanager+channelmonitor: remove circular reference to chain_monitor

Author: valentinewallace

src/ln/channelmanager.rs

@@ -616,8 +616,7 @@ impl ChannelManager {
 
 			logger,
 		});
-		let weak_res = Arc::downgrade(&res);
-		res.chain_monitor.register_listener(weak_res);
+
 		Ok(res)
 	}
 

src/ln/channelmonitor.rs

@@ -223,8 +223,7 @@ impl<Key : Send + cmp::Eq + hash::Hash + 'static> SimpleManyChannelMonitor<Key>
 			logger,
 			fee_estimator: feeest,
 		});
-		let weak_res = Arc::downgrade(&res);
-		res.chain_monitor.register_listener(weak_res);
+
 		res
 	}
 

src/ln/functional_test_utils.rs

@@ -841,10 +841,14 @@ pub fn create_network(node_count: usize, node_config: &[Option<UserConfig>]) ->
 		rng.fill_bytes(&mut seed);
 		let keys_manager = Arc::new(test_utils::TestKeysInterface::new(&seed, Network::Testnet, Arc::clone(&logger)));
 		let chan_monitor = Arc::new(test_utils::TestChannelMonitor::new(chain_monitor.clone(), tx_broadcaster.clone(), logger.clone(), feeest.clone()));
+		let weak_res = Arc::downgrade(&chan_monitor.simple_monitor);
+		block_notifier.register_listener(weak_res);
 		let mut default_config = UserConfig::new();
 		default_config.channel_options.announced_channel = true;
 		default_config.peer_channel_config_limits.force_announced_channel_preference = false;
 		let node = ChannelManager::new(Network::Testnet, feeest.clone(), chan_monitor.clone(), chain_monitor.clone(), tx_broadcaster.clone(), Arc::clone(&logger), keys_manager.clone(), if node_config[i].is_some() { node_config[i].clone().unwrap() } else { default_config }).unwrap();
+		let weak_res = Arc::downgrade(&node);
+		block_notifier.register_listener(weak_res);
 		let router = Router::new(PublicKey::from_secret_key(&secp_ctx, &keys_manager.get_node_secret()), chain_monitor.clone(), Arc::clone(&logger));
 		nodes.push(Node { chain_monitor, tx_broadcaster, chan_monitor, node, router, keys_manager, node_seed: seed,
 			network_payment_count: payment_count.clone(),

src/ln/functional_tests.rs

@@ -6047,6 +6047,12 @@ fn test_data_loss_protect() {
 	monitor.add_update_monitor(OutPoint { txid: chan.3.txid(), index: 0 }, chan_monitor.clone()).is_ok();
 	nodes[0].chan_monitor = monitor;
 	nodes[0].chain_monitor = chain_monitor;
+
+	let weak_res = Arc::downgrade(&nodes[0].chan_monitor.simple_monitor);
+	nodes[0].block_notifier.register_listener(weak_res);
+	let weak_res = Arc::downgrade(&nodes[0].node);
+	nodes[0].block_notifier.register_listener(weak_res);
+
 	check_added_monitors!(nodes[0], 1);
 
 	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id());