From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Sun, 21 Apr 2019 23:44:58 +0000 (-0400)
Subject: Merge pull request #334 from ariard/2019-04-fee-estimation-monitor
X-Git-Tag: v0.0.12~213
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=2811b07edebeb46d7015209d9752f48cf984d57c;p=rust-lightning

Merge pull request #334 from ariard/2019-04-fee-estimation-monitor

Add Fee Estimation in ChannelMonitor
---

2811b07edebeb46d7015209d9752f48cf984d57c
diff --cc src/ln/functional_test_utils.rs
index ecd1529c0,c5d6751d9..9a24d503c
--- a/src/ln/functional_test_utils.rs
+++ b/src/ln/functional_test_utils.rs
@@@ -821,10 -821,10 +821,10 @@@ pub fn create_network(node_count: usize
  		let mut seed = [0; 32];
  		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()));
+ 		let chan_monitor = Arc::new(test_utils::TestChannelMonitor::new(chain_monitor.clone(), tx_broadcaster.clone(), logger.clone(), feeest.clone()));
  		let mut config = UserConfig::new();
  		config.channel_options.announced_channel = true;
 -		config.channel_limits.force_announced_channel_preference = false;
 +		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(), config).unwrap();
  		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,