From 57c102899aedc4ee5d20df939cfc3d5266815b65 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Mon, 20 May 2019 22:03:42 -0400 Subject: [PATCH] Use AddressState utils more --- src/datastore.rs | 4 +++ src/printer.rs | 66 ++++++++---------------------------------------- src/reader.rs | 16 +++--------- 3 files changed, 18 insertions(+), 68 deletions(-) diff --git a/src/datastore.rs b/src/datastore.rs index c56a86d..4782027 100644 --- a/src/datastore.rs +++ b/src/datastore.rs @@ -80,6 +80,10 @@ impl AddressState { AddressState::WasGood => "Was Good", } } + + pub fn get_count() -> u8 { + 11 + } } #[derive(Hash, PartialEq, Eq)] diff --git a/src/printer.rs b/src/printer.rs index 3741127..c7e9023 100644 --- a/src/printer.rs +++ b/src/printer.rs @@ -50,28 +50,11 @@ impl Printer { } out.write_all(b"\nNode counts by status:\n").expect("stdout broken?"); - out.write_all(format!("Untested: {}\n", store.get_node_count(AddressState::Untested) - ).as_bytes()).expect("stdout broken?"); - out.write_all(format!("Low Block Count: {}\n", store.get_node_count(AddressState::LowBlockCount) - ).as_bytes()).expect("stdout broken?"); - out.write_all(format!("High Block Count: {}\n", store.get_node_count(AddressState::HighBlockCount) - ).as_bytes()).expect("stdout broken?"); - out.write_all(format!("Low Version: {}\n", store.get_node_count(AddressState::LowVersion) - ).as_bytes()).expect("stdout broken?"); - out.write_all(format!("Bad Version: {}\n", store.get_node_count(AddressState::BadVersion) - ).as_bytes()).expect("stdout broken?"); - out.write_all(format!("Not Full Node: {}\n", store.get_node_count(AddressState::NotFullNode) - ).as_bytes()).expect("stdout broken?"); - out.write_all(format!("Protocol Violation: {}\n", store.get_node_count(AddressState::ProtocolViolation) - ).as_bytes()).expect("stdout broken?"); - out.write_all(format!("Timeout: {}\n", store.get_node_count(AddressState::Timeout) - ).as_bytes()).expect("stdout broken?"); - out.write_all(format!("Timeout During Request: {}\n", store.get_node_count(AddressState::TimeoutDuringRequest) - ).as_bytes()).expect("stdout broken?"); - out.write_all(format!("Good: {}\n", store.get_node_count(AddressState::Good) - ).as_bytes()).expect("stdout broken?"); - out.write_all(format!("WasGood: {}\n", store.get_node_count(AddressState::WasGood) - ).as_bytes()).expect("stdout broken?"); + for i in 0..AddressState::get_count() { + out.write_all(format!("{}: {}\n", AddressState::from_num(i).unwrap().to_str(), + store.get_node_count(AddressState::from_num(i).unwrap()) + ).as_bytes()).expect("stdout broken?"); + } out.write_all(format!( "\nCurrent connections open/in progress: {}\n", stats.connection_count).as_bytes()).expect("stdout broken?"); @@ -92,39 +75,12 @@ impl Printer { ).as_bytes()).expect("stdout broken?"); out.write_all(b"\nRetry times (in seconds):\n").expect("stdout broken?"); - out.write_all(format!( - "Untested: {}\n", store.get_u64(U64Setting::RescanInterval(AddressState::Untested)) - ).as_bytes()).expect("stdout broken?"); - out.write_all(format!( - "Low Block Count: {}\n", store.get_u64(U64Setting::RescanInterval(AddressState::LowBlockCount)) - ).as_bytes()).expect("stdout broken?"); - out.write_all(format!( - "High Block Count {}\n", store.get_u64(U64Setting::RescanInterval(AddressState::HighBlockCount)) - ).as_bytes()).expect("stdout broken?"); - out.write_all(format!( - "Low Version: {}\n", store.get_u64(U64Setting::RescanInterval(AddressState::LowVersion)) - ).as_bytes()).expect("stdout broken?"); - out.write_all(format!( - "Bad Version: {}\n", store.get_u64(U64Setting::RescanInterval(AddressState::BadVersion)) - ).as_bytes()).expect("stdout broken?"); - out.write_all(format!( - "Not Full Node: {}\n", store.get_u64(U64Setting::RescanInterval(AddressState::NotFullNode)) - ).as_bytes()).expect("stdout broken?"); - out.write_all(format!( - "Protocol Violation: {}\n", store.get_u64(U64Setting::RescanInterval(AddressState::ProtocolViolation)) - ).as_bytes()).expect("stdout broken?"); - out.write_all(format!( - "Timeout: {}\n", store.get_u64(U64Setting::RescanInterval(AddressState::Timeout)) - ).as_bytes()).expect("stdout broken?"); - out.write_all(format!( - "Timeout During Request: {}\n", store.get_u64(U64Setting::RescanInterval(AddressState::TimeoutDuringRequest)) - ).as_bytes()).expect("stdout broken?"); - out.write_all(format!( - "Good: {}\n", store.get_u64(U64Setting::RescanInterval(AddressState::Good)) - ).as_bytes()).expect("stdout broken?"); - out.write_all(format!( - "Was Good: {}\n", store.get_u64(U64Setting::RescanInterval(AddressState::WasGood)) - ).as_bytes()).expect("stdout broken?"); + for i in 0..AddressState::get_count() { + out.write_all(format!( + "{} ({}): {}\n", AddressState::from_num(i).unwrap().to_str(), i, + store.get_u64(U64Setting::RescanInterval(AddressState::from_num(i).unwrap())) + ).as_bytes()).expect("stdout broken?"); + } out.write_all(b"\nCommands:\n").expect("stdout broken?"); out.write_all(b"q: quit\n").expect("stdout broken?"); diff --git a/src/reader.rs b/src/reader.rs index 9c6a400..208d224 100644 --- a/src/reader.rs +++ b/src/reader.rs @@ -54,19 +54,9 @@ pub fn read(store: &'static Store, printer: &'static Printer) { }, "a" => scan_node(Instant::now(), try_parse_next_chunk!(SocketAddr)), "r" => { - match try_parse_next_chunk!(u8) { - 0 => store.set_u64(U64Setting::RescanInterval(AddressState::Untested), try_parse_next_chunk!(u64)), - 1 => store.set_u64(U64Setting::RescanInterval(AddressState::LowBlockCount), try_parse_next_chunk!(u64)), - 2 => store.set_u64(U64Setting::RescanInterval(AddressState::HighBlockCount), try_parse_next_chunk!(u64)), - 3 => store.set_u64(U64Setting::RescanInterval(AddressState::LowVersion), try_parse_next_chunk!(u64)), - 4 => store.set_u64(U64Setting::RescanInterval(AddressState::BadVersion), try_parse_next_chunk!(u64)), - 5 => store.set_u64(U64Setting::RescanInterval(AddressState::NotFullNode), try_parse_next_chunk!(u64)), - 6 => store.set_u64(U64Setting::RescanInterval(AddressState::ProtocolViolation), try_parse_next_chunk!(u64)), - 7 => store.set_u64(U64Setting::RescanInterval(AddressState::Timeout), try_parse_next_chunk!(u64)), - 8 => store.set_u64(U64Setting::RescanInterval(AddressState::TimeoutDuringRequest), try_parse_next_chunk!(u64)), - 9 => store.set_u64(U64Setting::RescanInterval(AddressState::Good), try_parse_next_chunk!(u64)), - 10 => store.set_u64(U64Setting::RescanInterval(AddressState::WasGood), try_parse_next_chunk!(u64)), - _ => err!(), + match AddressState::from_num(try_parse_next_chunk!(u8)) { + Some(state) => store.set_u64(U64Setting::RescanInterval(state), try_parse_next_chunk!(u64)), + None => err!(), } }, "q" => { -- 2.39.5