From e29b901bc18735ee4a321063a54d7966be1cb15b Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge.aparicio@ferrous-systems.com>
Date: Tue, 6 Feb 2024 18:12:22 +0100
Subject: [PATCH] shorten AuthoritativeNameServer -> NameServer

---
 src/lib.rs                                         |  4 ++--
 ...authoritative_name_server.rs => name_server.rs} | 14 +++++++-------
 src/recursive_resolver.rs                          |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)
 rename src/{authoritative_name_server.rs => name_server.rs} (91%)

diff --git a/src/lib.rs b/src/lib.rs
index 95b95cde..22481203 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,8 +1,8 @@
 use std::sync::atomic::{self, AtomicUsize};
 
-pub use crate::authoritative_name_server::AuthoritativeNameServer;
 pub use crate::client::Client;
 pub use crate::domain::Domain;
+pub use crate::name_server::NameServer;
 pub use crate::recursive_resolver::RecursiveResolver;
 
 pub type Error = Box<dyn std::error::Error>;
@@ -10,10 +10,10 @@ pub type Result<T> = core::result::Result<T, Error>;
 
 const CHMOD_RW_EVERYONE: &str = "666";
 
-mod authoritative_name_server;
 mod client;
 pub mod container;
 mod domain;
+mod name_server;
 pub mod record;
 mod recursive_resolver;
 
diff --git a/src/authoritative_name_server.rs b/src/name_server.rs
similarity index 91%
rename from src/authoritative_name_server.rs
rename to src/name_server.rs
index c3b85162..327b5455 100644
--- a/src/authoritative_name_server.rs
+++ b/src/name_server.rs
@@ -5,13 +5,13 @@ use crate::container::Container;
 use crate::record::{self, Referral, SoaSettings, ZoneFile};
 use crate::{Domain, Result, CHMOD_RW_EVERYONE};
 
-pub struct AuthoritativeNameServer<'a, State> {
+pub struct NameServer<'a, State> {
     container: Container,
     zone_file: ZoneFile<'a>,
     _state: State,
 }
 
-impl<'a> AuthoritativeNameServer<'a, Stopped> {
+impl<'a> NameServer<'a, Stopped> {
     /// Spins up a primary name server that has authority over the given `zone`
     ///
     /// The initial state of the server is the "Stopped" state where it won't answer any query.
@@ -60,7 +60,7 @@ impl<'a> AuthoritativeNameServer<'a, Stopped> {
     }
 
     /// Moves the server to the "Start" state where it can answer client queries
-    pub fn start(self) -> Result<AuthoritativeNameServer<'a, Running>> {
+    pub fn start(self) -> Result<NameServer<'a, Running>> {
         let Self {
             container,
             zone_file,
@@ -85,7 +85,7 @@ impl<'a> AuthoritativeNameServer<'a, Stopped> {
 
         let child = container.spawn(&["nsd", "-d"])?;
 
-        Ok(AuthoritativeNameServer {
+        Ok(NameServer {
             container,
             zone_file,
             _state: Running { child },
@@ -93,7 +93,7 @@ impl<'a> AuthoritativeNameServer<'a, Stopped> {
     }
 }
 
-impl<'a, S> AuthoritativeNameServer<'a, S> {
+impl<'a, S> NameServer<'a, S> {
     pub fn ipv4_addr(&self) -> Ipv4Addr {
         self.container.ipv4_addr()
     }
@@ -145,7 +145,7 @@ mod tests {
 
     #[test]
     fn simplest() -> Result<()> {
-        let tld_ns = AuthoritativeNameServer::new(Domain::COM)?.start()?;
+        let tld_ns = NameServer::new(Domain::COM)?.start()?;
         let ip_addr = tld_ns.ipv4_addr();
 
         let client = Client::new()?;
@@ -159,7 +159,7 @@ mod tests {
     #[test]
     fn with_referral() -> Result<()> {
         let expected_ip_addr = Ipv4Addr::new(172, 17, 200, 1);
-        let mut root_ns = AuthoritativeNameServer::new(Domain::ROOT)?;
+        let mut root_ns = NameServer::new(Domain::ROOT)?;
         root_ns.referral(&Referral {
             domain: Domain::COM,
             ipv4_addr: expected_ip_addr,
diff --git a/src/recursive_resolver.rs b/src/recursive_resolver.rs
index 7e725714..d7386afb 100644
--- a/src/recursive_resolver.rs
+++ b/src/recursive_resolver.rs
@@ -43,7 +43,7 @@ mod tests {
     use crate::{
         client::{RecordType, Recurse},
         record::Referral,
-        AuthoritativeNameServer, Client, Domain,
+        Client, Domain, NameServer,
     };
 
     use super::*;
@@ -53,11 +53,11 @@ mod tests {
         let expected_ipv4_addr = Ipv4Addr::new(1, 2, 3, 4);
         let needle = Domain("example.nameservers.com.")?;
 
-        let mut root_ns = AuthoritativeNameServer::new(Domain::ROOT)?;
-        let mut com_ns = AuthoritativeNameServer::new(Domain::COM)?;
+        let mut root_ns = NameServer::new(Domain::ROOT)?;
+        let mut com_ns = NameServer::new(Domain::COM)?;
 
         let nameservers_domain = Domain("nameservers.com.")?;
-        let mut nameservers_ns = AuthoritativeNameServer::new(nameservers_domain.clone())?;
+        let mut nameservers_ns = NameServer::new(nameservers_domain.clone())?;
         nameservers_ns
             .a(root_ns.nameserver().clone(), root_ns.ipv4_addr())
             .a(com_ns.nameserver().clone(), com_ns.ipv4_addr())