Validator API storage fixes and adjustments

validator-api/src/network_monitor/mod.rs

@@ -14,7 +14,7 @@ use crate::network_monitor::monitor::sender::PacketSender;
 use crate::network_monitor::monitor::summary_producer::SummaryProducer;
 use crate::network_monitor::monitor::Monitor;
 use crate::network_monitor::tested_network::TestedNetwork;
-use crate::node_status_api::storage::NodeStatusStorage;
+use crate::storage::NodeStatusStorage;
 use crypto::asymmetric::{encryption, identity};
 use futures::channel::mpsc;
 use nymsphinx::addressing::clients::Recipient;

validator-api/src/network_monitor/monitor/mod.rs

@@ -8,7 +8,7 @@ use crate::network_monitor::monitor::sender::PacketSender;
 use crate::network_monitor::monitor::summary_producer::{NodeResult, SummaryProducer, TestReport};
 use crate::network_monitor::test_packet::NodeType;
 use crate::network_monitor::tested_network::TestedNetwork;
-use crate::node_status_api::storage::NodeStatusStorage;
+use crate::storage::NodeStatusStorage;
 use log::{debug, info};
 use std::process;
 use tokio::time::{sleep, Duration, Instant};

validator-api/src/network_monitor/monitor/summary_producer.rs

@@ -6,8 +6,9 @@ use crate::network_monitor::test_packet::{NodeType, TestPacket};
 use crate::PENALISE_OUTDATED;
 use std::collections::HashMap;
 
+#[derive(Debug)]
 pub(crate) struct NodeResult {
-    pub(crate) pub_key: String,
+    pub(crate) identity: String,
     pub(crate) owner: String,
     pub(crate) working_ipv4: bool,
     pub(crate) working_ipv6: bool,
@@ -20,9 +21,9 @@ struct NodeStatus {
 }
 
 impl NodeStatus {
-    fn into_node_status(self, pub_key: String, owner: String) -> NodeResult {
+    fn into_node_status(self, identity: String, owner: String) -> NodeResult {
         NodeResult {
-            pub_key,
+            identity,
             owner,
             working_ipv4: self.ip_v4_compatible,
             working_ipv6: self.ip_v6_compatible,