From f36034cfac48477926a3b9032e4370a484bd9f4a Mon Sep 17 00:00:00 2001 From: str4d Date: Sun, 6 Jun 2021 23:54:11 +0100 Subject: [PATCH] zcash_address: Use exhaustive matching in Display impl Co-authored-by: Daira Hopwood --- components/zcash_address/src/encoding.rs | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/components/zcash_address/src/encoding.rs b/components/zcash_address/src/encoding.rs index 56adbd039..a7c772214 100644 --- a/components/zcash_address/src/encoding.rs +++ b/components/zcash_address/src/encoding.rs @@ -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, ),