chore: using url return type (#297)

near · Sep 9, 2023 · 9ada574 · 9ada574
1 parent a885809
commit 9ada574
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/workspaces/src/network/betanet.rs b/workspaces/src/network/betanet.rs
@@ -1,3 +1,5 @@
+use url::Url;
+
 use crate::network::builder::{FromNetworkBuilder, NetworkBuilder};
 use crate::network::{Info, NetworkClient, NetworkInfo};
 use crate::rpc::client::Client;
@@ -36,7 +38,7 @@ impl FromNetworkBuilder for Betanet {
                 name: build.name.into(),
                 root_id: "near".parse().unwrap(),
                 keystore_path: PathBuf::from(".near-credentials/betanet/"),
-                rpc_url,
+                rpc_url: Url::parse(&rpc_url).expect("url is hardcoded"),
             },
         })
     }

diff --git a/workspaces/src/network/info.rs b/workspaces/src/network/info.rs
@@ -10,7 +10,6 @@ pub struct Info {
     /// Path to the keystore directory
     pub keystore_path: PathBuf,
 
-    // TODO: change return type to Url instead of String
     /// Rpc endpoint to point our client to
-    pub rpc_url: String,
+    pub rpc_url: url::Url,
 }
diff --git a/workspaces/src/network/mainnet.rs b/workspaces/src/network/mainnet.rs
@@ -39,7 +39,7 @@ impl FromNetworkBuilder for Mainnet {
                 name: build.name.into(),
                 root_id: "near".parse().unwrap(),
                 keystore_path: PathBuf::from(".near-credentials/mainnet/"),
-                rpc_url,
+                rpc_url: url::Url::parse(&rpc_url).expect("url is hardcodeed"),
             },
         })
     }

diff --git a/workspaces/src/network/sandbox.rs b/workspaces/src/network/sandbox.rs
@@ -98,7 +98,7 @@ impl FromNetworkBuilder for Sandbox {
             name: build.name.into(),
             root_id: AccountId::from_str("test.near").unwrap(),
             keystore_path: PathBuf::from(".near-credentials/sandbox/"),
-            rpc_url: server.rpc_addr(),
+            rpc_url: url::Url::parse(&server.rpc_addr()).expect("url is hardcoded"),
         };
 
         Ok(Self {

diff --git a/workspaces/src/network/testnet.rs b/workspaces/src/network/testnet.rs
@@ -48,7 +48,7 @@ impl FromNetworkBuilder for Testnet {
                 name: build.name.into(),
                 root_id: AccountId::from_str("testnet").unwrap(),
                 keystore_path: PathBuf::from(".near-credentials/testnet/"),
-                rpc_url,
+                rpc_url: Url::parse(&rpc_url).expect("url is hardcoded"),
             },
         })
     }