Skip to content

Commit e89886f

Browse files
committed
[pr] Rename Config and add link to docs
1 parent e5c5fb7 commit e89886f

File tree

6 files changed

+16
-15
lines changed

6 files changed

+16
-15
lines changed

iroh-gateway/src/bad_bits.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ mod tests {
112112
use hex_literal::hex;
113113
use http::StatusCode;
114114
use iroh_resolver::content_loader::{FullLoader, FullLoaderConfig, GatewayUrl};
115-
use iroh_resolver::dns_resolver::DnsResolverConfig;
115+
use iroh_resolver::dns_resolver::Config as DnsResolverConfig;
116116
use iroh_rpc_client::{Client as RpcClient, Config as RpcClientConfig};
117117

118118
#[tokio::test]

iroh-gateway/src/client.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use iroh_metrics::{
1313
gateway::{GatewayHistograms, GatewayMetrics},
1414
observe, record,
1515
};
16-
use iroh_resolver::dns_resolver::DnsResolverConfig;
16+
use iroh_resolver::dns_resolver::Config;
1717
use iroh_resolver::{
1818
content_loader::ContentLoader,
1919
resolver::{
@@ -91,7 +91,7 @@ impl<T: ContentLoader + std::marker::Unpin> http_body::Body for PrettyStreamBody
9191
}
9292

9393
impl<T: ContentLoader + std::marker::Unpin> Client<T> {
94-
pub fn new(rpc_client: &T, dns_resolver_config: DnsResolverConfig) -> Self {
94+
pub fn new(rpc_client: &T, dns_resolver_config: Config) -> Self {
9595
Self {
9696
resolver: Resolver::with_dns_resolver(rpc_client.clone(), dns_resolver_config),
9797
}

iroh-gateway/src/config.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use headers::{
66
AccessControlAllowHeaders, AccessControlAllowMethods, AccessControlAllowOrigin, HeaderMapExt,
77
};
88
use iroh_metrics::config::Config as MetricsConfig;
9-
use iroh_resolver::dns_resolver::DnsResolverConfig;
9+
use iroh_resolver::dns_resolver::Config as DnsResolverConfig;
1010
use iroh_rpc_client::Config as RpcClientConfig;
1111
use iroh_rpc_types::{gateway::GatewayServerAddr, Addr};
1212
use iroh_util::insert_into_config_map;

iroh-gateway/src/core.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use axum::Router;
22
use iroh_resolver::content_loader::ContentLoader;
33
use iroh_rpc_types::gateway::GatewayServerAddr;
44

5-
use iroh_resolver::dns_resolver::DnsResolverConfig;
5+
use iroh_resolver::dns_resolver::Config as DnsResolverConfig;
66
use std::{collections::HashMap, sync::Arc};
77
use tokio::sync::RwLock;
88

iroh-resolver/src/dns_resolver.rs

+8-7
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,23 @@ use trust_dns_resolver::config::{NameServerConfigGroup, ResolverConfig, Resolver
77
use trust_dns_resolver::{AsyncResolver, TokioAsyncResolver};
88

99
#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
10-
pub struct DnsResolverConfig {
10+
pub struct Config {
1111
/// Mapping from TLD to the specific instance of resolver
1212
tld_resolvers: Option<HashMap<String, ResolverConfig>>,
1313
}
1414

15-
impl DnsResolverConfig {
15+
impl Config {
1616
pub fn empty() -> Self {
17-
DnsResolverConfig {
17+
Config {
1818
tld_resolvers: None,
1919
}
2020
}
2121
}
2222

23-
impl Default for DnsResolverConfig {
23+
impl Default for Config {
2424
fn default() -> Self {
25-
DnsResolverConfig {
25+
Config {
26+
/// Documentation on .eth TLD lives on https://eth.link/
2627
tld_resolvers: Some(HashMap::from_iter(vec![(
2728
"eth".to_string(),
2829
ResolverConfig::from_parts(
@@ -51,7 +52,7 @@ pub struct DnsResolver {
5152

5253
impl DnsResolver {
5354
/// Creates resolver from its config
54-
pub fn from_config(dns_resolver_config: DnsResolverConfig) -> DnsResolver {
55+
pub fn from_config(dns_resolver_config: Config) -> DnsResolver {
5556
let tld_resolvers = dns_resolver_config
5657
.tld_resolvers
5758
.map(|dns_resolver_config| {
@@ -107,7 +108,7 @@ impl DnsResolver {
107108

108109
impl Default for DnsResolver {
109110
fn default() -> Self {
110-
DnsResolver::from_config(DnsResolverConfig::default())
111+
DnsResolver::from_config(Config::default())
111112
}
112113
}
113114

iroh-resolver/src/resolver.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use tokio::sync::Mutex;
2323
use tokio::task::JoinHandle;
2424
use tracing::{debug, trace, warn};
2525

26-
use crate::dns_resolver::{DnsResolver, DnsResolverConfig};
26+
use crate::dns_resolver::{Config, DnsResolver};
2727

2828
use iroh_metrics::{
2929
core::{MObserver, MRecorder},
@@ -737,10 +737,10 @@ struct InnerLoaderContext {
737737

738738
impl<T: ContentLoader> Resolver<T> {
739739
pub fn new(loader: T) -> Self {
740-
Self::with_dns_resolver(loader, DnsResolverConfig::default())
740+
Self::with_dns_resolver(loader, Config::default())
741741
}
742742

743-
pub fn with_dns_resolver(loader: T, dns_resolver_config: DnsResolverConfig) -> Self {
743+
pub fn with_dns_resolver(loader: T, dns_resolver_config: Config) -> Self {
744744
let (session_closer_s, session_closer_r) = async_channel::bounded(2048);
745745
let loader_thread = loader.clone();
746746
let worker = tokio::task::spawn(async move {

0 commit comments

Comments
 (0)