fix:simplify

fakeredis/_basefakesocket.py

@@ -221,7 +221,7 @@ def _blocking(self, timeout: Optional[Union[float, int]], func: Callable[[bool],
 
         Returns the function return value, or None if the timeout has passed.
         """
-        ret = func(True)
+        ret = func(True)  # Call with first_pass=True
         if ret is not None or self._in_transaction:
             return ret
         deadline = time.time() + timeout if timeout else None
@@ -231,7 +231,7 @@ def _blocking(self, timeout: Optional[Union[float, int]], func: Callable[[bool],
                 return None
             if self._db.condition.wait(timeout=timeout) is False:
                 return None  # Timeout expired
-            ret = func(False)
+            ret = func(False)  # Second pass => first_pass=False
             if ret is not None:
                 return ret
 

fakeredis/aioredis.py

@@ -202,7 +202,7 @@ def __init__(
             server: Optional[_server.FakeServer] = None,
             connected: bool = True,
             version: VersionType = (7,),
-            lua_modules: Set[str] = None,
+            lua_modules: Optional[Set[str]] = None,
             **kwargs: Any,
     ) -> None:
         if not connection_pool:

fakeredis/commands_mixins/streams_mixin.py

@@ -370,8 +370,8 @@ def _xread(self, stream_start_id_list: List[Tuple[bytes, StreamRangeTest]], coun
             stream_results = self._xrange(item.value, start_id, max_inf, False, count)
             if len(stream_results) > 0:
                 res.append([item.key, stream_results])
-            if first_pass and (count is None) and len(res) == len(stream_start_id_list):
-                return res
+
+        # On blocking read, when count is not None, and there are no results, return None (instead of an empty list)
         if blocking and count and len(res) == 0:
             return None
         return res