chore: moved redact code to utils

chainflip-io · Sep 11, 2023 · d21c68f · d21c68f
1 parent a9a25eb
commit d21c68f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/engine/Cargo.toml b/engine/Cargo.toml
@@ -60,7 +60,6 @@ lazy_static = "1.4"
 num-bigint = "0.4"
 num-derive = "0.4"
 num-traits = "0.2"
-regex = "1"
 secp256k1 = "0.27"
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_json = "1.0"

diff --git a/engine/src/eth/mod.rs b/engine/src/eth/mod.rs
@@ -1,5 +1,4 @@
 pub mod event;
-pub mod redact_endpoint_secret;
 pub mod retry_rpc;
 pub mod rpc;
 

diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml
@@ -37,6 +37,8 @@ scopeguard = { version = "1.2.0" }
 jsonrpsee = { version = "0.20", features = [
   "jsonrpsee-types",
 ], optional = true }
+regex = { version = "1", optional = true }
+url = { version = "2.4", optional = true }
 
 [dev-dependencies]
 tempfile = "3.7.0"
@@ -63,4 +65,6 @@ std = [
   'dep:sp-rpc',
   'dep:num-traits',
   'dep:jsonrpsee',
+  'dep:regex',
+  'dep:url',
 ]
diff --git a/utilities/src/with_std.rs b/utilities/src/with_std.rs
@@ -15,6 +15,7 @@ pub mod spmc;
 pub mod task_scope;
 pub mod unending_stream;
 pub use unending_stream::UnendingStream;
+pub mod redact_endpoint_secret;
 
 pub mod serde_helpers;
 

diff --git a/engine/src/eth/redact_endpoint_secret.rs → ...es/src/with_std/redact_endpoint_secret.rs b/engine/src/eth/redact_endpoint_secret.rs → ...es/src/with_std/redact_endpoint_secret.rs
@@ -1,5 +1,6 @@
 use anyhow::Context;
 use regex::Regex;
+use url::Url;
 
 const MAX_SECRET_CHARACTERS_REVEALED: usize = 3;
 const SCHEMA_PADDING_LEN: usize = 3;
@@ -25,7 +26,7 @@ pub fn redact_secret_eth_node_endpoint(endpoint: &str) -> Result<String, anyhow:
 		Ok(endpoint_redacted)
 	} else {
 		// No secret was found, so just redact almost all of the url
-		let url = url::Url::parse(endpoint).context("Failed to parse node endpoint into a URL")?;
+		let url = Url::parse(endpoint).context("Failed to parse node endpoint into a URL")?;
 		Ok(format!(
 			"{}****",
 			endpoint