X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=background-processor%2Fsrc%2Flib.rs;h=f6c2dbfcae064562bfdb96a41a30c891c0f49a16;hb=8a91bd92e1950b2567c02e5063d6e69aa0fa9773;hp=0c7191fbad2bd74fc8ebeafebfe044dbfa97ab96;hpb=03a518965100b6852f36e4f95ead4c1d93f5c4b0;p=rust-lightning

diff --git a/background-processor/src/lib.rs b/background-processor/src/lib.rs
index 0c7191fb..f6c2dbfc 100644
--- a/background-processor/src/lib.rs
+++ b/background-processor/src/lib.rs
@@ -66,7 +66,7 @@ impl BackgroundProcessor {
 		let handle = thread::spawn(move || -> Result<(), std::io::Error> {
 			let mut current_time = Instant::now();
 			loop {
-				let updates_available = manager.wait_timeout(Duration::from_millis(100));
+				let updates_available = manager.await_persistable_update_timeout(Duration::from_millis(100));
 				if updates_available {
 					persist_manager(&*manager)?;
 				}
@@ -106,7 +106,7 @@ mod tests {
 	use lightning::chain::keysinterface::{Sign, InMemorySigner, KeysInterface, KeysManager};
 	use lightning::chain::transaction::OutPoint;
 	use lightning::get_event_msg;
-	use lightning::ln::channelmanager::{ChannelManager, SimpleArcChannelManager};
+	use lightning::ln::channelmanager::{ChainParameters, ChannelManager, SimpleArcChannelManager};
 	use lightning::ln::features::InitFeatures;
 	use lightning::ln::msgs::ChannelMessageHandler;
 	use lightning::util::config::UserConfig;
@@ -155,10 +155,16 @@ mod tests {
 			let persister = Arc::new(FilesystemPersister::new(format!("{}_persister_{}", persist_dir, i)));
 			let seed = [i as u8; 32];
 			let network = Network::Testnet;
-			let now = Duration::from_secs(genesis_block(network).header.time as u64);
+			let genesis_block = genesis_block(network);
+			let now = Duration::from_secs(genesis_block.header.time as u64);
 			let keys_manager = Arc::new(KeysManager::new(&seed, now.as_secs(), now.subsec_nanos()));
 			let chain_monitor = Arc::new(chainmonitor::ChainMonitor::new(Some(chain_source.clone()), tx_broadcaster.clone(), logger.clone(), fee_estimator.clone(), persister.clone()));
-			let manager = Arc::new(ChannelManager::new(Network::Testnet, fee_estimator.clone(), chain_monitor.clone(), tx_broadcaster, logger.clone(), keys_manager.clone(), UserConfig::default(), i));
+			let params = ChainParameters {
+				network,
+				latest_hash: genesis_block.block_hash(),
+				latest_height: 0,
+			};
+			let manager = Arc::new(ChannelManager::new(fee_estimator.clone(), chain_monitor.clone(), tx_broadcaster, logger.clone(), keys_manager.clone(), UserConfig::default(), params));
 			let node = Node { node: manager, persister, logger };
 			nodes.push(node);
 		}
@@ -262,7 +268,7 @@ mod tests {
 		loop {
 			let log_entries = nodes[0].logger.lines.lock().unwrap();
 			let desired_log = "Calling manager's timer_chan_freshness_every_min".to_string();
-			if log_entries.get(&("background_processor".to_string(), desired_log)).is_some() {
+			if log_entries.get(&("lightning_background_processor".to_string(), desired_log)).is_some() {
 				break
 			}
 		}