From 2b7926a7bce0840a0536448ce111bf1cd0cf7657 Mon Sep 17 00:00:00 2001 From: Dmitry Demin Date: Fri, 6 Dec 2024 12:26:27 +0100 Subject: [PATCH] Fix Orchard ZSA workflow tests to make it compilable with getblocktemplate-rpcs feature enabled --- zebra-consensus/src/orchard_zsa/tests.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/zebra-consensus/src/orchard_zsa/tests.rs b/zebra-consensus/src/orchard_zsa/tests.rs index cda60d24018..2eb1816e304 100644 --- a/zebra-consensus/src/orchard_zsa/tests.rs +++ b/zebra-consensus/src/orchard_zsa/tests.rs @@ -80,7 +80,12 @@ fn calc_asset_supply_info<'a, I: IntoIterator>( ) -> Result { blocks .into_iter() - .flat_map(|(Request::Commit(block), _)| &block.transactions) + .filter_map(|(request, _)| match request { + Request::Commit(block) => Some(&block.transactions), + #[cfg(feature = "getblocktemplate-rpcs")] + Request::CheckProposal(_) => None, + }) + .flatten() .try_fold(SupplyInfo::new(), |mut supply_info, tx| { process_burns(&mut supply_info, tx.orchard_burns().iter())?; process_issue_actions(&mut supply_info, tx.orchard_issue_actions())?;