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

chore: rename {Abstract} back

Browse Source
This commit is contained in:
XOR-op
2023-05-19 14:05:08 +08:00
committed by Benjamin Fry
parent a38f9c01c9
commit b58a8585a6
9 changed files with 64 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/integration-tests/tests/name_server_pool_tests.rs
View File

@@ -17,14 +17,13 @@ use trust_dns_proto::error::ProtoError;
use trust_dns_proto::xfer::{DnsHandle, DnsResponse, FirstAnswer};
use trust_dns_resolver::config::*;
use trust_dns_resolver::error::{ResolveError, ResolveErrorKind};
use trust_dns_resolver::name_server::{AbstractNameServer, AbstractNameServerPool};
use trust_dns_resolver::name_server::{NameServer, NameServerPool};
const DEFAULT_SERVER_ADDR: IpAddr = IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1));
type MockedNameServer<O> =
AbstractNameServer<MockClientHandle<O, ResolveError>, MockConnProvider<O>>;
type MockedNameServer<O> = NameServer<MockClientHandle<O, ResolveError>, MockConnProvider<O>>;
type MockedNameServerPool<O> =
AbstractNameServerPool<MockClientHandle<O, ResolveError>, MockConnProvider<O>>;
NameServerPool<MockClientHandle<O, ResolveError>, MockConnProvider<O>>;
#[cfg(test)]
fn mock_nameserver(
@@ -80,7 +79,7 @@ fn mock_nameserver_on_send_nx<O: OnSend + Unpin>(
};
let client = MockClientHandle::mock_on_send(messages, on_send);
AbstractNameServer::from_conn(
NameServer::from_conn(
NameServerConfig {
socket_addr: SocketAddr::new(addr, 0),
protocol: Protocol::Udp,
@@ -115,10 +114,10 @@ fn mock_nameserver_pool_on_send<O: OnSend + Unpin>(
options: ResolverOpts,
) -> MockedNameServerPool<O> {
#[cfg(not(feature = "mdns"))]
return AbstractNameServerPool::from_nameservers(&options, udp, tcp);
return NameServerPool::from_nameservers(&options, udp, tcp);
#[cfg(feature = "mdns")]
return AbstractNameServerPool::from_nameservers(
return NameServerPool::from_nameservers(
&options, udp,
tcp,
//_mdns.unwrap_or_else(move || mock_nameserver_on_send(vec![], options, on_send)),