-use bitcoin::{BlockHash, Txid};
-use bitcoin::hashes::hex::FromHex;
-use bitcoin::secp256k1::key::PublicKey;
use crate::cli;
-use lightning::chain::channelmonitor::ChannelMonitor;
-use lightning::chain::keysinterface::{InMemorySigner, KeysManager};
-use lightning::chain::transaction::OutPoint;
+use bitcoin::secp256k1::key::PublicKey;
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{
- data_dir: String
+pub(crate) struct FilesystemLogger {
+ data_dir: String,
}
impl FilesystemLogger {
- pub(crate) fn new(data_dir: String) -> Self {
- let logs_path = format!("{}/logs", data_dir);
- fs::create_dir_all(logs_path.clone()).unwrap();
- Self {
- data_dir: logs_path
- }
- }
+ pub(crate) fn new(data_dir: String) -> Self {
+ let logs_path = format!("{}/logs", data_dir);
+ fs::create_dir_all(logs_path.clone()).unwrap();
+ Self { data_dir: logs_path }
+ }
}
impl Logger for FilesystemLogger {
- fn log(&self, record: &Record) {
- let raw_log = record.args.to_string();
- let log = format!("{} {:<5} [{}:{}] {}\n", OffsetDateTime::now_utc().format("%F %T"),
- record.level.to_string(), record.module_path, record.line, raw_log);
- let logs_file_path = format!("{}/logs.txt", self.data_dir.clone());
- fs::OpenOptions::new().create(true).append(true).open(logs_file_path).unwrap()
- .write_all(log.as_bytes()).unwrap();
- }
+ fn log(&self, record: &Record) {
+ let raw_log = record.args.to_string();
+ let log = format!(
+ "{} {:<5} [{}:{}] {}\n",
+ OffsetDateTime::now_utc().format("%F %T"),
+ record.level.to_string(),
+ record.module_path,
+ record.line,
+ raw_log
+ );
+ let logs_file_path = format!("{}/logs.txt", self.data_dir.clone());
+ fs::OpenOptions::new()
+ .create(true)
+ .append(true)
+ .open(logs_file_path)
+ .unwrap()
+ .write_all(log.as_bytes())
+ .unwrap();
+ }
}
pub(crate) fn persist_channel_peer(path: &Path, peer_info: &str) -> std::io::Result<()> {
- let mut file = fs::OpenOptions::new().create(true).append(true).open(path)?;
- file.write_all(format!("{}\n", peer_info).as_bytes())
+ let mut file = fs::OpenOptions::new().create(true).append(true).open(path)?;
+ file.write_all(format!("{}\n", peer_info).as_bytes())
}
-pub(crate) fn read_channel_peer_data(path: &Path) -> Result<HashMap<PublicKey, SocketAddr>, std::io::Error> {
- let mut peer_data = HashMap::new();
- if !Path::new(&path).exists() {
- return Ok(HashMap::new())
- }
- let file = File::open(path)?;
- let reader = BufReader::new(file);
- for line in reader.lines() {
- match cli::parse_peer_info(line.unwrap()) {
- Ok((pubkey, socket_addr)) => {
- peer_data.insert(pubkey, socket_addr);
- },
- Err(e) => return Err(e)
- }
- }
- Ok(peer_data)
-}
-
-
-pub(crate) fn read_channelmonitors_from_disk(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)
+pub(crate) fn read_channel_peer_data(
+ path: &Path,
+) -> Result<HashMap<PublicKey, SocketAddr>, std::io::Error> {
+ let mut peer_data = HashMap::new();
+ if !Path::new(&path).exists() {
+ return Ok(HashMap::new());
+ }
+ let file = File::open(path)?;
+ let reader = BufReader::new(file);
+ for line in reader.lines() {
+ match cli::parse_peer_info(line.unwrap()) {
+ Ok((pubkey, socket_addr)) => {
+ peer_data.insert(pubkey, socket_addr);
+ }
+ Err(e) => return Err(e),
+ }
+ }
+ Ok(peer_data)
}
projects / ldk-sample / blobdiff