zcash_address: Use exhaustive matching in Display impl
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
parent
ff94f66d8e
commit
f36034cfac
|
@ -124,10 +124,9 @@ impl fmt::Display for ZcashAddress {
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
let encoded = match &self.kind {
|
let encoded = match &self.kind {
|
||||||
AddressKind::Sprout(data) => encode_b58(
|
AddressKind::Sprout(data) => encode_b58(
|
||||||
if let Network::Main = self.net {
|
match self.net {
|
||||||
sprout::MAINNET
|
Network::Main => sprout::MAINNET,
|
||||||
} else {
|
Network::Test | Network::Regtest => sprout::TESTNET,
|
||||||
sprout::TESTNET
|
|
||||||
},
|
},
|
||||||
data,
|
data,
|
||||||
),
|
),
|
||||||
|
@ -148,18 +147,16 @@ impl fmt::Display for ZcashAddress {
|
||||||
&data.to_bytes(),
|
&data.to_bytes(),
|
||||||
),
|
),
|
||||||
AddressKind::P2pkh(data) => encode_b58(
|
AddressKind::P2pkh(data) => encode_b58(
|
||||||
if let Network::Main = self.net {
|
match self.net {
|
||||||
p2pkh::MAINNET
|
Network::Main => p2pkh::MAINNET,
|
||||||
} else {
|
Network::Test | Network::Regtest => p2pkh::TESTNET,
|
||||||
p2pkh::TESTNET
|
|
||||||
},
|
},
|
||||||
data,
|
data,
|
||||||
),
|
),
|
||||||
AddressKind::P2sh(data) => encode_b58(
|
AddressKind::P2sh(data) => encode_b58(
|
||||||
if let Network::Main = self.net {
|
match self.net {
|
||||||
p2sh::MAINNET
|
Network::Main => p2sh::MAINNET,
|
||||||
} else {
|
Network::Test | Network::Regtest => p2sh::TESTNET,
|
||||||
p2sh::TESTNET
|
|
||||||
},
|
},
|
||||||
data,
|
data,
|
||||||
),
|
),
|
||||||
|
|
Loading…
Reference in New Issue