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

Fix clippy complaints.

This commit is contained in:
Kris Nuttycombe 2021-12-02 12:41:11 -07:00
parent 914363f9b7
commit 8cf43d255f
2 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,40 +46,33 @@ impl FromStr for ZcashAddress {
let s = s.trim();
// Try decoding as a unified address
match unified::Address::decode(s) {
Ok((net, data)) => {
return Ok(ZcashAddress {
net,
kind: AddressKind::Unified(data),
})
}
_ => (),
};
if let Ok((net, data)) = unified::Address::decode(s) {
return Ok(ZcashAddress {
net,
kind: AddressKind::Unified(data),
});
}
// Try decoding as a Sapling address (Bech32)
match bech32::decode(s) {
Ok((hrp, data, Variant::Bech32)) => {
// If we reached this point, the encoding is supposed to be valid Bech32.
let data =
Vec::<u8>::from_base32(&data).map_err(|_| ParseError::InvalidEncoding)?;
if let Ok((hrp, data, Variant::Bech32)) = bech32::decode(s) {
// If we reached this point, the encoding is supposed to be valid Bech32.
let data = Vec::<u8>::from_base32(&data).map_err(|_| ParseError::InvalidEncoding)?;
let net = match hrp.as_str() {
sapling::MAINNET => Network::Main,
sapling::TESTNET => Network::Test,
sapling::REGTEST => Network::Regtest,
// We will not define new Bech32 address encodings.
_ => {
return Err(ParseError::NotZcash);
}
};
let net = match hrp.as_str() {
sapling::MAINNET => Network::Main,
sapling::TESTNET => Network::Test,
sapling::REGTEST => Network::Regtest,
// We will not define new Bech32 address encodings.
_ => {
return Err(ParseError::NotZcash);
}
};
return data[..]
.try_into()
.map(AddressKind::Sapling)
.map_err(|_| ParseError::InvalidEncoding)
.map(|kind| ZcashAddress { net, kind });
}
_ => (),
return data[..]
.try_into()
.map(AddressKind::Sapling)
.map_err(|_| ParseError::InvalidEncoding)
.map(|kind| ZcashAddress { net, kind });
}
// The rest use Base58Check.

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

@ -318,7 +318,7 @@ pub trait Encoding: private::SealedContainer + std::marker::Sized {
.map_err(|e| ParseError::InvalidEncoding(e.to_string()))?;
Self::parse_items(hrp, &data[..])
.and_then(|xs| Self::try_from_items(xs))
.and_then(Self::try_from_items)
.map(|value| (net, value))
}
_ => Err(ParseError::InvalidEncoding("Expected bech32m".to_string())),
@ -327,8 +327,12 @@ pub trait Encoding: private::SealedContainer + std::marker::Sized {
fn encode(&self, network: &Network) -> String {
let hrp = Self::network_hrp(network);
bech32::encode(hrp, self.to_jumbled_bytes(hrp).to_base32(), Variant::Bech32m)
.expect("hrp is invalid")
bech32::encode(
hrp,
self.to_jumbled_bytes(hrp).to_base32(),
Variant::Bech32m,
)
.expect("hrp is invalid")
}
}