colin/hickory-dns
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shorten RecursiveResolver -> Resolver

Browse Source
This commit is contained in:
Jorge Aparicio 2024-02-09 16:03:09 +01:00
parent 04a7190e61
commit 9526338ca7
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/conformance-tests/src/resolver/dns/scenarios.rs
View File

@ -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()?;

6
packages/conformance-tests/src/resolver/dnssec/scenarios.rs
View File

@ -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()?;

4
packages/dns-test/src/lib.rs
View File

@ -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;

7
packages/dns-test/src/recursive_resolver.rs → packages/dns-test/src/resolver.rs
View File

@ -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}");