Skip to content

Commit 7a3c886

Browse files
committed
rustfmt: src/utils/*
1 parent 88eb531 commit 7a3c886

File tree

3 files changed

+25
-15
lines changed

3 files changed

+25
-15
lines changed

fuzz/src/utils/test_logger.rs

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
// licenses.
99

1010
use lightning::util::logger::{Logger, Record};
11-
use std::sync::{Arc, Mutex};
1211
use std::io::Write;
12+
use std::sync::{Arc, Mutex};
1313

14-
pub trait Output : Clone + 'static {
14+
pub trait Output: Clone + 'static {
1515
fn locked_write(&self, data: &[u8]);
1616
}
1717

@@ -36,7 +36,7 @@ impl StringBuffer {
3636
}
3737
}
3838

39-
pub struct TestLogger<Out : Output> {
39+
pub struct TestLogger<Out: Output> {
4040
id: String,
4141
out: Out,
4242
}
@@ -52,13 +52,22 @@ impl<'a, Out: Output> Write for LockedWriteAdapter<'a, Out> {
5252
self.0.locked_write(data);
5353
Ok(data.len())
5454
}
55-
fn flush(&mut self) -> Result<(), std::io::Error> { Ok(()) }
55+
fn flush(&mut self) -> Result<(), std::io::Error> {
56+
Ok(())
57+
}
5658
}
5759

5860
impl<Out: Output> Logger for TestLogger<Out> {
5961
fn log(&self, record: Record) {
60-
write!(LockedWriteAdapter(&self.out),
61-
"{:<5} {} [{} : {}] {}\n", record.level.to_string(), self.id, record.module_path, record.line, record.args)
62-
.unwrap();
62+
write!(
63+
LockedWriteAdapter(&self.out),
64+
"{:<5} {} [{} : {}] {}\n",
65+
record.level.to_string(),
66+
self.id,
67+
record.module_path,
68+
record.line,
69+
record.args
70+
)
71+
.unwrap();
6372
}
6473
}

fuzz/src/utils/test_persister.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use lightning::chain;
2-
use lightning::chain::{chainmonitor, channelmonitor};
32
use lightning::chain::transaction::OutPoint;
3+
use lightning::chain::{chainmonitor, channelmonitor};
44
use lightning::util::test_channel_signer::TestChannelSigner;
55

66
use std::sync::Mutex;
@@ -9,14 +9,18 @@ pub struct TestPersister {
99
pub update_ret: Mutex<chain::ChannelMonitorUpdateStatus>,
1010
}
1111
impl chainmonitor::Persist<TestChannelSigner> for TestPersister {
12-
fn persist_new_channel(&self, _funding_txo: OutPoint, _data: &channelmonitor::ChannelMonitor<TestChannelSigner>) -> chain::ChannelMonitorUpdateStatus {
12+
fn persist_new_channel(
13+
&self, _funding_txo: OutPoint, _data: &channelmonitor::ChannelMonitor<TestChannelSigner>,
14+
) -> chain::ChannelMonitorUpdateStatus {
1315
self.update_ret.lock().unwrap().clone()
1416
}
1517

16-
fn update_persisted_channel(&self, _funding_txo: OutPoint, _update: Option<&channelmonitor::ChannelMonitorUpdate>, _data: &channelmonitor::ChannelMonitor<TestChannelSigner>) -> chain::ChannelMonitorUpdateStatus {
18+
fn update_persisted_channel(
19+
&self, _funding_txo: OutPoint, _update: Option<&channelmonitor::ChannelMonitorUpdate>,
20+
_data: &channelmonitor::ChannelMonitor<TestChannelSigner>,
21+
) -> chain::ChannelMonitorUpdateStatus {
1722
self.update_ret.lock().unwrap().clone()
1823
}
1924

20-
fn archive_persisted_channel(&self, _: OutPoint) {
21-
}
25+
fn archive_persisted_channel(&self, _: OutPoint) {}
2226
}

rustfmt_excluded_files

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
./bench/benches/bench.rs
2-
./fuzz/src/utils/mod.rs
3-
./fuzz/src/utils/test_logger.rs
4-
./fuzz/src/utils/test_persister.rs
52
./fuzz/src/zbase32.rs
63
./lightning-background-processor/src/lib.rs
74
./lightning-block-sync/src/convert.rs

0 commit comments

Comments
 (0)