From dfae651988c2615b2175646adfbe876ed6e26ab9 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone <exarkun@twistedmatrix.com> Date: Fri, 12 Nov 2021 11:39:14 -0500 Subject: [PATCH] stat_share was exactly like get_share_stats w/ None for sharenums --- src/_zkapauthorizer/_storage_server.py | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/_zkapauthorizer/_storage_server.py b/src/_zkapauthorizer/_storage_server.py index e379989..2f5da40 100644 --- a/src/_zkapauthorizer/_storage_server.py +++ b/src/_zkapauthorizer/_storage_server.py @@ -292,7 +292,7 @@ class ZKAPAuthorizerStorageServer(Referenceable): def remote_stat_shares(self, storage_indexes_or_slots): # type: (List[bytes]) -> List[Dict[int, ShareStat]] return list( - dict(stat_share(self._original, storage_index_or_slot)) + dict(get_share_stats(self._original, storage_index_or_slot, None)) for storage_index_or_slot in storage_indexes_or_slots ) @@ -677,22 +677,6 @@ def get_slot_share_size(sharepath): return share_data_length -def stat_share(storage_server, storage_index_or_slot): - """ - Get a ``ShareStat`` for each share in a bucket or a slot. - - :return: An iterator of two-tuples of share number and corresponding - ``ShareStat``. - """ - stat = None - for sharenum, sharepath in get_all_share_paths( - storage_server, storage_index_or_slot - ): - if stat is None: - stat = get_stat(sharepath) - yield (sharenum, stat(storage_server, storage_index_or_slot, sharepath)) - - def get_stat(sharepath): """ Get a function that can retrieve the metadata from the share at the given -- GitLab