Skip to content

Commit f74671e

Browse files
dmidemarya2
andauthored
Update zebra-consensus/src/primitives/halo2.rs
Co-authored-by: Arya <aryasolhi@gmail.com>
1 parent a0241d8 commit f74671e

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

zebra-consensus/src/primitives/halo2.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,9 @@ impl From<&zebra_chain::orchard::ShieldedData> for Item {
144144
.flags
145145
.contains(zebra_chain::orchard::Flags::ENABLE_OUTPUTS);
146146

147-
// FIXME: simplify the flags creation - make `Flags::from_parts` method pub?
148147
// FIXME: support OrchardZSA?
149-
let flags = match (enable_spend, enable_output) {
150-
(false, false) => orchard::builder::BundleType::DISABLED.flags(),
151-
(false, true) => orchard::bundle::Flags::SPENDS_DISABLED_WITHOUT_ZSA,
152-
(true, false) => orchard::bundle::Flags::OUTPUTS_DISABLED,
153-
(true, true) => orchard::bundle::Flags::ENABLED_WITHOUT_ZSA,
154-
};
148+
let flags = orchard::bundle::Flags::from_byte(shielded_data.flags.bits())
149+
.expect("type should not have unexpected bits");
155150

156151
let instances = shielded_data
157152
.actions()

0 commit comments

Comments
 (0)