octo
/
Zebra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up comments

This commit is contained in:
Deirdre Connolly 2020-03-10 18:33:44 -04:00 committed by Deirdre Connolly
parent 27d960c61e
commit 14120cf828
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zebra-chain/src/addresses.rs
View File

@ -119,11 +119,11 @@ impl ZcashSerialize for TransparentAddress {
network, network,
script_hash, script_hash,
} => { } => {
// Dev network doesn't have a recommendation so we
// default to testnet bytes if it's not mainnet.
if *network == Network::Mainnet { if *network == Network::Mainnet {
writer.write_all(&[0x1C, 0xBD][..])? writer.write_all(&[0x1C, 0xBD][..])?
} else { } else {
// Dev network doesn't have a recommendation so we
// default to testnet bytes.
writer.write_all(&[0x1C, 0xBA][..])? writer.write_all(&[0x1C, 0xBA][..])?
} }
writer.write_all(&script_hash.0)? writer.write_all(&script_hash.0)?
@ -132,15 +132,13 @@ impl ZcashSerialize for TransparentAddress {
network, network,
pub_key_hash, pub_key_hash,
} => { } => {
// Dev network doesn't have a recommendation so we
// default to testnet bytes if it's not mainnet.
if *network == Network::Mainnet { if *network == Network::Mainnet {
writer.write_all(&[0x1C, 0xB8][..])? writer.write_all(&[0x1C, 0xB8][..])?
} else { } else {
// Dev network doesn't have a recommendation so we
// default to testnet bytes.
writer.write_all(&[0x1D, 0x25][..])? writer.write_all(&[0x1D, 0x25][..])?
} }
// XXX I'm asuming this is BigEndian because we're not
// explicitly making it LittleEndian?
writer.write_all(&pub_key_hash.0)? writer.write_all(&pub_key_hash.0)?
} }
} }
@ -162,7 +160,6 @@ impl ZcashDeserialize for TransparentAddress {
network: Network::Mainnet, network: Network::Mainnet,
script_hash: AddressPayloadHash(hash_bytes), script_hash: AddressPayloadHash(hash_bytes),
}), }),
// Currently only reading !mainnet versions as testnet.
[0x1c, 0xba] => Ok(TransparentAddress::PayToScriptHash { [0x1c, 0xba] => Ok(TransparentAddress::PayToScriptHash {
network: Network::Testnet, network: Network::Testnet,
script_hash: AddressPayloadHash(hash_bytes), script_hash: AddressPayloadHash(hash_bytes),
@ -171,7 +168,6 @@ impl ZcashDeserialize for TransparentAddress {
network: Network::Mainnet, network: Network::Mainnet,
pub_key_hash: AddressPayloadHash(hash_bytes), pub_key_hash: AddressPayloadHash(hash_bytes),
}), }),
// Currently only reading !mainnet versions as testnet.
[0x1d, 0x25] => Ok(TransparentAddress::PayToPublicKeyHash { [0x1d, 0x25] => Ok(TransparentAddress::PayToPublicKeyHash {
network: Network::Testnet, network: Network::Testnet,
pub_key_hash: AddressPayloadHash(hash_bytes), pub_key_hash: AddressPayloadHash(hash_bytes),