From 8a4d3c6c0995ae8bc27b4d599047cc4901ebeb97 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Tue, 15 Oct 2019 08:36:41 -0400
Subject: [PATCH] Let required_passes know about share sizes
Instead of assuming all shares are the same size here, pass in all the sizes.
The protocol doesn't allow immutable shares in a storage index to have
differences in size but it does allow mutable shares in a slot to differ this
way.
---
src/_zkapauthorizer/storage_common.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/_zkapauthorizer/storage_common.py b/src/_zkapauthorizer/storage_common.py
index 21b7e41..39c43cf 100644
--- a/src/_zkapauthorizer/storage_common.py
+++ b/src/_zkapauthorizer/storage_common.py
@@ -47,7 +47,7 @@ slot_testv_and_readv_and_writev_message = _message_maker(u"slot_testv_and_readv_
# submitted.
BYTES_PER_PASS = 128 * 1024
-def required_passes(bytes_per_pass, share_nums, share_size):
+def required_passes(bytes_per_pass, share_sizes):
"""
Calculate the number of passes that are required to store ``stored_bytes``
for one lease period.
@@ -55,14 +55,13 @@ def required_passes(bytes_per_pass, share_nums, share_size):
:param int bytes_per_pass: The number of bytes the storage of which for
one lease period one pass covers.
- :param set[int] share_nums: The share numbers which will be stored.
- :param int share_size: THe number of bytes in a single share.
+ :param set[int] share_sizes: The sizes of the shared which will be stored.
:return int: The number of passes required to cover the storage cost.
"""
return int(
ceil(
- (len(share_nums) * share_size) / bytes_per_pass,
+ sum(share_sizes, 0) / bytes_per_pass,
),
)
--
GitLab