clean up

Author: cong-or

src/jormungandr/jormungandr/src/fragment/logs.rs

@@ -1,4 +1,4 @@
-use crate::{fragment::FragmentId, network::bootstrap::local_addr_lookup};
+use crate::{fragment::FragmentId, network::retrieve_local_ip};
 use jormungandr_lib::{
     crypto::hash::Hash,
     interfaces::{BlockDate, FragmentLog, FragmentOrigin, FragmentStatus},
@@ -79,7 +79,7 @@ impl Logs {
                 let mut entry = FragmentLog::new(
                     fragment_id.into_hash(),
                     FragmentOrigin::Network {
-                        addr: local_addr_lookup(),
+                        addr: retrieve_local_ip(),
                     },
                 );
                 entry.modify(status);

src/jormungandr/jormungandr/src/network/bootstrap.rs

@@ -8,11 +8,8 @@ use crate::{
 use chain_core::property::ReadError;
 use chain_network::{data as net_data, error::Error as NetworkError};
 use futures::prelude::*;
-use local_ip_address::local_ip;
-use std::{
-    fmt::Debug,
-    net::{IpAddr, Ipv4Addr},
-};
+
+use std::fmt::Debug;
 use tokio_util::sync::CancellationToken;
 
 #[derive(thiserror::Error, Debug)]
@@ -130,16 +127,3 @@ pub async fn bootstrap_from_peer(
         .map_err(Box::new)?;
     }
 }
-
-pub fn local_addr_lookup() -> IpAddr {
-    match local_ip() {
-        Ok(ip) => ip,
-        Err(err) => {
-            tracing::error!(
-                reason = %err,
-                "unable to lookup local addr"
-            );
-            std::net::IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1))
-        }
-    }
-}

src/jormungandr/jormungandr/src/network/mod.rs

@@ -15,6 +15,11 @@ mod subscription;
 
 use self::convert::Encode;
 use futures::{future, prelude::*};
+use local_ip_address::local_ip;
+use std::{
+    fmt::Debug,
+    net::{IpAddr, Ipv4Addr},
+};
 use thiserror::Error;
 use tokio_util::sync::CancellationToken;
 
@@ -781,3 +786,17 @@ pub enum FetchBlockError {
     #[error("could not download block hash {block}")]
     CouldNotDownloadBlock { block: HeaderHash },
 }
+
+/// Infallible util function to obtain local IP addr
+pub fn retrieve_local_ip() -> IpAddr {
+    match local_ip() {
+        Ok(ip) => ip,
+        Err(err) => {
+            tracing::error!(
+                reason = %err,
+                "unable to lookup local addr"
+            );
+            std::net::IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1))
+        }
+    }
+}

src/jormungandr/jormungandr/src/network/subscription.rs

@@ -2,7 +2,7 @@ use super::{buffer_sizes, convert::Decode, GlobalStateR};
 use crate::{
     blockcfg::Fragment,
     intercom::{self, BlockMsg, TopologyMsg, TransactionMsg},
-    network::bootstrap::local_addr_lookup,
+    network::retrieve_local_ip,
     settings::start::network::Configuration,
     topology::{Gossip, NodeId},
     utils::async_msg::{self, MessageBox},
@@ -380,7 +380,7 @@ impl FragmentProcessor {
             None => {
                 tracing::error!("node addr not present in config, reverting to local lookup");
                 FragmentOrigin::Network {
-                    addr: local_addr_lookup(),
+                    addr: retrieve_local_ip(),
                 }
             }
         };