From dea9a8c53620d96d8cdad7668432d01e0b10de23 Mon Sep 17 00:00:00 2001 From: Marek Date: Mon, 18 Sep 2023 05:44:26 +0200 Subject: [PATCH] Compare the subtrees in `Chain` (#7562) --- zebra-state/src/service/non_finalized_state/chain.rs | 4 ++++ zebra-state/src/service/non_finalized_state/tests/prop.rs | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/zebra-state/src/service/non_finalized_state/chain.rs b/zebra-state/src/service/non_finalized_state/chain.rs index fb3865cc..8bfeff3f 100644 --- a/zebra-state/src/service/non_finalized_state/chain.rs +++ b/zebra-state/src/service/non_finalized_state/chain.rs @@ -281,6 +281,10 @@ impl Chain { // history trees self.history_trees_by_height == other.history_trees_by_height && + // note commitment subtrees + self.sapling_subtrees == other.sapling_subtrees && + self.orchard_subtrees == other.orchard_subtrees && + // anchors self.sprout_anchors == other.sprout_anchors && self.sprout_anchors_by_height == other.sprout_anchors_by_height && diff --git a/zebra-state/src/service/non_finalized_state/tests/prop.rs b/zebra-state/src/service/non_finalized_state/tests/prop.rs index ea72609b..76ebd377 100644 --- a/zebra-state/src/service/non_finalized_state/tests/prop.rs +++ b/zebra-state/src/service/non_finalized_state/tests/prop.rs @@ -624,6 +624,10 @@ fn different_blocks_different_chains() -> Result<()> { chain1.sapling_trees_by_height = chain2.sapling_trees_by_height.clone(); chain1.orchard_trees_by_height = chain2.orchard_trees_by_height.clone(); + // note commitment subtrees + chain1.sapling_subtrees = chain2.sapling_subtrees.clone(); + chain1.orchard_subtrees = chain2.orchard_subtrees.clone(); + // history trees chain1.history_trees_by_height = chain2.history_trees_by_height.clone();