Merge pull request #1820 from input-output-hk/djo/1785/last_tx_not_pr…

…oved Bugfix: Block range computation ignored last block range & last block range if it finished with empty blocks
input-output-hk · Jul 16, 2024 · ae12eb6 · ae12eb6
2 parents 702e519 + 73f7be8
commit ae12eb6
Show file tree

Hide file tree

Showing 17 changed files with 356 additions and 380 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/internal/mithril-persistence/Cargo.toml b/internal/mithril-persistence/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-persistence"
-version = "0.2.16"
+version = "0.2.17"
 description = "Common types, interfaces, and utilities to persist data for Mithril nodes."
 authors = { workspace = true }
 edition = { workspace = true }

diff --git a/internal/mithril-persistence/src/database/query/block_range_root/get_block_range_root.rs b/internal/mithril-persistence/src/database/query/block_range_root/get_block_range_root.rs
@@ -22,6 +22,12 @@ impl GetBlockRangeRootQuery {
             condition: WhereCondition::new("start < ?*", vec![Value::Integer(block_number as i64)]),
         }
     }
+
+    pub fn highest() -> Self {
+        Self {
+            condition: WhereCondition::new("end = (select max(end) from block_range_root)", vec![]),
+        }
+    }
 }
 
 impl Query for GetBlockRangeRootQuery {
@@ -134,4 +140,26 @@ mod tests {
 
         assert_eq!(dataset, cursor);
     }
+
+    #[test]
+    fn test_get_highest_with_empty_db() {
+        let connection = cardano_tx_db_connection().unwrap();
+
+        let cursor: Option<BlockRangeRootRecord> = connection
+            .fetch_first(GetBlockRangeRootQuery::highest())
+            .unwrap();
+        assert_eq!(None, cursor);
+    }
+
+    #[test]
+    fn test_get_highest() {
+        let connection = cardano_tx_db_connection().unwrap();
+        let dataset = block_range_root_dataset();
+        insert_block_range_roots(&connection, dataset.clone());
+
+        let cursor: Option<BlockRangeRootRecord> = connection
+            .fetch_first(GetBlockRangeRootQuery::highest())
+            .unwrap();
+        assert_eq!(dataset.last().cloned(), cursor);
+    }
 }
diff --git a/...thril-persistence/src/database/query/block_range_root/get_interval_without_block_range.rs b/...thril-persistence/src/database/query/block_range_root/get_interval_without_block_range.rs
diff --git a/internal/mithril-persistence/src/database/query/block_range_root/mod.rs b/internal/mithril-persistence/src/database/query/block_range_root/mod.rs
@@ -1,11 +1,9 @@
 mod delete_block_range_root;
 mod get_block_range_root;
-mod get_interval_without_block_range;
 mod insert_block_range;
 
 pub use delete_block_range_root::*;
 pub use get_block_range_root::*;
-pub use get_interval_without_block_range::*;
 pub use insert_block_range::*;
 
 #[cfg(test)]

diff --git a/internal/mithril-persistence/src/database/record/interval_without_block_range_root.rs b/internal/mithril-persistence/src/database/record/interval_without_block_range_root.rs
diff --git a/internal/mithril-persistence/src/database/record/mod.rs b/internal/mithril-persistence/src/database/record/mod.rs
@@ -2,8 +2,6 @@
 
 mod block_range_root;
 mod cardano_transaction;
-mod interval_without_block_range_root;
 
 pub use block_range_root::*;
 pub use cardano_transaction::*;
-pub use interval_without_block_range_root::*;