X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=ldk-sample;a=blobdiff_plain;f=src%2Fdisk.rs;h=827cb7e9e79326f6a3b8ae5022748267c07bf72a;hp=13ac5e7680e8d0aac87a664e25a4c600cd5f8f89;hb=0f8635873858a05cdffee21eb99dd2e100e6cebc;hpb=80357570090fdbe4be7e98660d70184173da77f8

diff --git a/src/disk.rs b/src/disk.rs
index 13ac5e7..827cb7e 100644
--- a/src/disk.rs
+++ b/src/disk.rs
@@ -1,20 +1,13 @@
 use crate::cli;
-use bitcoin::hashes::hex::FromHex;
 use bitcoin::secp256k1::key::PublicKey;
-use bitcoin::{BlockHash, Txid};
-use lightning::chain::channelmonitor::ChannelMonitor;
-use lightning::chain::keysinterface::{InMemorySigner, KeysManager};
-use lightning::chain::transaction::OutPoint;
 use lightning::util::logger::{Logger, Record};
-use lightning::util::ser::{ReadableArgs, Writer};
+use lightning::util::ser::Writer;
 use std::collections::HashMap;
 use std::fs;
 use std::fs::File;
-// use std::io::{BufRead, BufReader, Cursor, Write};
-use std::io::{BufRead, BufReader, Cursor};
+use std::io::{BufRead, BufReader};
 use std::net::SocketAddr;
 use std::path::Path;
-use std::sync::Arc;
 use time::OffsetDateTime;
 
 pub(crate) struct FilesystemLogger {
@@ -72,58 +65,3 @@ pub(crate) fn read_channel_peer_data(
 	}
 	Ok(peer_data)
 }
-
-pub(crate) fn read_channelmonitors(
-	path: String, keys_manager: Arc<KeysManager>,
-) -> Result<HashMap<OutPoint, (BlockHash, ChannelMonitor<InMemorySigner>)>, std::io::Error> {
-	if !Path::new(&path).exists() {
-		return Ok(HashMap::new());
-	}
-	let mut outpoint_to_channelmonitor = HashMap::new();
-	for file_option in fs::read_dir(path).unwrap() {
-		let file = file_option.unwrap();
-		let owned_file_name = file.file_name();
-		let filename = owned_file_name.to_str();
-		if !filename.is_some() || !filename.unwrap().is_ascii() || filename.unwrap().len() < 65 {
-			return Err(std::io::Error::new(
-				std::io::ErrorKind::Other,
-				"Invalid ChannelMonitor file name",
-			));
-		}
-
-		let txid = Txid::from_hex(filename.unwrap().split_at(64).0);
-		if txid.is_err() {
-			return Err(std::io::Error::new(
-				std::io::ErrorKind::Other,
-				"Invalid tx ID in filename",
-			));
-		}
-
-		let index = filename.unwrap().split_at(65).1.split('.').next().unwrap().parse();
-		if index.is_err() {
-			return Err(std::io::Error::new(
-				std::io::ErrorKind::Other,
-				"Invalid tx index in filename",
-			));
-		}
-
-		let contents = fs::read(&file.path())?;
-
-		if let Ok((blockhash, channel_monitor)) =
-			<(BlockHash, ChannelMonitor<InMemorySigner>)>::read(
-				&mut Cursor::new(&contents),
-				&*keys_manager,
-			) {
-			outpoint_to_channelmonitor.insert(
-				OutPoint { txid: txid.unwrap(), index: index.unwrap() },
-				(blockhash, channel_monitor),
-			);
-		} else {
-			return Err(std::io::Error::new(
-				std::io::ErrorKind::Other,
-				"Failed to deserialize ChannelMonitor",
-			));
-		}
-	}
-	Ok(outpoint_to_channelmonitor)
-}