fix: return blocks to rollback in reverse order

hirosystems · Mar 24, 2023 · 9fab5a3 · 9fab5a3
1 parent 88206ef
commit 9fab5a3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/components/chainhook-event-observer/src/indexer/mod.rs b/components/chainhook-event-observer/src/indexer/mod.rs
@@ -313,7 +313,6 @@ impl ChainSegment {
             slog::debug!(logger, "Blocks to rollback: {:?}", block_ids_to_rollback)
         });
         ctx.try_log(|logger| slog::debug!(logger, "Blocks to apply: {:?}", block_ids_to_apply));
-        block_ids_to_rollback.reverse();
         block_ids_to_apply.reverse();
         match common_root.take() {
             Some(_common_root) => Ok(ChainSegmentDivergence {

diff --git a/components/chainhook-event-observer/src/indexer/tests/helpers/bitcoin_shapes.rs b/components/chainhook-event-observer/src/indexer/tests/helpers/bitcoin_shapes.rs
@@ -88,10 +88,11 @@ pub fn expect_chain_updated_with_blocks(
 }
 
 pub fn expect_chain_updated_with_block_reorg(
-    blocks_to_rollback: Vec<BitcoinBlockData>,
+    mut blocks_to_rollback: Vec<BitcoinBlockData>,
     blocks_to_apply: Vec<BitcoinBlockData>,
     _confirmed_blocks: Vec<BitcoinBlockData>,
 ) -> BlockchainEventExpectation {
+    blocks_to_rollback.reverse();
     Box::new(move |chain_event_to_check: Option<BlockchainEvent>| {
         assert!(
             match chain_event_to_check {

diff --git a/components/chainhook-event-observer/src/indexer/tests/helpers/stacks_shapes.rs b/components/chainhook-event-observer/src/indexer/tests/helpers/stacks_shapes.rs
@@ -146,10 +146,11 @@ pub fn expect_chain_updated_with_blocks(
 
 pub fn expect_chain_updated_with_block_and_microblock_updates(
     expected_block: BlockEvent,
-    microblocks_to_rollback: Vec<BlockEvent>,
+    mut microblocks_to_rollback: Vec<BlockEvent>,
     microblocks_to_apply: Vec<BlockEvent>,
     _confirmed_blocks: Vec<BlockEvent>,
 ) -> StacksChainEventExpectation {
+    microblocks_to_rollback.reverse();
     Box::new(move |chain_event_to_check: Option<StacksChainEvent>| {
         assert!(
             match chain_event_to_check {
@@ -362,10 +363,11 @@ pub fn expect_chain_updated_with_block_reorg_and_microblock_updates(
 }
 
 pub fn expect_chain_updated_with_block_reorg(
-    blocks_to_rollback: Vec<BlockEvent>,
+    mut blocks_to_rollback: Vec<BlockEvent>,
     blocks_to_apply: Vec<BlockEvent>,
     _confirmed_blocks: Vec<BlockEvent>,
 ) -> StacksChainEventExpectation {
+    blocks_to_rollback.reverse();
     Box::new(move |chain_event_to_check: Option<StacksChainEvent>| {
         assert!(
             match chain_event_to_check {
@@ -415,9 +417,10 @@ pub fn expect_chain_updated_with_block_reorg(
 }
 
 pub fn expect_chain_updated_with_microblock_reorg(
-    microblocks_to_rollback: Vec<BlockEvent>,
+    mut microblocks_to_rollback: Vec<BlockEvent>,
     microblocks_to_apply: Vec<BlockEvent>,
 ) -> StacksChainEventExpectation {
+    microblocks_to_rollback.reverse();
     Box::new(move |chain_event_to_check: Option<StacksChainEvent>| {
         assert!(
             match chain_event_to_check {