Address comments from code review.
This commit is contained in:
parent
4e3d99f1d0
commit
27defb8711
|
@ -855,18 +855,15 @@ where
|
||||||
#[cfg(feature = "orchard")]
|
#[cfg(feature = "orchard")]
|
||||||
let orchard_internal_ovk = || {
|
let orchard_internal_ovk = || {
|
||||||
#[cfg(feature = "transparent-inputs")]
|
#[cfg(feature = "transparent-inputs")]
|
||||||
return if proposal_step.is_shielding() {
|
if proposal_step.is_shielding() {
|
||||||
Some(orchard::keys::OutgoingViewingKey::from(
|
return Some(orchard::keys::OutgoingViewingKey::from(
|
||||||
usk.transparent()
|
usk.transparent()
|
||||||
.to_account_pubkey()
|
.to_account_pubkey()
|
||||||
.internal_ovk()
|
.internal_ovk()
|
||||||
.as_bytes(),
|
.as_bytes(),
|
||||||
))
|
));
|
||||||
} else {
|
}
|
||||||
Some(orchard_fvk.to_ovk(orchard::keys::Scope::Internal))
|
|
||||||
};
|
|
||||||
|
|
||||||
#[cfg(not(feature = "transparent-inputs"))]
|
|
||||||
Some(orchard_fvk.to_ovk(Scope::Internal))
|
Some(orchard_fvk.to_ovk(Scope::Internal))
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -881,18 +878,15 @@ where
|
||||||
|
|
||||||
let sapling_internal_ovk = || {
|
let sapling_internal_ovk = || {
|
||||||
#[cfg(feature = "transparent-inputs")]
|
#[cfg(feature = "transparent-inputs")]
|
||||||
return if proposal_step.is_shielding() {
|
if proposal_step.is_shielding() {
|
||||||
Some(sapling::keys::OutgoingViewingKey(
|
return Some(sapling::keys::OutgoingViewingKey(
|
||||||
usk.transparent()
|
usk.transparent()
|
||||||
.to_account_pubkey()
|
.to_account_pubkey()
|
||||||
.internal_ovk()
|
.internal_ovk()
|
||||||
.as_bytes(),
|
.as_bytes(),
|
||||||
))
|
));
|
||||||
} else {
|
}
|
||||||
Some(sapling_dfvk.to_ovk(Scope::Internal))
|
|
||||||
};
|
|
||||||
|
|
||||||
#[cfg(not(feature = "transparent-inputs"))]
|
|
||||||
Some(sapling_dfvk.to_ovk(Scope::Internal))
|
Some(sapling_dfvk.to_ovk(Scope::Internal))
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue