From 9526338ca76b334b22628c6798f67c43e86406e9 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge.aparicio@ferrous-systems.com>
Date: Fri, 9 Feb 2024 16:03:09 +0100
Subject: [PATCH] shorten RecursiveResolver -> Resolver

---
 packages/conformance-tests/src/resolver/dns/scenarios.rs   | 4 ++--
 .../conformance-tests/src/resolver/dnssec/scenarios.rs     | 6 +++---
 packages/dns-test/src/lib.rs                               | 4 ++--
 .../dns-test/src/{recursive_resolver.rs => resolver.rs}    | 7 +++----
 4 files changed, 10 insertions(+), 11 deletions(-)
 rename packages/dns-test/src/{recursive_resolver.rs => resolver.rs} (94%)

diff --git a/packages/conformance-tests/src/resolver/dns/scenarios.rs b/packages/conformance-tests/src/resolver/dns/scenarios.rs
index 84da3b31..3c965295 100644
--- a/packages/conformance-tests/src/resolver/dns/scenarios.rs
+++ b/packages/conformance-tests/src/resolver/dns/scenarios.rs
@@ -4,7 +4,7 @@ use dns_test::client::{Client, Dnssec, Recurse};
 use dns_test::name_server::NameServer;
 use dns_test::record::RecordType;
 use dns_test::zone_file::Root;
-use dns_test::{RecursiveResolver, Result, TrustAnchor, FQDN};
+use dns_test::{Resolver, Result, TrustAnchor, FQDN};
 
 #[test]
 fn can_resolve() -> Result<()> {
@@ -38,7 +38,7 @@ fn can_resolve() -> Result<()> {
     eprintln!("root.zone:\n{}", root_ns.zone_file());
 
     let roots = &[Root::new(root_ns.fqdn().clone(), root_ns.ipv4_addr())];
-    let resolver = RecursiveResolver::start(dns_test::subject(), roots, &TrustAnchor::empty())?;
+    let resolver = Resolver::start(dns_test::subject(), roots, &TrustAnchor::empty())?;
     let resolver_ip_addr = resolver.ipv4_addr();
 
     let client = Client::new()?;
diff --git a/packages/conformance-tests/src/resolver/dnssec/scenarios.rs b/packages/conformance-tests/src/resolver/dnssec/scenarios.rs
index 7838800f..c4e969de 100644
--- a/packages/conformance-tests/src/resolver/dnssec/scenarios.rs
+++ b/packages/conformance-tests/src/resolver/dnssec/scenarios.rs
@@ -4,7 +4,7 @@ use dns_test::client::{Client, Dnssec, Recurse};
 use dns_test::name_server::NameServer;
 use dns_test::record::RecordType;
 use dns_test::zone_file::Root;
-use dns_test::{RecursiveResolver, Result, TrustAnchor, FQDN};
+use dns_test::{Resolver, Result, TrustAnchor, FQDN};
 
 // no DS records are involved; this is a single-link chain of trust
 #[test]
@@ -25,7 +25,7 @@ fn can_validate_without_delegation() -> Result<()> {
     let roots = &[Root::new(ns.fqdn().clone(), ns.ipv4_addr())];
 
     let trust_anchor = TrustAnchor::from_iter([root_ksk.clone(), root_zsk.clone()]);
-    let resolver = RecursiveResolver::start(dns_test::subject(), roots, &trust_anchor)?;
+    let resolver = Resolver::start(dns_test::subject(), roots, &trust_anchor)?;
     let resolver_addr = resolver.ipv4_addr();
 
     let client = Client::new()?;
@@ -94,7 +94,7 @@ fn can_validate_with_delegation() -> Result<()> {
     let roots = &[Root::new(root_ns.fqdn().clone(), root_ns.ipv4_addr())];
 
     let trust_anchor = TrustAnchor::from_iter([root_ksk.clone(), root_zsk.clone()]);
-    let resolver = RecursiveResolver::start(dns_test::subject(), roots, &trust_anchor)?;
+    let resolver = Resolver::start(dns_test::subject(), roots, &trust_anchor)?;
     let resolver_addr = resolver.ipv4_addr();
 
     let client = Client::new()?;
diff --git a/packages/dns-test/src/lib.rs b/packages/dns-test/src/lib.rs
index aeccd5fe..c88e1209 100644
--- a/packages/dns-test/src/lib.rs
+++ b/packages/dns-test/src/lib.rs
@@ -4,7 +4,7 @@ use core::fmt;
 use std::sync::Once;
 
 pub use crate::fqdn::FQDN;
-pub use crate::recursive_resolver::RecursiveResolver;
+pub use crate::resolver::Resolver;
 pub use crate::trust_anchor::TrustAnchor;
 
 pub type Error = Box<dyn std::error::Error>;
@@ -15,7 +15,7 @@ mod container;
 mod fqdn;
 pub mod name_server;
 pub mod record;
-mod recursive_resolver;
+mod resolver;
 mod trust_anchor;
 pub mod zone_file;
 
diff --git a/packages/dns-test/src/recursive_resolver.rs b/packages/dns-test/src/resolver.rs
similarity index 94%
rename from packages/dns-test/src/recursive_resolver.rs
rename to packages/dns-test/src/resolver.rs
index f95ee696..12d94193 100644
--- a/packages/dns-test/src/recursive_resolver.rs
+++ b/packages/dns-test/src/resolver.rs
@@ -6,12 +6,12 @@ use crate::trust_anchor::TrustAnchor;
 use crate::zone_file::Root;
 use crate::{Implementation, Result};
 
-pub struct RecursiveResolver {
+pub struct Resolver {
     container: Container,
     child: Child,
 }
 
-impl RecursiveResolver {
+impl Resolver {
     pub fn start(
         implementation: Implementation,
         roots: &[Root],
@@ -96,8 +96,7 @@ mod tests {
 
     #[test]
     fn terminate_works() -> Result<()> {
-        let resolver =
-            RecursiveResolver::start(Implementation::Unbound, &[], &TrustAnchor::empty())?;
+        let resolver = Resolver::start(Implementation::Unbound, &[], &TrustAnchor::empty())?;
         let logs = resolver.terminate()?;
 
         eprintln!("{logs}");