fix: bugfix, bitstring status list now supports lists with multiple-bit statuses

Signed-off-by: Athan Massouras <[email protected]>

Author: Athan Massouras

src/bit_array.py

@@ -352,8 +352,11 @@ def rand_and_settle(self):
         byte_idx = self._rand_settle(
             len(self.allocated.lst), lambda index: self.allocated.lst[index] < 255
         )
+        print("byte_idx:\t", byte_idx)
+        print(len(self.allocated.lst))
         start = byte_idx << 3
         end = start + 8
+        print("start, end:\t", start, end)
         index = choice(self.linear_scan(start, end, lambda i: self.allocated[i] == 0))
         self.allocated[index] = 1
         self.num_allocated += 1

src/bitstring_status_list/issuer.py

@@ -83,7 +83,7 @@ def new(cls, size: int, bits: Bits = 1, strategy: Literal["linear", "random"] =
             allocator = LinearIndexAllocator(size)
         elif strategy == "random":
             allocator = RandomIndexAllocator(
-                BitArray.with_at_least(bits, size), num_allocated=0
+                BitArray.with_at_least(1, size), num_allocated=0
             )
         else:
             raise ValueError(f"Invalid strategy: {strategy}")

tests/test_bitstring_status_list.py

@@ -65,7 +65,7 @@ def test_verify_jwt_basic_enveloping(status: BitstringStatusListIssuer):
         }
     }
 
-    for i in range(len(status)):
+    for i in range(status.status_list.size):
         assert verifier.get_status(i) == {
             "status": status[i],
             "valid": not bool(status[i])
@@ -106,8 +106,18 @@ def test_verify_jwt_basic_embedding(status: BitstringStatusListIssuer):
         },
     }
 
-    for i in range(len(status)):
+    for i in range(status.status_list.size):
         assert verifier.get_status(i) == {
             "status": status[i],
             "valid": not bool(status[i])
         }
+
+def test_status_message():
+    # Create a bitstring status list with a variety of different statuses
+    bitstring = BitstringStatusListIssuer.new(MIN_LIST_LENGTH, bits=2)
+    for idx in bitstring.take_n(50):
+        bitstring[idx] = 1
+    for idx in bitstring.take_n(50):
+        bitstring[idx] = 2
+    for idx in bitstring.take_n(50):
+        bitstring[idx] = 3