From 851401dded71cde146e0dfc389fed3f462cda79f Mon Sep 17 00:00:00 2001 From: Dmitry Kashitsyn Date: Mon, 6 Nov 2017 13:01:37 +0700 Subject: [PATCH] Removes obsolete is_valid_node_url() --- sync/src/lib.rs | 2 +- util/network/src/lib.rs | 2 +- util/network/src/node_table.rs | 8 +------- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/sync/src/lib.rs b/sync/src/lib.rs index 45f7a8d98..0495d72a7 100644 --- a/sync/src/lib.rs +++ b/sync/src/lib.rs @@ -73,7 +73,7 @@ mod api; pub use api::*; pub use chain::{SyncStatus, SyncState}; -pub use network::{is_valid_node_url, validate_node_url, NonReservedPeerMode, NetworkError, ConnectionFilter, ConnectionDirection}; +pub use network::{validate_node_url, NonReservedPeerMode, NetworkError, ConnectionFilter, ConnectionDirection}; #[cfg(test)] pub(crate) type Address = bigint::hash::H160; diff --git a/util/network/src/lib.rs b/util/network/src/lib.rs index a69663121..6cf81fa9d 100644 --- a/util/network/src/lib.rs +++ b/util/network/src/lib.rs @@ -115,7 +115,7 @@ pub use session::SessionInfo; pub use connection_filter::{ConnectionFilter, ConnectionDirection}; pub use io::TimerToken; -pub use node_table::{is_valid_node_url, validate_node_url, NodeId}; +pub use node_table::{validate_node_url, NodeId}; use ipnetwork::{IpNetwork, IpNetworkError}; use std::str::FromStr; diff --git a/util/network/src/node_table.rs b/util/network/src/node_table.rs index a1a1903d3..9ac0ac9f6 100644 --- a/util/network/src/node_table.rs +++ b/util/network/src/node_table.rs @@ -363,12 +363,6 @@ impl Drop for NodeTable { } /// Check if node url is valid -pub fn is_valid_node_url(url: &str) -> bool { - use std::str::FromStr; - Node::from_str(url).is_ok() -} - -/// Same as `is_valid_node_url` but returns detailed `NetworkError` pub fn validate_node_url(url: &str) -> Option { use std::str::FromStr; match Node::from_str(url) { @@ -399,7 +393,7 @@ mod tests { #[test] fn node_parse() { - assert!(is_valid_node_url("enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@22.99.55.44:7770")); + assert!(validate_node_url("enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@22.99.55.44:7770").is_some()); let node = Node::from_str("enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@22.99.55.44:7770"); assert!(node.is_ok()); let node = node.unwrap();