Merge pull request #3 from zianksm/refactor-error-signer

added error propagating at tx builder
MandalaChain · Jun 13, 2023 · a454a7e · a454a7e
2 parents 88388bc + c3f1dbe
commit a454a7e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/dhatu/src/error/mod.rs b/dhatu/src/error/mod.rs
@@ -1,6 +1,8 @@
 use crate::{
-    registrar::key_manager::prelude::KeypairGenerationError,
-    tx::extrinsics::prelude::{reserve::FundsReserveError, CallbackExecutorError, calldata::ToPayloadError},
+    registrar::{key_manager::prelude::KeypairGenerationError, signer::TxBuilderError},
+    tx::extrinsics::prelude::{
+        calldata::ToPayloadError, reserve::FundsReserveError, CallbackExecutorError,
+    },
     types::MandalaClientErorr,
 };
 
@@ -26,4 +28,7 @@ pub enum Error {
 
     #[error("error when converting to payload : {0}")]
     PayloadError(#[from] ToPayloadError),
+
+    #[error("error when signing transaction : {0}")]
+    SignTransactionError(#[from] TxBuilderError),
 }
diff --git a/dhatu/src/registrar/signer/mod.rs b/dhatu/src/registrar/signer/mod.rs
@@ -16,12 +16,18 @@ pub(crate) trait WrappedExtrinsic<T: EncodeAsFields> {
 
 pub(crate) struct TxBuilder;
 
+#[derive(thiserror::Error,Debug)]
+pub enum TxBuilderError{
+    #[error("{0}")]
+    SignErorr(#[from] subxt::Error),
+}
+
 impl TxBuilder {
     /// create a new unsigned transaction from a transaction payload
     pub fn unsigned<T: EncodeAsFields>(
         client: &crate::types::NodeClient,
         payload: impl WrappedExtrinsic<T>,
-    ) -> Result<Extrinsic, Box<dyn std::error::Error>> {
+    ) -> Result<Extrinsic, crate::error::Error> {
         Ok(client.tx().create_unsigned(&payload.into_inner())?)
     }
 
@@ -30,7 +36,7 @@ impl TxBuilder {
         client: &crate::types::NodeClient,
         acc: Pair,
         payload: impl WrappedExtrinsic<T>,
-    ) -> Result<Extrinsic, Box<dyn std::error::Error>> {
+    ) -> Result<Extrinsic, crate::error::Error> {
         let signer = PairSigner::new(acc);
 
         let tx = client