refact: rr_stored_data inside cache_by_record_type crate

Author: justRkive

src/dns_cache.rs

@@ -1,9 +1,9 @@
 pub mod cache_by_record_type;
 
 use crate::dns_cache::cache_by_record_type::CacheByRecordType;
+use crate::dns_cache::cache_by_record_type::rr_stored_data::RRStoredData;
 use crate::message::rdata::Rdata;
 use crate::message::resource_record::ResourceRecord;
-use crate::rr_stored_data::RRStoredData;
 use crate::message::type_rtype::Rtype;
 use std::net::IpAddr;
 use crate::domain_name::DomainName;
@@ -221,7 +221,7 @@ mod dns_cache_test {
     use crate::dns_cache::DnsCache;
     use crate::dns_cache::cache_by_record_type::CacheByRecordType;
     use crate::dns_cache::cache_by_record_type::cache_by_domain_name::CacheByDomainName;
-    use crate::rr_stored_data::RRStoredData;
+    use crate::dns_cache::cache_by_record_type::rr_stored_data::RRStoredData;
     use crate::domain_name::DomainName;
     use crate::message::rdata::a_rdata::ARdata;
     use crate::message::rdata::txt_rdata::TxtRdata;

src/dns_cache/cache_by_record_type.rs

@@ -1,13 +1,13 @@
 pub mod cache_by_domain_name;
+pub mod rr_stored_data;
 
 use chrono::Utc;
-//use crate::message::rdata::Rdata;
 use crate::message::type_rtype::Rtype;
-use crate::rr_stored_data::RRStoredData;
 use std::net::IpAddr;
 use crate::dns_cache::cache_by_record_type::cache_by_domain_name::CacheByDomainName;
 use std::collections::HashMap;
 use crate::domain_name::DomainName;
+use self::rr_stored_data::RRStoredData;
 
 
 /// Struct that represents the cache data of the DNS cache by record type.
@@ -231,7 +231,7 @@ mod cache_data_test{
 
     use crate::message::rdata::txt_rdata::TxtRdata;
     use crate::message::type_rtype::Rtype;
-    use crate::rr_stored_data::RRStoredData;
+    use crate::dns_cache::cache_by_record_type::rr_stored_data::RRStoredData;    
     use crate::domain_name::DomainName;
     use crate::message::rdata::Rdata;
     use crate::message::rdata::a_rdata::ARdata;

src/dns_cache/cache_by_record_type/cache_by_domain_name.rs

@@ -1,5 +1,6 @@
 use chrono::{Utc, DateTime};
-use crate::{rr_stored_data::RRStoredData, domain_name::DomainName, message::rdata::Rdata};
+use crate::{domain_name::DomainName, message::rdata::Rdata};
+use crate::dns_cache::cache_by_record_type::rr_stored_data::RRStoredData;
 use std::{collections::HashMap, net::IpAddr};
 
 /// This struct saves the data associated with a host in the cache.
@@ -254,7 +255,7 @@ impl CacheByDomainName{
 mod host_data_test{
     use chrono::Utc;
     use crate::message::rdata::txt_rdata::TxtRdata;
-    use crate::rr_stored_data::RRStoredData;
+    use crate::dns_cache::cache_by_record_type::rr_stored_data::RRStoredData;
     use crate::domain_name::DomainName;
     use crate::message::rdata::Rdata;
     use crate::message::rdata::a_rdata::ARdata;

src/rr_stored_data.rs renamed to src/dns_cache/cache_by_record_type/rr_stored_data.rs

@@ -91,7 +91,7 @@ mod rr_cache_test {
     use crate::message::rdata::Rdata;
     use crate::message::type_rtype::Rtype;
     use crate::message::resource_record::ResourceRecord;
-    use crate::rr_stored_data::RRStoredData;
+    use crate::dns_cache::cache_by_record_type::rr_stored_data::RRStoredData;
     use std::net::IpAddr;
     use chrono::prelude::*;
 

src/lib.rs

@@ -3,7 +3,6 @@ pub mod dns_cache;
 pub mod domain_name;
 pub mod message;
 pub mod async_resolver;
-pub mod rr_stored_data;
 pub mod utils;
 pub mod truncated_dns_message;