Преглед изворни кода

changed 'UnvalidAddress' error to 'InvalidAddress'

lunar-mining пре 4 година
родитељ
комит
8906f3ad2f
4 измењених фајлова са 10 додато и 10 уклоњено
  1. 1 1
      src/client/client.rs
  2. 6 6
      src/client/mod.rs
  3. 2 2
      src/rpc/adapter/client_adapter.rs
  4. 1 1
      todo.md

+ 1 - 1
src/client/client.rs

@@ -131,7 +131,7 @@ impl Client {
         amount: f64,
     ) -> Result<()> {
         if amount <= 0.0 {
-            return Err(ClientFailed::UnvalidAmount(amount as u64).into());
+            return Err(ClientFailed::InvalidAmount(amount as u64).into());
         }
 
         self.send(pub_key.clone(), amount.clone() as u64, asset_id, false)

+ 6 - 6
src/client/mod.rs

@@ -7,8 +7,8 @@ use std::fmt;
 #[derive(Debug)]
 pub enum ClientFailed {
     NotEnoughValue(u64),
-    UnvalidAddress(String),
-    UnvalidAmount(u64),
+    InvalidAddress(String),
+    InvalidAmount(u64),
     UnableToGetDepositAddress,
     UnableToGetWithdrawAddress,
     DoNotHaveCashierPublicKey,
@@ -26,11 +26,11 @@ impl fmt::Display for ClientFailed {
             ClientFailed::NotEnoughValue(i) => {
                 write!(f, "There is no enough value {}", i)
             }
-            ClientFailed::UnvalidAddress(i) => {
-                write!(f, "Unvalid Address {}", i)
+            ClientFailed::InvalidAddress(i) => {
+                write!(f, "Invalid Address {}", i)
             }
-            ClientFailed::UnvalidAmount(i) => {
-                write!(f, "Unvalid Amount {}", i)
+            ClientFailed::InvalidAmount(i) => {
+                write!(f, "Invalid Amount {}", i)
             }
             ClientFailed::UnableToGetDepositAddress => f.write_str("Unable to get deposit address"),
             ClientFailed::UnableToGetWithdrawAddress => {

+ 2 - 2
src/rpc/adapter/client_adapter.rs

@@ -93,10 +93,10 @@ impl RpcClientAdapter {
         let pub_key: String = deserialize(&address)?;
         let address = bs58::decode(pub_key.clone())
             .into_vec()
-            .map_err(|_| ClientFailed::UnvalidAddress(pub_key.clone()))?;
+            .map_err(|_| ClientFailed::InvalidAddress(pub_key.clone()))?;
 
         let address: jubjub::SubgroupPoint =
-            deserialize(&address).map_err(|_| ClientFailed::UnvalidAddress(pub_key))?;
+            deserialize(&address).map_err(|_| ClientFailed::InvalidAddress(pub_key))?;
 
         let asset_id: jubjub::Fr = deserialize(&asset_id)?;
 

+ 1 - 1
todo.md

@@ -10,7 +10,7 @@
 - [X] delete zkvm
 - [X] SOL bridge poc
 - [ ] Optional Cargo "features" for cashierd/darkfid, to {en,dis}able different chains
-- [ ] delete ALL old directories and files
+- [X] delete ALL old directories and files
 - [ ] fix spelling mistakes
 - [ ] make cashier asset vector