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

zcash_address: Use exhaustive matching in Display impl 

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

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

@ -124,10 +124,9 @@ impl fmt::Display for ZcashAddress {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let encoded = match &self.kind {
AddressKind::Sprout(data) => encode_b58(
if let Network::Main = self.net {
sprout::MAINNET
} else {
sprout::TESTNET
match self.net {
Network::Main => sprout::MAINNET,
Network::Test | Network::Regtest => sprout::TESTNET,
},
data,
),
@ -148,18 +147,16 @@ impl fmt::Display for ZcashAddress {
&data.to_bytes(),
),
AddressKind::P2pkh(data) => encode_b58(
if let Network::Main = self.net {
p2pkh::MAINNET
} else {
p2pkh::TESTNET
match self.net {
Network::Main => p2pkh::MAINNET,
Network::Test | Network::Regtest => p2pkh::TESTNET,
},
data,
),
AddressKind::P2sh(data) => encode_b58(
if let Network::Main = self.net {
p2sh::MAINNET
} else {
p2sh::TESTNET
match self.net {
Network::Main => p2sh::MAINNET,
Network::Test | Network::Regtest => p2sh::TESTNET,
},
data,
),