refactor: use single constant

r0gue-io · Dec 9, 2024 · 02bbad1 · 02bbad1
1 parent ab4f1f8
commit 02bbad1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/crates/pop-parachains/src/call/metadata/action.rs b/crates/pop-parachains/src/call/metadata/action.rs
@@ -119,11 +119,10 @@ pub fn supported_actions(pallets: &[Pallet]) -> Vec<Action> {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use crate::{parse_chain_metadata, set_up_client};
+	use crate::{call::tests::POP_NETWORK_TESTNET_URL, parse_chain_metadata, set_up_client};
 	use anyhow::Result;
 	use std::collections::HashMap;
 
-	const POP_NETWORK_TESTNET_URL: &str = "wss://rpc1.paseo.popnetwork.xyz";
 	const POLKADOT_NETWORK_URL: &str = "wss://polkadot-rpc.publicnode.com";
 
 	#[test]

diff --git a/crates/pop-parachains/src/call/metadata/mod.rs b/crates/pop-parachains/src/call/metadata/mod.rs
@@ -192,12 +192,10 @@ pub fn parse_extrinsic_arguments(
 mod tests {
 	use super::*;
 
-	use crate::set_up_client;
+	use crate::{call::tests::POP_NETWORK_TESTNET_URL, set_up_client};
 	use anyhow::Result;
 	use subxt::ext::scale_bits;
 
-	const POP_NETWORK_TESTNET_URL: &str = "wss://rpc1.paseo.popnetwork.xyz";
-
 	#[tokio::test]
 	async fn parse_chain_metadata_works() -> Result<()> {
 		let client = set_up_client(POP_NETWORK_TESTNET_URL).await?;

diff --git a/crates/pop-parachains/src/call/metadata/params.rs b/crates/pop-parachains/src/call/metadata/params.rs
@@ -154,11 +154,9 @@ fn type_to_param(name: String, registry: &PortableRegistry, type_id: u32) -> Res
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use crate::set_up_client;
+	use crate::{call::tests::POP_NETWORK_TESTNET_URL, set_up_client};
 	use anyhow::Result;
 
-	const POP_NETWORK_TESTNET_URL: &str = "wss://rpc1.paseo.popnetwork.xyz";
-
 	#[tokio::test]
 	async fn field_to_param_works() -> Result<()> {
 		let client = set_up_client(POP_NETWORK_TESTNET_URL).await?;

diff --git a/crates/pop-parachains/src/call/mod.rs b/crates/pop-parachains/src/call/mod.rs
@@ -137,7 +137,7 @@ mod tests {
 	use anyhow::Result;
 
 	const ALICE_SURI: &str = "//Alice";
-	const POP_NETWORK_TESTNET_URL: &str = "wss://rpc1.paseo.popnetwork.xyz";
+	pub(crate) const POP_NETWORK_TESTNET_URL: &str = "wss://rpc1.paseo.popnetwork.xyz";
 
 	#[tokio::test]
 	async fn set_up_client_works() -> Result<()> {
@@ -196,7 +196,7 @@ mod tests {
 	#[tokio::test]
 	async fn decode_call_data_works() -> Result<()> {
 		assert!(matches!(decode_call_data("wrongcalldata"), Err(Error::CallDataDecodingError(..))));
-		let client = set_up_client("wss://rpc1.paseo.popnetwork.xyz").await?;
+		let client = set_up_client(POP_NETWORK_TESTNET_URL).await?;
 		let pallets = parse_chain_metadata(&client)?;
 		let remark = find_extrinsic_by_name(&pallets, "System", "remark")?;
 		let extrinsic = construct_extrinsic("System", &remark, vec!["0x11".to_string()])?;
@@ -225,7 +225,7 @@ mod tests {
 
 	#[tokio::test]
 	async fn construct_sudo_extrinsic_works() -> Result<()> {
-		let client = set_up_client("wss://rpc1.paseo.popnetwork.xyz").await?;
+		let client = set_up_client(POP_NETWORK_TESTNET_URL).await?;
 		let pallets = parse_chain_metadata(&client)?;
 		let force_transfer = find_extrinsic_by_name(&pallets, "Balances", "force_transfer")?;
 		let extrinsic = construct_extrinsic(