From c35cc03a6488b50b97f24917a9ee42105ae6fc5c Mon Sep 17 00:00:00 2001 From: RJ Rybarczyk Date: Sat, 22 Jun 2024 15:18:04 -0400 Subject: [PATCH] Rename external config crate->ext-config --- roles/Cargo.lock | 2 +- roles/jd-client/Cargo.toml | 2 +- roles/jd-client/src/args.rs | 4 ++-- roles/jd-client/src/lib/error.rs | 6 +++--- roles/jd-server/Cargo.toml | 2 +- roles/jd-server/src/args.rs | 4 ++-- roles/jd-server/src/lib/error.rs | 6 +++--- roles/mining-proxy/Cargo.toml | 2 +- roles/mining-proxy/src/args.rs | 4 ++-- roles/mining-proxy/src/lib/error.rs | 6 +++--- roles/pool/Cargo.toml | 2 +- roles/pool/src/args.rs | 4 ++-- roles/pool/src/lib/error.rs | 6 +++--- roles/translator/Cargo.toml | 2 +- roles/translator/src/args.rs | 4 ++-- roles/translator/src/lib/error.rs | 6 +++--- 16 files changed, 31 insertions(+), 31 deletions(-) diff --git a/roles/Cargo.lock b/roles/Cargo.lock index b76e1c5c91..fd93e34b7e 100644 --- a/roles/Cargo.lock +++ b/roles/Cargo.lock @@ -2250,7 +2250,7 @@ dependencies = [ [[package]] name = "sv1_api" -version = "1.0.0" +version = "1.0.1" dependencies = [ "binary_sv2", "bitcoin_hashes 0.3.2", diff --git a/roles/jd-client/Cargo.toml b/roles/jd-client/Cargo.toml index 08e03bcecd..97d7c0b64c 100644 --- a/roles/jd-client/Cargo.toml +++ b/roles/jd-client/Cargo.toml @@ -29,4 +29,4 @@ error_handling = { version = "1.0.0", path = "../../utils/error-handling" } nohash-hasher = "0.2.0" key-utils = { version = "^1.0.0", path = "../../utils/key-utils" } clap = { version = "^4.5.4", features = ["derive"] } -config = { version = "0.14.0", features = ["toml"] } \ No newline at end of file +ext-config = { version = "0.14.0", features = ["toml"], package = "config" } diff --git a/roles/jd-client/src/args.rs b/roles/jd-client/src/args.rs index e06d149f61..66a4f57a53 100644 --- a/roles/jd-client/src/args.rs +++ b/roles/jd-client/src/args.rs @@ -12,8 +12,8 @@ struct Args { #[allow(clippy::result_large_err)] pub fn process_cli_args<'a>() -> JdcResult<'a, JdcConfig> { let args = Args::parse(); - let config = match config::Config::builder() - .add_source(config::File::with_name(&args.config_path)) + let config = match ext_config::Config::builder() + .add_source(ext_config::File::with_name(&args.config_path)) .build() { Ok(cfg) => cfg, diff --git a/roles/jd-client/src/lib/error.rs b/roles/jd-client/src/lib/error.rs index 84ea3c5236..a746254418 100644 --- a/roles/jd-client/src/lib/error.rs +++ b/roles/jd-client/src/lib/error.rs @@ -28,7 +28,7 @@ pub enum ChannelSendError<'a> { #[derive(Debug)] pub enum JdcError<'a> { VecToSlice32(Vec), - ConfigError(config::ConfigError), + ConfigError(ext_config::ConfigError), /// Errors from `binary_sv2` crate. BinarySv2(binary_sv2::Error), /// Errors on bad noise handshake. @@ -79,8 +79,8 @@ impl<'a> fmt::Display for JdcError<'a> { } } -impl<'a> From for JdcError<'a> { - fn from(e: config::ConfigError) -> JdcError<'a> { +impl<'a> From for JdcError<'a> { + fn from(e: ext_config::ConfigError) -> JdcError<'a> { JdcError::ConfigError(e) } } diff --git a/roles/jd-server/Cargo.toml b/roles/jd-server/Cargo.toml index 6d344cc9d1..3efe43a85d 100644 --- a/roles/jd-server/Cargo.toml +++ b/roles/jd-server/Cargo.toml @@ -32,4 +32,4 @@ key-utils = { version = "^1.0.0", path = "../../utils/key-utils" } rpc_sv2 = { version = "1.0.0", path = "../roles-utils/rpc" } hex = "0.4.3" clap = { version = "^4.5.4", features = ["derive"] } -config = { version = "0.14.0", features = ["toml"] } \ No newline at end of file +ext-config = { version = "0.14.0", features = ["toml"], package = "config" } diff --git a/roles/jd-server/src/args.rs b/roles/jd-server/src/args.rs index b7bc68bfe8..0b0ef52699 100644 --- a/roles/jd-server/src/args.rs +++ b/roles/jd-server/src/args.rs @@ -11,8 +11,8 @@ struct Args { #[allow(clippy::result_large_err)] pub fn process_cli_args() -> JdsResult { let args = Args::parse(); - let config = match config::Config::builder() - .add_source(config::File::with_name(&args.config_path)) + let config = match ext_config::Config::builder() + .add_source(ext_config::File::with_name(&args.config_path)) .build() { Ok(cfg) => cfg, diff --git a/roles/jd-server/src/lib/error.rs b/roles/jd-server/src/lib/error.rs index 265807def7..69a0e9067e 100644 --- a/roles/jd-server/src/lib/error.rs +++ b/roles/jd-server/src/lib/error.rs @@ -12,7 +12,7 @@ pub type JdsResult = core::result::Result; #[derive(std::fmt::Debug)] pub enum JdsError { - ConfigError(config::ConfigError), + ConfigError(ext_config::ConfigError), Io(std::io::Error), ChannelSend(Box), ChannelRecv(async_channel::RecvError), @@ -56,8 +56,8 @@ impl std::fmt::Display for JdsError { } } -impl From for JdsError { - fn from(e: config::ConfigError) -> JdsError { +impl From for JdsError { + fn from(e: ext_config::ConfigError) -> JdsError { JdsError::ConfigError(e) } } diff --git a/roles/mining-proxy/Cargo.toml b/roles/mining-proxy/Cargo.toml index c966b89180..e2931e2660 100644 --- a/roles/mining-proxy/Cargo.toml +++ b/roles/mining-proxy/Cargo.toml @@ -30,4 +30,4 @@ tracing-subscriber = {version = "0.3"} nohash-hasher = "0.2.0" key-utils = { version = "^1.0.0", path = "../../utils/key-utils" } clap = { version = "^4.5.4", features = ["derive"] } -config = { version = "0.14.0", features = ["toml"] } \ No newline at end of file +ext-config = { version = "0.14.0", features = ["toml"], package = "config" } diff --git a/roles/mining-proxy/src/args.rs b/roles/mining-proxy/src/args.rs index 96208ee431..6c90bc4e0b 100644 --- a/roles/mining-proxy/src/args.rs +++ b/roles/mining-proxy/src/args.rs @@ -11,8 +11,8 @@ struct Args { #[allow(clippy::result_large_err)] pub fn process_cli_args() -> ProxyResult { let args = Args::parse(); - let config = match config::Config::builder() - .add_source(config::File::with_name(&args.config_path)) + let config = match ext_config::Config::builder() + .add_source(ext_config::File::with_name(&args.config_path)) .build() { Ok(cfg) => cfg, diff --git a/roles/mining-proxy/src/lib/error.rs b/roles/mining-proxy/src/lib/error.rs index 8df5a6b7b8..4da86d7e30 100644 --- a/roles/mining-proxy/src/lib/error.rs +++ b/roles/mining-proxy/src/lib/error.rs @@ -12,15 +12,15 @@ pub type ProxyResult = core::result::Result; #[allow(clippy::large_enum_variant)] #[allow(clippy::enum_variant_names)] pub enum ProxyError { - ConfigError(config::ConfigError), + ConfigError(ext_config::ConfigError), Io(std::io::Error), SendError(SendError), UpstreamNotAvailabe(SocketAddr), SetupConnectionError(String), } -impl From for ProxyError { - fn from(e: config::ConfigError) -> ProxyError { +impl From for ProxyError { + fn from(e: ext_config::ConfigError) -> ProxyError { ProxyError::ConfigError(e) } } diff --git a/roles/pool/Cargo.toml b/roles/pool/Cargo.toml index 6ebe5219db..444dd16be2 100644 --- a/roles/pool/Cargo.toml +++ b/roles/pool/Cargo.toml @@ -30,7 +30,7 @@ error_handling = { version = "1.0.0", path = "../../utils/error-handling" } nohash-hasher = "0.2.0" key-utils = { version = "^1.0.0", path = "../../utils/key-utils" } clap = { version = "^4.5.4", features = ["derive"] } -config = { version = "0.14.0", features = ["toml"] } +ext-config = { version = "0.14.0", features = ["toml"], package = "config" } [dev-dependencies] hex = "0.4.3" diff --git a/roles/pool/src/args.rs b/roles/pool/src/args.rs index 1f69639662..b7291040ae 100644 --- a/roles/pool/src/args.rs +++ b/roles/pool/src/args.rs @@ -12,8 +12,8 @@ struct Args { #[allow(clippy::result_large_err)] pub fn process_cli_args() -> PoolResult { let args = Args::parse(); - let config = match config::Config::builder() - .add_source(config::File::with_name(&args.config_path)) + let config = match ext_config::Config::builder() + .add_source(ext_config::File::with_name(&args.config_path)) .build() { Ok(cfg) => cfg, diff --git a/roles/pool/src/lib/error.rs b/roles/pool/src/lib/error.rs index a5624cdb02..cf09d60a49 100644 --- a/roles/pool/src/lib/error.rs +++ b/roles/pool/src/lib/error.rs @@ -8,7 +8,7 @@ use roles_logic_sv2::parsers::Mining; #[derive(std::fmt::Debug)] pub enum PoolError { - ConfigError(config::ConfigError), + ConfigError(ext_config::ConfigError), Io(std::io::Error), ChannelSend(Box), ChannelRecv(async_channel::RecvError), @@ -23,8 +23,8 @@ pub enum PoolError { Sv2ProtocolError((u32, Mining<'static>)), } -impl From for PoolError { - fn from(e: config::ConfigError) -> PoolError { +impl From for PoolError { + fn from(e: ext_config::ConfigError) -> PoolError { PoolError::ConfigError(e) } } diff --git a/roles/translator/Cargo.toml b/roles/translator/Cargo.toml index e6327050cb..a3bd787a89 100644 --- a/roles/translator/Cargo.toml +++ b/roles/translator/Cargo.toml @@ -34,7 +34,7 @@ key-utils = { version = "^1.0.0", path = "../../utils/key-utils" } tokio-util = { version = "0.7.10", features = ["codec"] } async-compat = "0.2.1" clap = { version = "^4.5.4", features = ["derive"] } -config = { version = "0.14.0", features = ["toml"] } +ext-config = { version = "0.14.0", features = ["toml"], package = "config" } [dev-dependencies] diff --git a/roles/translator/src/args.rs b/roles/translator/src/args.rs index 2408a1d2cd..0d20ab6c7f 100644 --- a/roles/translator/src/args.rs +++ b/roles/translator/src/args.rs @@ -12,8 +12,8 @@ struct Args { #[allow(clippy::result_large_err)] pub fn process_cli_args<'a>() -> TProxyResult<'a, TProxyConfig> { let args = Args::parse(); - let config = match config::Config::builder() - .add_source(config::File::with_name(&args.config_path)) + let config = match ext_config::Config::builder() + .add_source(ext_config::File::with_name(&args.config_path)) .build() { Ok(cfg) => cfg, diff --git a/roles/translator/src/lib/error.rs b/roles/translator/src/lib/error.rs index 36f60b741f..a7f39f1265 100644 --- a/roles/translator/src/lib/error.rs +++ b/roles/translator/src/lib/error.rs @@ -34,7 +34,7 @@ pub enum ChannelSendError<'a> { #[derive(Debug)] pub enum TProxyError<'a> { VecToSlice32(Vec), - ConfigError(config::ConfigError), + ConfigError(ext_config::ConfigError), /// Errors on bad CLI argument input. #[allow(dead_code)] BadCliArgs, @@ -117,8 +117,8 @@ impl<'a> fmt::Display for TProxyError<'a> { } } -impl<'a> From for TProxyError<'a> { - fn from(e: config::ConfigError) -> TProxyError<'a> { +impl<'a> From for TProxyError<'a> { + fn from(e: ext_config::ConfigError) -> TProxyError<'a> { TProxyError::ConfigError(e) } }