From ab9b1e68cc39aec6397d32b6e0bc8e4056040c86 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 26 Feb 2024 12:10:00 +0100 Subject: [PATCH] also take Impl by ref in Resolver::new mainly for symmetry. the existing tests don't clone the subject so the code does not become any shorter --- packages/conformance-tests/src/resolver/dns/scenarios.rs | 4 ++-- .../src/resolver/dnssec/rfc4035/section_4/section_4_1.rs | 2 +- .../conformance-tests/src/resolver/dnssec/scenarios/bogus.rs | 2 +- .../conformance-tests/src/resolver/dnssec/scenarios/secure.rs | 4 ++-- packages/dns-test/examples/explore.rs | 2 +- packages/dns-test/src/resolver.rs | 4 ++-- packages/dns-test/src/tshark.rs | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/conformance-tests/src/resolver/dns/scenarios.rs b/packages/conformance-tests/src/resolver/dns/scenarios.rs index f43e0018..20a90d07 100644 --- a/packages/conformance-tests/src/resolver/dns/scenarios.rs +++ b/packages/conformance-tests/src/resolver/dns/scenarios.rs @@ -40,7 +40,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 = Resolver::start(dns_test::subject(), roots, &TrustAnchor::empty(), &network)?; + let resolver = Resolver::start(&dns_test::subject(), roots, &TrustAnchor::empty(), &network)?; let resolver_ip_addr = resolver.ipv4_addr(); let client = Client::new(&network)?; @@ -86,7 +86,7 @@ fn nxdomain() -> Result<()> { let root_ns = root_ns.start()?; let roots = &[Root::new(root_ns.fqdn().clone(), root_ns.ipv4_addr())]; - let resolver = Resolver::start(dns_test::subject(), roots, &TrustAnchor::empty(), &network)?; + let resolver = Resolver::start(&dns_test::subject(), roots, &TrustAnchor::empty(), &network)?; let resolver_ip_addr = resolver.ipv4_addr(); let client = Client::new(&network)?; diff --git a/packages/conformance-tests/src/resolver/dnssec/rfc4035/section_4/section_4_1.rs b/packages/conformance-tests/src/resolver/dnssec/rfc4035/section_4/section_4_1.rs index e4a1c393..12a3e7c4 100644 --- a/packages/conformance-tests/src/resolver/dnssec/rfc4035/section_4/section_4_1.rs +++ b/packages/conformance-tests/src/resolver/dnssec/rfc4035/section_4/section_4_1.rs @@ -11,7 +11,7 @@ fn edns_support() -> Result<()> { let network = &Network::new()?; let ns = NameServer::new(&dns_test::peer(), FQDN::ROOT, network)?.start()?; let resolver = Resolver::start( - dns_test::subject(), + &dns_test::subject(), &[Root::new(ns.fqdn().clone(), ns.ipv4_addr())], &TrustAnchor::empty(), network, diff --git a/packages/conformance-tests/src/resolver/dnssec/scenarios/bogus.rs b/packages/conformance-tests/src/resolver/dnssec/scenarios/bogus.rs index 869fca6b..0dd99b51 100644 --- a/packages/conformance-tests/src/resolver/dnssec/scenarios/bogus.rs +++ b/packages/conformance-tests/src/resolver/dnssec/scenarios/bogus.rs @@ -67,7 +67,7 @@ fn bad_signature_in_leaf_nameserver() -> 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 = Resolver::start(dns_test::subject(), roots, &trust_anchor, &network)?; + let resolver = Resolver::start(&dns_test::subject(), roots, &trust_anchor, &network)?; let resolver_addr = resolver.ipv4_addr(); let client = Client::new(&network)?; diff --git a/packages/conformance-tests/src/resolver/dnssec/scenarios/secure.rs b/packages/conformance-tests/src/resolver/dnssec/scenarios/secure.rs index 7a74b176..6df21009 100644 --- a/packages/conformance-tests/src/resolver/dnssec/scenarios/secure.rs +++ b/packages/conformance-tests/src/resolver/dnssec/scenarios/secure.rs @@ -27,7 +27,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 = Resolver::start(dns_test::subject(), roots, &trust_anchor, &network)?; + let resolver = Resolver::start(&dns_test::subject(), roots, &trust_anchor, &network)?; let resolver_addr = resolver.ipv4_addr(); let client = Client::new(&network)?; @@ -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 = Resolver::start(dns_test::subject(), roots, &trust_anchor, &network)?; + let resolver = Resolver::start(&dns_test::subject(), roots, &trust_anchor, &network)?; let resolver_addr = resolver.ipv4_addr(); let client = Client::new(&network)?; diff --git a/packages/dns-test/examples/explore.rs b/packages/dns-test/examples/explore.rs index 54da47b8..038870a1 100644 --- a/packages/dns-test/examples/explore.rs +++ b/packages/dns-test/examples/explore.rs @@ -50,7 +50,7 @@ fn main() -> Result<()> { let trust_anchor = TrustAnchor::from_iter([root_ksk.clone(), root_zsk.clone()]); println!("building docker image..."); - let resolver = Resolver::start(dns_test::subject(), roots, &trust_anchor, &network)?; + let resolver = Resolver::start(&dns_test::subject(), roots, &trust_anchor, &network)?; println!("DONE\n\n"); let resolver_addr = resolver.ipv4_addr(); diff --git a/packages/dns-test/src/resolver.rs b/packages/dns-test/src/resolver.rs index d26062ed..813e3bc3 100644 --- a/packages/dns-test/src/resolver.rs +++ b/packages/dns-test/src/resolver.rs @@ -21,7 +21,7 @@ impl Resolver { /// /// This constructor panics if `roots` is an empty slice pub fn start( - implementation: Implementation, + implementation: &Implementation, roots: &[Root], trust_anchor: &TrustAnchor, network: &Network, @@ -127,7 +127,7 @@ mod tests { let network = Network::new()?; let ns = NameServer::new(&Implementation::Unbound, FQDN::ROOT, &network)?.start()?; let resolver = Resolver::start( - Implementation::Unbound, + &Implementation::Unbound, &[Root::new(ns.fqdn().clone(), ns.ipv4_addr())], &TrustAnchor::empty(), &network, diff --git a/packages/dns-test/src/tshark.rs b/packages/dns-test/src/tshark.rs index 762d7591..e736ea9d 100644 --- a/packages/dns-test/src/tshark.rs +++ b/packages/dns-test/src/tshark.rs @@ -312,7 +312,7 @@ mod tests { let roots = &[Root::new(root_ns.fqdn().clone(), root_ns.ipv4_addr())]; let resolver = Resolver::start( - Implementation::Unbound, + &Implementation::Unbound, roots, &TrustAnchor::empty(), network,