mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-25 07:17:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Take the logger from test_utils into fuzz::test_utils

Browse source
This commit is contained in:
Matt Corallo 2019-01-08 15:06:43 -05:00
parent 9a72207a16
commit aa9a848f79
4 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fuzz/fuzz_targets/chanmon_deser_target.rs
View file

@ -30,7 +30,7 @@ impl Writer for VecWriter {
#[inline] #[inline]
pub fn do_test(data: &[u8]) { pub fn do_test(data: &[u8]) {
reset_rng_state(); reset_rng_state();
let logger = Arc::new(test_logger::TestLogger{}); let logger = Arc::new(test_logger::TestLogger::new("".to_owned()));
if let Ok((latest_block_hash, monitor)) = <(Sha256dHash, channelmonitor::ChannelMonitor)>::read(&mut Cursor::new(data), logger.clone()) { if let Ok((latest_block_hash, monitor)) = <(Sha256dHash, channelmonitor::ChannelMonitor)>::read(&mut Cursor::new(data), logger.clone()) {
let mut w = VecWriter(Vec::new()); let mut w = VecWriter(Vec::new());
monitor.write_for_disk(&mut w).unwrap(); monitor.write_for_disk(&mut w).unwrap();

8
fuzz/fuzz_targets/full_stack_target.rs
View file

@ -554,7 +554,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
#[cfg(feature = "afl")] #[cfg(feature = "afl")]
fn main() { fn main() {
fuzz!(|data| { fuzz!(|data| {
let logger: Arc<Logger> = Arc::new(test_logger::TestLogger{}); let logger: Arc<Logger> = Arc::new(test_logger::TestLogger::new("".to_owned()));
do_test(data, &logger); do_test(data, &logger);
}); });
} }
@ -565,7 +565,7 @@ fn main() {
fn main() { fn main() {
loop { loop {
fuzz!(|data| { fuzz!(|data| {
let logger: Arc<Logger> = Arc::new(test_logger::TestLogger{}); let logger: Arc<Logger> = Arc::new(test_logger::TestLogger::new("".to_owned()));
do_test(data, &logger); do_test(data, &logger);
}); });
} }
@ -575,7 +575,7 @@ fn main() {
#[macro_use] extern crate libfuzzer_sys; #[macro_use] extern crate libfuzzer_sys;
#[cfg(feature = "libfuzzer_fuzz")] #[cfg(feature = "libfuzzer_fuzz")]
fuzz_target!(|data: &[u8]| { fuzz_target!(|data: &[u8]| {
let logger: Arc<Logger> = Arc::new(test_logger::TestLogger{}); let logger: Arc<Logger> = Arc::new(test_logger::TestLogger::new("".to_owned()));
do_test(data, &logger); do_test(data, &logger);
}); });
@ -589,7 +589,7 @@ mod tests {
#[test] #[test]
fn duplicate_crash() { fn duplicate_crash() {
let logger: Arc<Logger> = Arc::new(test_logger::TestLogger{}); let logger: Arc<Logger> = Arc::new(test_logger::TestLogger::new("".to_owned()));
super::do_test(&::hex::decode("00").unwrap(), &logger); super::do_test(&::hex::decode("00").unwrap(), &logger);
} }

2
fuzz/fuzz_targets/router_target.rs
View file

@ -154,7 +154,7 @@ pub fn do_test(data: &[u8]) {
} }
} }
let logger: Arc<Logger> = Arc::new(test_logger::TestLogger{}); let logger: Arc<Logger> = Arc::new(test_logger::TestLogger::new("".to_owned()));
let chain_monitor = Arc::new(DummyChainWatcher { let chain_monitor = Arc::new(DummyChainWatcher {
input: Arc::clone(&input), input: Arc::clone(&input),
}); });

15
fuzz/fuzz_targets/utils/test_logger.rs
View file

@ -1,11 +1,22 @@
use lightning::util::logger::{Logger, Record}; use lightning::util::logger::{Logger, Record};
pub struct TestLogger {
#[cfg(test)]
id: String,
}
pub struct TestLogger {} impl TestLogger {
pub fn new(_id: String) -> TestLogger {
TestLogger {
#[cfg(test)]
id: _id
}
}
}
impl Logger for TestLogger { impl Logger for TestLogger {
fn log(&self, record: &Record) { fn log(&self, record: &Record) {
#[cfg(test)] #[cfg(test)]
println!("{:<5} [{} : {}, {}] {}", record.level.to_string(), record.module_path, record.file, record.line, record.args); println!("{:<5} {} [{} : {}, {}] {}", record.level.to_string(), self.id, record.module_path, record.file, record.line, record.args);
#[cfg(not(test))] #[cfg(not(test))]
let _ = format!("{}", record.args); let _ = format!("{}", record.args);
} }