mirror of
https://github.com/darkrenaissance/darkfi.git
synced 2026-01-10 07:08:05 -05:00
changed 'UnvalidAddress' error to 'InvalidAddress'
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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 => {
|
||||
|
||||
@@ -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)?;
|
||||
|
||||
|
||||
2
todo.md
2
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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user