HTTPNodeClient can with no urls

mwcproject · Sep 20, 2024 · 77a36d0 · 77a36d0
1 parent cd110b3
commit 77a36d0
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 27 deletions.
diff --git a/impls/src/node_clients/http.rs b/impls/src/node_clients/http.rs
@@ -138,7 +138,7 @@ impl HTTPNodeClient {
 		params: &serde_json::Value,
 		counter: i32,
 	) -> Result<D, libwallet::Error> {
-		let url = format!("{}{}", self.node_url(), ENDPOINT);
+		let url = format!("{}{}", self.node_url()?, ENDPOINT);
 		let req = build_request(method, params);
 		let res = self
 			.client
@@ -181,7 +181,7 @@ impl HTTPNodeClient {
 		counter: i32,
 	) -> Result<Vec<crate::grin_p2p::types::PeerInfoDisplayLegacy>, libwallet::Error> {
 		// There is no v2 API with connected peers. Keep using v1 for that
-		let addr = self.node_url();
+		let addr = self.node_url()?;
 		let url = format!("{}/v1/peers/connected", addr);
 
 		let res = self
@@ -217,7 +217,7 @@ impl HTTPNodeClient {
 		let method = "get_kernel";
 		let params = json!([excess.0.as_ref().to_hex(), min_height, max_height]);
 		// have to handle this manually since the error needs to be parsed
-		let url = format!("{}{}", self.node_url(), ENDPOINT);
+		let url = format!("{}{}", self.node_url()?, ENDPOINT);
 		let req = build_request(method, &params);
 		let res = self
 			.client
@@ -291,7 +291,7 @@ impl HTTPNodeClient {
 
 		trace!("Output query chunk size is: {}", chunk_size);
 
-		let url = format!("{}{}", self.node_url(), ENDPOINT);
+		let url = format!("{}{}", self.node_url()?, ENDPOINT);
 		let api_secret = self.node_api_secret();
 		let cl = self.client.clone();
 		let task = async move {
@@ -372,14 +372,20 @@ impl HTTPNodeClient {
 
 impl NodeClient for HTTPNodeClient {
 	fn increase_index(&self) {
-		let index =
-			(self.current_node_index.load(Ordering::Relaxed) + 1) % self.node_url_list.len();
-		self.current_node_index.store(index, Ordering::Relaxed);
+		if !self.node_url_list.is_empty() {
+			let index =
+				(self.current_node_index.load(Ordering::Relaxed) + 1) % self.node_url_list.len();
+			self.current_node_index.store(index, Ordering::Relaxed);
+		}
 	}
-	fn node_url(&self) -> &str {
+	fn node_url(&self) -> Result<String, libwallet::Error> {
+		if self.node_url_list.is_empty() {
+			return Err(libwallet::Error::NodeUrlIsEmpty);
+		}
 		let index = self.current_node_index.load(Ordering::Relaxed) % self.node_url_list.len();
-		&self.node_url_list.get(index).unwrap()
+		Ok(self.node_url_list[index].clone())
 	}
+
 	fn node_api_secret(&self) -> &Option<String> {
 		&self.node_api_secret
 	}
@@ -392,14 +398,12 @@ impl NodeClient for HTTPNodeClient {
 		self.node_api_secret = node_api_secret;
 	}
 	fn set_node_index(&mut self, node_index: u8) {
-		self.current_node_index.store(
-			node_index as usize % self.node_url_list.len(),
-			Ordering::Relaxed,
-		);
+		self.current_node_index
+			.store(node_index as usize, Ordering::Relaxed);
 	}
 	fn get_node_index(&self) -> u8 {
 		let index = self.current_node_index.load(Ordering::Relaxed);
-		(index % self.node_url_list.len()) as u8
+		index as u8
 	}
 
 	fn reset_cache(&self) {
@@ -432,7 +436,7 @@ impl NodeClient for HTTPNodeClient {
 					});
 				} else {
 					error!(
-						"Unable to contact Node to get version info: {}, {}",
+						"Unable to contact Node to get version info: {:?}, {}",
 						self.node_url(), e
 					);
 					return None;
@@ -652,7 +656,7 @@ impl NodeClient for HTTPNodeClient {
 					}
 					Err(e) => {
 						let report = format!(
-							"get_blocks_by_height: error calling api 'get_block' at {}. Error: {}",
+							"get_blocks_by_height: error calling api 'get_block' at {:?}. Error: {}",
 							self.node_url(),
 							e
 						);

diff --git a/impls/src/test_framework/testclient.rs b/impls/src/test_framework/testclient.rs
@@ -474,8 +474,8 @@ impl LocalWalletClient {
 
 impl NodeClient for LocalWalletClient {
 	fn increase_index(&self) {}
-	fn node_url(&self) -> &str {
-		"node"
+	fn node_url(&self) -> Result<String, libwallet::Error> {
+		Err(libwallet::Error::NodeUrlIsEmpty)
 	}
 	fn node_api_secret(&self) -> &Option<String> {
 		&None
@@ -495,7 +495,7 @@ impl NodeClient for LocalWalletClient {
 	fn post_tx(&self, tx: &Transaction, _fluff: bool) -> Result<(), libwallet::Error> {
 		let m = WalletProxyMessage {
 			sender_id: self.id.clone(),
-			dest: self.node_url().to_owned(),
+			dest: self.node_url()?,
 			method: "post_tx".to_owned(),
 			body: serde_json::to_string(tx).unwrap(),
 		};
@@ -514,7 +514,7 @@ impl NodeClient for LocalWalletClient {
 	fn get_chain_tip(&self) -> Result<(u64, String, u64), libwallet::Error> {
 		let m = WalletProxyMessage {
 			sender_id: self.id.clone(),
-			dest: self.node_url().to_owned(),
+			dest: self.node_url()?,
 			method: "get_chain_tip".to_owned(),
 			body: "".to_owned(),
 		};
@@ -538,7 +538,7 @@ impl NodeClient for LocalWalletClient {
 	fn get_header_info(&self, height: u64) -> Result<HeaderInfo, libwallet::Error> {
 		let m = WalletProxyMessage {
 			sender_id: self.id.clone(),
-			dest: self.node_url().to_owned(),
+			dest: self.node_url()?,
 			method: "get_header_info".to_owned(),
 			body: format!("{}", height),
 		};
@@ -595,7 +595,7 @@ impl NodeClient for LocalWalletClient {
 		let query_str = query_params.join(",");
 		let m = WalletProxyMessage {
 			sender_id: self.id.clone(),
-			dest: self.node_url().to_owned(),
+			dest: self.node_url()?,
 			method: "get_outputs_from_node".to_owned(),
 			body: query_str,
 		};
@@ -638,7 +638,7 @@ impl NodeClient for LocalWalletClient {
 
 		let m = WalletProxyMessage {
 			sender_id: self.id.clone(),
-			dest: self.node_url().to_owned(),
+			dest: self.node_url()?,
 			method: "get_kernel".to_owned(),
 			body: query,
 		};
@@ -683,7 +683,7 @@ impl NodeClient for LocalWalletClient {
 		};
 		let m = WalletProxyMessage {
 			sender_id: self.id.clone(),
-			dest: self.node_url().to_owned(),
+			dest: self.node_url()?,
 			method: "get_outputs_by_pmmr_index".to_owned(),
 			body: query_str,
 		};
@@ -733,7 +733,7 @@ impl NodeClient for LocalWalletClient {
 		};
 		let m = WalletProxyMessage {
 			sender_id: self.id.clone(),
-			dest: self.node_url().to_owned(),
+			dest: self.node_url()?,
 			method: "height_range_to_pmmr_indices".to_owned(),
 			body: query_str,
 		};
@@ -761,7 +761,7 @@ impl NodeClient for LocalWalletClient {
 	) -> Result<Vec<api::BlockPrintable>, libwallet::Error> {
 		let m = WalletProxyMessage {
 			sender_id: self.id.clone(),
-			dest: self.node_url().to_owned(),
+			dest: self.node_url()?,
 			method: "get_blocks_by_height".to_owned(),
 			body: format!("{},{}", start_height, end_height),
 		};

diff --git a/libwallet/src/error.rs b/libwallet/src/error.rs
@@ -101,6 +101,10 @@ pub enum Error {
 	#[error("Node not ready or not available")]
 	NodeNotReady,
 
+	/// Node api url is not set.
+	#[error("node_url is empty. Please update your config.")]
+	NodeUrlIsEmpty,
+
 	/// Error originating from hyper.
 	#[error("Hyper error, {0}")]
 	Hyper(String),

diff --git a/libwallet/src/types.rs b/libwallet/src/types.rs
@@ -385,7 +385,7 @@ pub trait NodeClient: Send + Sync + Clone {
 	fn increase_index(&self);
 
 	/// Return the URL of the check node
-	fn node_url(&self) -> &str;
+	fn node_url(&self) -> Result<String, Error>;
 
 	/// Set the node URL
 	fn set_node_url(&mut self, node_url: Vec<String>);