pass the whole clock to StorageServer, as Tahoe-LAFS wants

src/_zkapauthorizer/tests/fixtures.py

@@ -21,7 +21,6 @@ from __future__ import absolute_import
 from base64 import b64encode
 
 import attr
-from allmydata import __version__ as allmydata_version
 from allmydata.storage.server import StorageServer
 from fixtures import Fixture, TempDir
 from twisted.internet.task import Clock
@@ -51,18 +50,10 @@ class AnonymousStorageServer(Fixture):
 
     def _setUp(self):
         self.tempdir = FilePath(self.useFixture(TempDir()).join(b"storage"))
-        if allmydata_version >= "1.16.":
-            # This version of Tahoe adds a new StorageServer argument for
-            # controlling time.
-            timeargs = {"get_current_time": self.clock.seconds}
-        else:
-            # Older versions just use time.time() and there's not much we can
-            # do _here_.  Code somewhere else will have to monkey-patch that
-            # to control things.
-            timeargs = {}
-
         self.storage_server = StorageServer(
-            self.tempdir.asBytesMode().path, b"x" * 20, **timeargs
+            self.tempdir.asBytesMode().path,
+            b"x" * 20,
+            clock=self.clock,
         )
 
 

src/_zkapauthorizer/tests/test_storage_protocol.py

@@ -21,7 +21,6 @@ from __future__ import absolute_import
 from allmydata.storage.common import storage_index_to_dir
 from allmydata.storage.shares import get_share_file
 from challenge_bypass_ristretto import PublicKey, random_signing_key
-from fixtures import MonkeyPatch
 from foolscap.referenceable import LocalReferenceable
 from hypothesis import assume, given
 from hypothesis.strategies import data as data_strategy
@@ -540,15 +539,6 @@ class ShareTests(TestCase):
 
         self.clock.advance(when)
 
-        # anonymous_storage_server uses time.time() before Tahoe-LAFS 1.16,
-        # unfortunately.  For Tahoe-LAFS 1.16, AnonymousStorageServer will
-        # glue self.clock in for us.  For older versions we still need this
-        # monkey-patching.
-        #
-        # And useFixture does not interact very well with Hypothesis.
-        patch = MonkeyPatch("time.time", self.clock.seconds)
-        try:
-            patch.setUp()
         # Create a share we can toy with.
         write_shares(
             self.anonymous_storage_server,
@@ -565,8 +555,6 @@ class ShareTests(TestCase):
                 renew_secret,
                 cancel_secret,
             )
-        finally:
-            patch.cleanUp()
 
         expected = [
             {
@@ -771,9 +759,6 @@ class ShareTests(TestCase):
         """
         self.clock.advance(when)
 
-        patch = MonkeyPatch("time.time", self.clock.seconds)
-        try:
-            patch.setUp()
         # Create a share we can toy with.
         wrote, read = extract_result(
             self.client.slot_testv_and_readv_and_writev(
@@ -786,8 +771,6 @@ class ShareTests(TestCase):
                 r_vector=[],
             ),
         )
-        finally:
-            patch.cleanUp()
         self.assertThat(
             wrote,
             Equals(True),
@@ -1052,10 +1035,6 @@ class ShareTests(TestCase):
                 r_vector=[],
             )
 
-        patch = MonkeyPatch("time.time", self.clock.seconds)
-        try:
-            patch.setUp()
-
         # Create a share we can toy with.
         self.assertThat(write(), is_successful_write())
 
@@ -1064,8 +1043,6 @@ class ShareTests(TestCase):
         self.clock.advance(self.server.LEASE_PERIOD.total_seconds() + 1)
 
         self.assertThat(write(), is_successful_write())
-        finally:
-            patch.cleanUp()
 
         # The spent passes have been reported to the spending service.
         self.assertThat(