From 4d7b59e5f5a63de0626fde366046be3e87f3af92 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone <exarkun@twistedmatrix.com> Date: Wed, 21 Jul 2021 12:47:50 -0400 Subject: [PATCH] Give ConfiglessMemoryVoucherStore's DummyRedeemer a public key --- src/_zkapauthorizer/tests/fixtures.py | 11 ++++++++++- src/_zkapauthorizer/tests/test_model.py | 2 -- src/_zkapauthorizer/tests/test_spending.py | 2 -- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/_zkapauthorizer/tests/fixtures.py b/src/_zkapauthorizer/tests/fixtures.py index 35aadae..1b22650 100644 --- a/src/_zkapauthorizer/tests/fixtures.py +++ b/src/_zkapauthorizer/tests/fixtures.py @@ -20,6 +20,10 @@ from __future__ import ( absolute_import, ) +from base64 import ( + b64encode, +) + import attr from fixtures import ( @@ -43,6 +47,7 @@ from ..model import ( memory_connect, ) from ..controller import ( + DummyRedeemer, PaymentController, ) @@ -99,8 +104,12 @@ class ConfiglessMemoryVoucherStore(Fixture): This is like ``TemporaryVoucherStore`` but faster because it skips the Tahoe-LAFS parts. """ - redeemer = attr.ib() get_now = attr.ib() + _public_key = attr.ib(default=b64encode(b"A" * 32).decode("utf-8")) + redeemer = attr.ib(default=None, init=False) + + def __attrs_post_init__(self): + self.redeemer = DummyRedeemer(self._public_key) def _setUp(self): here = FilePath(u".") diff --git a/src/_zkapauthorizer/tests/test_model.py b/src/_zkapauthorizer/tests/test_model.py index 46a794e..039dcff 100644 --- a/src/_zkapauthorizer/tests/test_model.py +++ b/src/_zkapauthorizer/tests/test_model.py @@ -425,9 +425,7 @@ class UnblindedTokenStateMachine(RuleBasedStateMachine): def __init__(self, case): super(UnblindedTokenStateMachine, self).__init__() self.case = case - self.redeemer = DummyRedeemer() self.configless = ConfiglessMemoryVoucherStore( - self.redeemer, # Time probably not actually relevant to this state machine. datetime.now, ) diff --git a/src/_zkapauthorizer/tests/test_spending.py b/src/_zkapauthorizer/tests/test_spending.py index e55f289..1fc4e36 100644 --- a/src/_zkapauthorizer/tests/test_spending.py +++ b/src/_zkapauthorizer/tests/test_spending.py @@ -71,7 +71,6 @@ class PassGroupTests(TestCase): """ configless = self.useFixture( ConfiglessMemoryVoucherStore( - DummyRedeemer(), lambda: now, ), ) @@ -109,7 +108,6 @@ class PassGroupTests(TestCase): ): configless = self.useFixture( ConfiglessMemoryVoucherStore( - DummyRedeemer(), lambda: now, ), ) -- GitLab