X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=inline;f=lightning-persister%2Fsrc%2Ffs_store.rs;h=350b1cdd195636f937cd32a700da9464508fee8e;hb=ab4b87209886569ba94df10ee27dccf9c0562d05;hp=3475544849f9420398851818c0d805c4d7f48e6f;hpb=6016101ac8ff31275f31f68eef8d33e94b19c0b1;p=rust-lightning

diff --git a/lightning-persister/src/fs_store.rs b/lightning-persister/src/fs_store.rs
index 34755448..350b1cdd 100644
--- a/lightning-persister/src/fs_store.rs
+++ b/lightning-persister/src/fs_store.rs
@@ -369,7 +369,6 @@ mod tests {
 	use super::*;
 	use crate::test_utils::{do_read_write_remove_list_persist, do_test_store};
 
-	use bitcoin::hashes::hex::FromHex;
 	use bitcoin::Txid;
 
 	use lightning::chain::ChannelMonitorUpdateStatus;
@@ -381,11 +380,7 @@ mod tests {
 	use lightning::util::test_utils;
 	use lightning::util::persist::read_channel_monitors;
 	use std::fs;
-	#[cfg(target_os = "windows")]
-	use {
-		lightning::get_event_msg,
-		lightning::ln::msgs::ChannelMessageHandler,
-	};
+	use std::str::FromStr;
 
 	impl Drop for FilesystemStore {
 		fn drop(&mut self) {
@@ -436,7 +431,7 @@ mod tests {
 	}
 
 	// Test that if the store's path to channel data is read-only, writing a
-	// monitor to it results in the store returning an InProgress.
+	// monitor to it results in the store returning an UnrecoverableError.
 	// Windows ignores the read-only flag for folders, so this test is Unix-only.
 	#[cfg(not(target_os = "windows"))]
 	#[test]
@@ -455,10 +450,10 @@ mod tests {
 		check_closed_event!(nodes[1], 1, ClosureReason::HolderForceClosed, [nodes[0].node.get_our_node_id()], 100000);
 		let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();
 		let update_map = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap();
-		let update_id = update_map.get(&added_monitors[0].0.to_channel_id()).unwrap();
+		let update_id = update_map.get(&added_monitors[0].1.channel_id()).unwrap();
 
 		// Set the store's directory to read-only, which should result in
-		// returning a permanent failure when we then attempt to persist a
+		// returning an unrecoverable failure when we then attempt to persist a
 		// channel update.
 		let path = &store.get_data_dir();
 		let mut perms = fs::metadata(path).unwrap().permissions();
@@ -466,7 +461,7 @@ mod tests {
 		fs::set_permissions(path, perms).unwrap();
 
 		let test_txo = OutPoint {
-			txid: Txid::from_hex("8984484a580b825b9972d7adb15050b3ab624ccd731946b3eeddb92f4e7ef6be").unwrap(),
+			txid: Txid::from_str("8984484a580b825b9972d7adb15050b3ab624ccd731946b3eeddb92f4e7ef6be").unwrap(),
 			index: 0
 		};
 		match store.persist_new_channel(test_txo, &added_monitors[0].1, update_id.2) {
@@ -494,7 +489,7 @@ mod tests {
 		check_closed_event!(nodes[1], 1, ClosureReason::HolderForceClosed, [nodes[0].node.get_our_node_id()], 100000);
 		let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();
 		let update_map = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap();
-		let update_id = update_map.get(&added_monitors[0].0.to_channel_id()).unwrap();
+		let update_id = update_map.get(&added_monitors[0].1.channel_id()).unwrap();
 
 		// Create the store with an invalid directory name and test that the
 		// channel fails to open because the directories fail to be created. There
@@ -503,7 +498,7 @@ mod tests {
 		let store = FilesystemStore::new(":<>/".into());
 
 		let test_txo = OutPoint {
-			txid: Txid::from_hex("8984484a580b825b9972d7adb15050b3ab624ccd731946b3eeddb92f4e7ef6be").unwrap(),
+			txid: Txid::from_str("8984484a580b825b9972d7adb15050b3ab624ccd731946b3eeddb92f4e7ef6be").unwrap(),
 			index: 0
 		};
 		match store.persist_new_channel(test_txo, &added_monitors[0].1, update_id.2) {