Merge pull request #4 from zianksm/refactor-move-errors

move errors tu one single source of truth

dhatu/src/error/mod.rs

@@ -1,10 +1,3 @@
-use crate::{
-    registrar::{key_manager::prelude::KeypairGenerationError, signer::TxBuilderError},
-    tx::extrinsics::prelude::{
-        calldata::ToPayloadError, reserve::FundsReserveError, CallbackExecutorError,
-    },
-    types::MandalaClientErorr,
-};
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
@@ -32,3 +25,51 @@ pub enum Error {
     #[error("error when signing transaction : {0}")]
     SignTransactionError(#[from] TxBuilderError),
 }
+
+#[derive(thiserror::Error, Debug)]
+pub enum KeypairGenerationError {
+    #[error("{0}")]
+    PublicAddress(String),
+
+    #[error("fail to generate mnemonic phrase with {0}")]
+    MnemonicPhrase(String),
+
+    #[error("{0}")]
+    PrivateKey(String),
+
+    #[error("{0}")]
+    Recover(String),
+}
+
+#[derive(thiserror::Error, Debug)]
+pub enum MandalaClientErorr {
+    #[error("connection Error : {0}")]
+    Connection(#[from] subxt::Error),
+}
+
+#[derive(thiserror::Error, Debug)]
+pub enum FundsReserveError {
+    #[error("{0}")]
+    RpcError(#[from] subxt::error::Error),
+
+    #[error("account does not exist!")]
+    NonExistentAccount,
+}
+
+#[derive(thiserror::Error, Debug)]
+pub enum CallbackExecutorError {
+    #[error("{0}")]
+    InvalidUrl(String),
+}
+
+#[derive(thiserror::Error, Debug)]
+pub enum ToPayloadError {
+    #[error("{0}")]
+    AddressError(String),
+}
+
+#[derive(thiserror::Error, Debug)]
+pub enum TxBuilderError {
+    #[error("{0}")]
+    SignErorr(#[from] subxt::Error),
+}

dhatu/src/registrar/key_manager/keypair.rs

@@ -1,4 +1,4 @@
-use crate::error::Error;
+use crate::error::{Error, KeypairGenerationError};
 use futures::FutureExt;
 use sp_core::{crypto::Ss58Codec, sr25519::Pair, Pair as PairTraits};
 use std::str::FromStr;
@@ -47,20 +47,6 @@ impl Keypair {
         &self.keypair
     }
 }
-#[derive(thiserror::Error, Debug)]
-pub enum KeypairGenerationError {
-    #[error("{0}")]
-    PublicAddress(String),
-
-    #[error("fail to generate mnemonic phrase with {0}")]
-    MnemonicPhrase(String),
-
-    #[error("{0}")]
-    PrivateKey(String),
-
-    #[error("{0}")]
-    Recover(String),
-}
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct PublicAddress(pub(crate) String);

dhatu/src/registrar/key_manager/mod.rs

@@ -13,7 +13,7 @@ pub mod prelude {
 
 use prelude::*;
 
-use crate::{error::Error, };
+use crate::{error::{Error, KeypairGenerationError}, };
 
 /// represent a keypair manager.
 pub struct KeyManager;

dhatu/src/registrar/signer/mod.rs

@@ -16,12 +16,6 @@ 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>(

dhatu/src/tx/extrinsics/callback_executor/mod.rs

@@ -4,18 +4,13 @@ use serde::Serialize;
 
 
 use super::prelude::enums::{ExtrinsicStatus, Hash};
-use crate::error::Error;
+use crate::error::{Error, CallbackExecutorError};
 
 #[cfg(feature = "tokio")]
 pub struct Executor {
     http_connection_pool: reqwest::Client,
 }
 
-#[derive(thiserror::Error, Debug)]
-pub enum CallbackExecutorError {
-    #[error("{0}")]
-    InvalidUrl(String),
-}
 
 pub struct Url(pub(crate) reqwest::Url);
 

dhatu/src/tx/extrinsics/funds_reserve/reserve.rs

@@ -1,7 +1,7 @@
 
 
 
-use crate::error::Error;
+use crate::error::{Error, FundsReserveError};
 use crate::registrar::key_manager::prelude::PublicAddress;
 use crate::registrar::signer::WrappedExtrinsic;
 use crate::tx::extrinsics::prelude::{
@@ -16,14 +16,6 @@ use subxt::{tx::PairSigner};
 
 use crate::{registrar::key_manager::prelude::PrivateKey};
 
-#[derive(thiserror::Error, Debug)]
-pub enum FundsReserveError {
-    #[error("{0}")]
-    RpcError(#[from] subxt::error::Error),
-
-    #[error("account does not exist!")]
-    NonExistentAccount,
-}
 
 #[derive(Clone)]
 pub struct FundsReserve {

dhatu/src/tx/extrinsics/transaction_constructor/calldata.rs

@@ -3,6 +3,8 @@ use subxt::utils::{AccountId32, MultiAddress};
 
 
 
+use crate::error::ToPayloadError;
+
 use super::{
     traits::{ScaleEncodeable, ToContractPayload, ValidateHash},
     transfer_nft_contract::{
@@ -40,11 +42,6 @@ impl From<NftTransferAgrs> for CallData<TransferNFT> {
     }
 }
 
-#[derive(thiserror::Error, Debug)]
-pub enum ToPayloadError {
-    #[error("{0}")]
-    AddressError(String),
-}
 
 impl<T> ToContractPayload for CallData<T> {
     fn to_payload(

dhatu/src/tx/extrinsics/transaction_constructor/transfer_nft_contract/constructor.rs

@@ -4,12 +4,12 @@ use parity_scale_codec::Encode;
 use subxt::utils::AccountId32;
 
 use crate::{tx::extrinsics::{
-    prelude::calldata::{CallData, ToPayloadError},
+    prelude::calldata::{CallData, },
     transaction_constructor::{
         calldata::ContractCall,
         traits::{ScaleEncodeable, ToContractPayload, },
     },
-}, registrar::signer::WrappedExtrinsic};
+}, registrar::signer::WrappedExtrinsic, error::ToPayloadError};
 
 pub(crate) struct NftTransferAgrs {
     function_selector: String,

dhatu/src/types.rs

@@ -4,6 +4,8 @@ use subxt::{
 };
 use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender};
 
+use crate::error::MandalaClientErorr;
+
 pub(crate) type MandalaConfig = SubstrateConfig;
 pub(crate) type NodeClient = OnlineClient<MandalaConfig>;
 pub(crate) type Extrinsic = SubmittableExtrinsic<MandalaConfig, NodeClient>;
@@ -91,11 +93,6 @@ impl From<TransactionProgress> for MandalaTransactionProgress {
 #[derive(Clone)]
 pub struct MandalaClient(pub(crate) OnlineClient<MandalaConfig>);
 
-#[derive(thiserror::Error, Debug)]
-pub enum MandalaClientErorr {
-    #[error("connection Error : {0}")]
-    Connection(#[from] subxt::Error),
-}
 
 impl MandalaClient {
     pub(crate) fn inner(&self) -> &OnlineClient<MandalaConfig> {