Skip to content
Snippets Groups Projects
Commit 8aab5a39 authored by Ian Jackson's avatar Ian Jackson
Browse files

ARTI_EXAMPLE_CONFIG: Rename from ARTI_DEFAULTS

The defaults are built into the code.  This is a doc-commented example
file, not the primary specification of what the defaults are.
parent c9c8344b
No related branches found
No related tags found
1 merge request!503Make the example config file into a template and move it to arti
......@@ -12,7 +12,7 @@ use tor_config::{impl_default_via_builder, ConfigBuildError};
use crate::{LoggingConfig, LoggingConfigBuilder};
/// Default options to use for our configuration.
pub const ARTI_DEFAULTS: &str = concat!(include_str!("./arti_defaults.toml"),);
pub const ARTI_EXAMPLE_CONFIG: &str = concat!(include_str!("./arti-example-config.toml"),);
/// Structure to hold our application configuration options
#[derive(Debug, Clone, Builder, Eq, PartialEq)]
......@@ -193,7 +193,6 @@ mod test {
#![allow(clippy::unwrap_used)]
use arti_client::config::dir;
use arti_config::ARTI_DEFAULTS;
use std::time::Duration;
use super::*;
......@@ -202,7 +201,7 @@ mod test {
fn default_config() {
let cfg = config::Config::builder()
.add_source(config::File::from_str(
ARTI_DEFAULTS,
ARTI_EXAMPLE_CONFIG,
config::FileFormat::Toml,
))
.build()
......
......@@ -126,7 +126,7 @@ use std::fmt::Write;
pub use cfg::{
ApplicationConfig, ApplicationConfigBuilder, ArtiConfig, ArtiConfigBuilder, ProxyConfig,
ProxyConfigBuilder, SystemConfig, SystemConfigBuilder, ARTI_DEFAULTS,
ProxyConfigBuilder, SystemConfig, SystemConfigBuilder, ARTI_EXAMPLE_CONFIG,
};
pub use logging::{LoggingConfig, LoggingConfigBuilder};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment