merge

chainwayxyz · Jan 9, 2025 · 02417e4 · 02417e4
2 parents 44d50fa + 32a0ac6
commit 02417e4
Show file tree

Hide file tree

Showing 6 changed files with 368 additions and 250 deletions.
diff --git a/core/src/builder/sighash.rs b/core/src/builder/sighash.rs
@@ -286,7 +286,7 @@ pub fn create_nofn_sighash_stream(
     }
 }
 
-pub fn create_timout_tx_sighash_stream(
+pub fn create_timeout_tx_sighash_stream(
     operator_xonly_pk: secp256k1::XOnlyPublicKey,
     collateral_funding_txid: bitcoin::Txid,
     collateral_funding_amount: Amount,

diff --git a/core/src/errors.rs b/core/src/errors.rs
@@ -88,12 +88,18 @@ pub enum BridgeError {
     /// Merkle Proof Error
     #[error("MerkleProofError")]
     MerkleProofError,
-    /// JSON RPC call failed
+
     #[error("JsonRpcError: {0}")]
     JsonRpcError(#[from] jsonrpsee::core::client::Error),
-    /// RPC interface requires a parameter
     #[error("RPC function field {0} is required!")]
-    RPCRequiredFieldError(&'static str),
+    RPCRequiredParam(&'static str),
+    #[error("RPC function parameter {0} is malformed: {1}")]
+    RPCParamMalformed(&'static str, String),
+    #[error("RPC stream ended unexpectedly: {0}")]
+    RPCStreamEndedUnexpectedly(String),
+    #[error("Invalid response from an RPC endpoint: {0}")]
+    RPCInvalidResponse(String),
+
     /// ConfigError is returned when the configuration is invalid
     #[error("ConfigError: {0}")]
     ConfigError(String),