Rename external config crate->ext-config

rrybarczyk · Jun 22, 2024 · c35cc03 · c35cc03
1 parent 16f08e6
commit c35cc03
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 31 deletions.
diff --git a/roles/Cargo.lock b/roles/Cargo.lock
diff --git 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"] }
+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
@@ -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
@@ -28,7 +28,7 @@ pub enum ChannelSendError<'a> {
 #[derive(Debug)]
 pub enum JdcError<'a> {
     VecToSlice32(Vec<u8>),
-    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<config::ConfigError> for JdcError<'a> {
-    fn from(e: config::ConfigError) -> JdcError<'a> {
+impl<'a> From<ext_config::ConfigError> 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
@@ -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"] }
+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
@@ -11,8 +11,8 @@ struct Args {
 #[allow(clippy::result_large_err)]
 pub fn process_cli_args() -> JdsResult<JdsConfig> {
     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
@@ -12,7 +12,7 @@ pub type JdsResult<T> = core::result::Result<T, JdsError>;
 
 #[derive(std::fmt::Debug)]
 pub enum JdsError {
-    ConfigError(config::ConfigError),
+    ConfigError(ext_config::ConfigError),
     Io(std::io::Error),
     ChannelSend(Box<dyn std::marker::Send + Debug>),
     ChannelRecv(async_channel::RecvError),
@@ -56,8 +56,8 @@ impl std::fmt::Display for JdsError {
     }
 }
 
-impl From<config::ConfigError> for JdsError {
-    fn from(e: config::ConfigError) -> JdsError {
+impl From<ext_config::ConfigError> 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
@@ -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"] }
+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
@@ -11,8 +11,8 @@ struct Args {
 #[allow(clippy::result_large_err)]
 pub fn process_cli_args() -> ProxyResult<ProxyConfig> {
     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
@@ -12,15 +12,15 @@ pub type ProxyResult<T> = core::result::Result<T, ProxyError>;
 #[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<EitherFrame>),
     UpstreamNotAvailabe(SocketAddr),
     SetupConnectionError(String),
 }
 
-impl From<config::ConfigError> for ProxyError {
-    fn from(e: config::ConfigError) -> ProxyError {
+impl From<ext_config::ConfigError> for ProxyError {
+    fn from(e: ext_config::ConfigError) -> ProxyError {
         ProxyError::ConfigError(e)
     }
 }

diff --git 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
@@ -12,8 +12,8 @@ struct Args {
 #[allow(clippy::result_large_err)]
 pub fn process_cli_args() -> PoolResult<PoolConfig> {
     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
@@ -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<dyn std::marker::Send + Debug>),
     ChannelRecv(async_channel::RecvError),
@@ -23,8 +23,8 @@ pub enum PoolError {
     Sv2ProtocolError((u32, Mining<'static>)),
 }
 
-impl From<config::ConfigError> for PoolError {
-    fn from(e: config::ConfigError) -> PoolError {
+impl From<ext_config::ConfigError> for PoolError {
+    fn from(e: ext_config::ConfigError) -> PoolError {
         PoolError::ConfigError(e)
     }
 }

diff --git 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
@@ -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
@@ -34,7 +34,7 @@ pub enum ChannelSendError<'a> {
 #[derive(Debug)]
 pub enum TProxyError<'a> {
     VecToSlice32(Vec<u8>),
-    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<config::ConfigError> for TProxyError<'a> {
-    fn from(e: config::ConfigError) -> TProxyError<'a> {
+impl<'a> From<ext_config::ConfigError> for TProxyError<'a> {
+    fn from(e: ext_config::ConfigError) -> TProxyError<'a> {
         TProxyError::ConfigError(e)
     }
 }