Merge pull request #16 from DenioD/dev

change address Prefix
This commit is contained in:
Denio
2019-10-23 21:00:03 +02:00
committed by GitHub

View File

@@ -709,7 +709,7 @@ impl LightClient {
let new_address = match addr_type { let new_address = match addr_type {
"z" => wallet.add_zaddr(), "z" => wallet.add_zaddr(),
"t" => wallet.add_taddr(), "R" => wallet.add_taddr(),
_ => { _ => {
let e = format!("Unrecognized address type: {}", addr_type); let e = format!("Unrecognized address type: {}", addr_type);
error!("{}", e); error!("{}", e);
@@ -980,14 +980,14 @@ pub mod tests {
assert!(!lc.do_export(None).is_err()); assert!(!lc.do_export(None).is_err());
assert!(!lc.do_new_address("z").is_err()); assert!(!lc.do_new_address("z").is_err());
assert!(!lc.do_new_address("t").is_err()); assert!(!lc.do_new_address("R").is_err());
assert_eq!(lc.do_seed_phrase().unwrap()["seed"], TEST_SEED.to_string()); assert_eq!(lc.do_seed_phrase().unwrap()["seed"], TEST_SEED.to_string());
// Encrypt and Lock the wallet // Encrypt and Lock the wallet
lc.wallet.write().unwrap().encrypt("password".to_string()).unwrap(); lc.wallet.write().unwrap().encrypt("password".to_string()).unwrap();
assert!(lc.do_export(None).is_err()); assert!(lc.do_export(None).is_err());
assert!(lc.do_seed_phrase().is_err()); assert!(lc.do_seed_phrase().is_err());
assert!(lc.do_new_address("t").is_err()); assert!(lc.do_new_address("R").is_err());
assert!(lc.do_new_address("z").is_err()); assert!(lc.do_new_address("z").is_err());
assert!(lc.do_send(vec![("z", 0, None)]).is_err()); assert!(lc.do_send(vec![("z", 0, None)]).is_err());
@@ -995,7 +995,7 @@ pub mod tests {
lc.wallet.write().unwrap().unlock("password".to_string()).unwrap(); lc.wallet.write().unwrap().unlock("password".to_string()).unwrap();
assert!(!lc.do_export(None).is_err()); assert!(!lc.do_export(None).is_err());
assert!(!lc.do_seed_phrase().is_err()); assert!(!lc.do_seed_phrase().is_err());
assert!(!lc.do_new_address("t").is_err()); assert!(!lc.do_new_address("R").is_err());
assert!(!lc.do_new_address("z").is_err()); assert!(!lc.do_new_address("z").is_err());
} }
@@ -1005,8 +1005,8 @@ pub mod tests {
// Add new z and t addresses // Add new z and t addresses
let taddr1 = lc.do_new_address("t").unwrap()[0].as_str().unwrap().to_string(); let taddr1 = lc.do_new_address("R").unwrap()[0].as_str().unwrap().to_string();
let taddr2 = lc.do_new_address("t").unwrap()[0].as_str().unwrap().to_string(); let taddr2 = lc.do_new_address("R").unwrap()[0].as_str().unwrap().to_string();
let zaddr1 = lc.do_new_address("z").unwrap()[0].as_str().unwrap().to_string(); let zaddr1 = lc.do_new_address("z").unwrap()[0].as_str().unwrap().to_string();
let zaddr2 = lc.do_new_address("z").unwrap()[0].as_str().unwrap().to_string(); let zaddr2 = lc.do_new_address("z").unwrap()[0].as_str().unwrap().to_string();