refactor: include source string in hex error

nervosnetwork · Jul 3, 2024 · 5421614 · 5421614
1 parent 3e72e08
commit 5421614
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/cch/actor.rs b/src/cch/actor.rs
@@ -300,7 +300,9 @@ impl CchActor {
                     .wrapped_btc_type_script_args
                     .trim_start_matches("0x"),
             )
-            .map_err(|_| CchError::HexDecodingError)?
+            .map_err(|_| {
+                CchError::HexDecodingError(self.config.wrapped_btc_type_script_args.clone())
+            })?
             .as_ref(),
         )
         .into();
@@ -488,7 +490,7 @@ impl CchActor {
     ) -> Result<ReceiveBTCOrder, CchError> {
         let duration_since_epoch = SystemTime::now().duration_since(UNIX_EPOCH)?;
         let hash_bin = hex::decode(&receive_btc.payment_hash.trim_start_matches("0x"))
-            .map_err(|_| CchError::HexDecodingError)?;
+            .map_err(|_| CchError::HexDecodingError(receive_btc.payment_hash.clone()))?;
 
         let amount_sats = receive_btc.amount_sats as u128;
         let fee_sats = amount_sats * (self.config.fee_rate_per_million_sats as u128)
@@ -524,7 +526,9 @@ impl CchActor {
                     .wrapped_btc_type_script_args
                     .trim_start_matches("0x"),
             )
-            .map_err(|_| CchError::HexDecodingError)?
+            .map_err(|_| {
+                CchError::HexDecodingError(self.config.wrapped_btc_type_script_args.clone())
+            })?
             .as_ref(),
         )
         .into();

diff --git a/src/cch/error.rs b/src/cch/error.rs
@@ -42,8 +42,8 @@ pub enum CchError {
     SystemTimeError(#[from] SystemTimeError),
     #[error("JSON serialization error: {0}")]
     JSONSerializationError(#[from] serde_json::Error),
-    #[error("Hex decoding error")]
-    HexDecodingError,
+    #[error("Hex decoding error from string: {0}")]
+    HexDecodingError(String),
     #[error("Lnd channel error: {0}")]
     LndChannelError(#[from] lnd_grpc_tonic_client::channel::Error),
     #[error("Lnd RPC error: {0}")]

diff --git a/src/cch/order.rs b/src/cch/order.rs
@@ -91,7 +91,8 @@ impl SendBTCOrder {
         let invoice_builder = InvoiceBuilder::new(self.currency)
             .amount(Some(self.amount_sats))
             .payment_hash(
-                Hash256::from_str(&self.payment_hash).map_err(|_| CchError::HexDecodingError)?,
+                Hash256::from_str(&self.payment_hash)
+                    .map_err(|_| CchError::HexDecodingError(self.payment_hash.clone()))?,
             )
             .expiry_time(Duration::from_secs(self.expires_after))
             .final_cltv(self.ckb_final_tlc_expiry)