From 0f4932dc38049453ec83d00400558baa71a274d0 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Tue, 15 Oct 2019 16:09:44 -0400
Subject: [PATCH] Move this helper so we can reuse it
---
src/_zkapauthorizer/tests/storage_common.py | 38 +++++++++++++++++++
.../tests/test_storage_protocol.py | 34 +----------------
2 files changed, 39 insertions(+), 33 deletions(-)
diff --git a/src/_zkapauthorizer/tests/storage_common.py b/src/_zkapauthorizer/tests/storage_common.py
index 6ae3a4c..4baf4de 100644
--- a/src/_zkapauthorizer/tests/storage_common.py
+++ b/src/_zkapauthorizer/tests/storage_common.py
@@ -20,6 +20,11 @@ from twisted.python.filepath import (
FilePath,
)
+from .strategies import (
+ # Not really a strategy...
+ bytes_for_share,
+)
+
def cleanup_storage_server(storage_server):
"""
Delete all of the shares held by the given storage server.
@@ -35,3 +40,36 @@ def cleanup_storage_server(storage_server):
for p in start.walk():
if p is not start:
p.remove()
+
+
+def write_toy_shares(
+ storage_server,
+ storage_index,
+ renew_secret,
+ cancel_secret,
+ sharenums,
+ size,
+ canary,
+):
+ """
+ Write some immutable shares to the given storage server.
+
+ :param allmydata.storage.server.StorageServer storage_server:
+ :param bytes storage_index:
+ :param bytes renew_secret:
+ :param bytes cancel_secret:
+ :param set[int] sharenums:
+ :param int size:
+ :param IRemoteReference canary:
+ """
+ _, allocated = storage_server.remote_allocate_buckets(
+ storage_index,
+ renew_secret,
+ cancel_secret,
+ sharenums,
+ size,
+ canary=canary,
+ )
+ for (sharenum, writer) in allocated.items():
+ writer.remote_write(0, bytes_for_share(sharenum, size))
+ writer.remote_close()
diff --git a/src/_zkapauthorizer/tests/test_storage_protocol.py b/src/_zkapauthorizer/tests/test_storage_protocol.py
index 9789d50..f567d32 100644
--- a/src/_zkapauthorizer/tests/test_storage_protocol.py
+++ b/src/_zkapauthorizer/tests/test_storage_protocol.py
@@ -91,6 +91,7 @@ from .fixtures import (
)
from .storage_common import (
cleanup_storage_server,
+ write_toy_shares,
)
from ..api import (
ZKAPAuthorizerStorageServer,
@@ -626,36 +627,3 @@ def write_vector_to_read_vector(write_vector):
write vector.
"""
return (write_vector[0], len(write_vector[1]))
-
-
-def write_toy_shares(
- storage_server,
- storage_index,
- renew_secret,
- cancel_secret,
- sharenums,
- size,
- canary,
-):
- """
- Write some immutable shares to the given storage server.
-
- :param allmydata.storage.server.StorageServer storage_server:
- :param bytes storage_index:
- :param bytes renew_secret:
- :param bytes cancel_secret:
- :param set[int] sharenums:
- :param int size:
- :param IRemoteReference canary:
- """
- _, allocated = storage_server.remote_allocate_buckets(
- storage_index,
- renew_secret,
- cancel_secret,
- sharenums,
- size,
- canary=canary,
- )
- for (sharenum, writer) in allocated.items():
- writer.remote_write(0, bytes_for_share(sharenum, size))
- writer.remote_close()
--
GitLab