zec
/
librustzcash
mirror of https://github.com/zcash/librustzcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

zcash_address: Minor cleanups 

Co-authored-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
str4d 2021-06-06 23:58:52 +01:00 committed by GitHub
parent f36034cfac
commit 1590565f04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/zcash_address/src/encoding.rs
View File

@ -32,7 +32,7 @@ impl FromStr for ZcashAddress {
// Remove leading and trailing whitespace, to handle copy-paste errors. // Remove leading and trailing whitespace, to handle copy-paste errors.
let s = s.trim(); let s = s.trim();
// Most Zcash addresses use Bech32, so try that first. // Most Zcash addresses use Bech32 or Bech32m, so try those first.
match bech32::decode(s) { match bech32::decode(s) {
Ok((hrp, data, Variant::Bech32m)) => { Ok((hrp, data, Variant::Bech32m)) => {
// If we reached this point, the encoding is supposed to be valid Bech32m. // If we reached this point, the encoding is supposed to be valid Bech32m.
@ -114,10 +114,10 @@ fn encode_bech32(hrp: &str, data: &[u8]) -> String {
} }
fn encode_b58(prefix: [u8; 2], data: &[u8]) -> String { fn encode_b58(prefix: [u8; 2], data: &[u8]) -> String {
let mut decoded = Vec::with_capacity(2 + data.len()); let mut bytes = Vec::with_capacity(2 + data.len());
decoded.extend_from_slice(&prefix); bytes.extend_from_slice(&prefix);
decoded.extend_from_slice(data); bytes.extend_from_slice(data);
bs58::encode(decoded).with_check().into_string() bs58::encode(bytes).with_check().into_string()
} }
impl fmt::Display for ZcashAddress { impl fmt::Display for ZcashAddress {
@ -218,9 +218,7 @@ mod tests {
"u1cd8yzk5mdn4n9r8c24tp8j8e9ethw3rr7ker5zhew3kycyyxggdzfkcq5f9yf2jv8m5ar8krncsntlfpx3p4azvwrkp8z74t3vu4kqq2", "u1cd8yzk5mdn4n9r8c24tp8j8e9ethw3rr7ker5zhew3kycyyxggdzfkcq5f9yf2jv8m5ar8krncsntlfpx3p4azvwrkp8z74t3vu4kqq2",
ZcashAddress { ZcashAddress {
net: Network::Main, net: Network::Main,
kind: AddressKind::Unified(unified::Address(vec![unified::Receiver::Sapling( kind: AddressKind::Unified(unified::Address(vec![unified::Receiver::Sapling([0; 43])])),
[0; 43],
)])),
}, },
); );
encoding( encoding(

2
components/zcash_address/src/kind/unified.rs
View File

@ -107,7 +107,7 @@ impl TryFrom<&[u8]> for Address {
[typecode, length, data @ ..] if data.len() >= *length as usize => { [typecode, length, data @ ..] if data.len() >= *length as usize => {
let (addr, rest) = data.split_at(*length as usize); let (addr, rest) = data.split_at(*length as usize);
*encoded = rest; *encoded = rest;
Some((*typecode, addr).try_into()) Some(Receiver::try_from((*typecode, addr)))
} }
// The encoding is truncated. // The encoding is truncated.
_ => Some(Err(ParseError::InvalidEncoding)), _ => Some(Err(ParseError::InvalidEncoding)),