Merge pull request #755 from onekey-sec/753-overlap-fix

fix(models): adapt chunk's contains() definition.

Author: qkaiser

tests/test_models.py

@@ -18,30 +18,47 @@ class TestChunk:
     @pytest.mark.parametrize(
         "chunk1, chunk2, result",
         [
-            (
+            pytest.param(
                 Chunk(start_offset=0, end_offset=10),
                 Chunk(start_offset=1, end_offset=2),
                 True,
+                id="starts-after-ends-before",
             ),
-            (
+            pytest.param(
                 Chunk(start_offset=0, end_offset=10),
                 Chunk(start_offset=11, end_offset=12),
                 False,
+                id="starts-after-ends-after",
             ),
-            (
+            pytest.param(
                 Chunk(start_offset=0, end_offset=10),
                 Chunk(start_offset=15, end_offset=20),
                 False,
+                id="starts-after-ends-after",
             ),
-            (
+            pytest.param(
                 Chunk(start_offset=1, end_offset=2),
                 Chunk(start_offset=3, end_offset=5),
                 False,
+                id="starts-after-ends-after",
             ),
-            (
+            pytest.param(
                 Chunk(start_offset=0, end_offset=10),
                 Chunk(start_offset=1, end_offset=10),
                 True,
+                id="starts-after-ends-same",
+            ),
+            pytest.param(
+                Chunk(start_offset=0, end_offset=10),
+                Chunk(start_offset=0, end_offset=9),
+                True,
+                id="starts-same-ends-before",
+            ),
+            pytest.param(
+                Chunk(start_offset=0, end_offset=10),
+                Chunk(start_offset=0, end_offset=10),
+                False,
+                id="starts-same-ends-same",
             ),
         ],
     )

unblob/models.py

@@ -87,6 +87,9 @@ def contains(self, other: "Chunk") -> bool:
         return (
             self.start_offset < other.start_offset
             and self.end_offset >= other.end_offset
+        ) or (
+            self.start_offset <= other.start_offset
+            and self.end_offset > other.end_offset
         )
 
     def contains_offset(self, offset: int) -> bool: