delete everything that can't be used yet

This commit is contained in:
Francisco Gindre 2021-09-24 21:26:14 -03:00
parent e9ad07c90d
commit b3eb569553
3 changed files with 13 additions and 44 deletions

View File

@ -2,7 +2,7 @@
// mod zcash_address::{ZcashAddress};
uniffi_macros::include_scaffolding!("zcash_address");
use zcash_address::{ZcashAddress, ParseError, Network};
use zcash_address::{ZcashAddress, ParseError};
#[derive(Debug, thiserror::Error)]
pub enum AddressError {
@ -14,16 +14,8 @@ pub enum AddressError {
InvalidUnifiedAddress,
}
#[derive(Debug, Clone)]
pub enum NetworkType {
Main,
Test,
Regtest
}
#[derive(Debug)]
pub struct Address {
network: NetworkType,
string: String,
}
@ -66,20 +58,6 @@ trait ToAddressError {
fn to_address_error(&self) -> AddressError;
}
trait ToNetworkType {
fn to_network_type(&self) -> NetworkType;
}
impl ToNetworkType for Network {
fn to_network_type(&self) -> NetworkType {
match self {
Network::Main => NetworkType::Main,
Network::Test => NetworkType::Test,
Network::Regtest => NetworkType::Regtest,
}
}
}
impl ToAddressError for ParseError {
fn to_address_error(&self) -> AddressError {
match self {
@ -92,11 +70,8 @@ impl ToAddressError for ParseError {
impl ToAddress for ZcashAddress {
fn to_address(&self) -> Address {
let address = Address {
network: self.net.to_network_type(),
string: self.to_string()
}
};
return address
}

View File

@ -9,14 +9,7 @@ namespace zcash_address_util {
Address derive_unified_address([ByRef] sequence<u8> seed_bytes, i32 account, i32 index);
};
enum NetworkType {
"Test",
"Main",
"Regtest"
};
dictionary Address {
NetworkType network;
string string;
};

View File

@ -1,13 +1,14 @@
import zcash_address
// import zcash_address
extension zcash_address.Address: Equatable {}
// extension zcash_address.Address: Equatable {}
do {
let testSaplingAddress = "ztestsapling1ysrf4uq52n5hhj0vzxpcfneszlk8flalh3ajdwsyucnpc0fjktp9afzcclnxdrnzfl7w7wyx3kz"
let parsedAddress = try zcash_address.parse(testSaplingAddress)
// assert(parsedAddress.network == .test)
assert(true)
} catch {
fatalError("Invalid Address when it should have been valid")
}
// do {
// let testSaplingAddress = "ztestsapling1ysrf4uq52n5hhj0vzxpcfneszlk8flalh3ajdwsyucnpc0fjktp9afzcclnxdrnzfl7w7wyx3kz"
// // let parsedAddress = try zcash_address.parse(testSaplingAddress)
// // assert(parsedAddress.network == .test)
// assert(true)
// } catch {
// fatalError("Invalid Address when it should have been valid")
// }
assert(true)