From c08746c712e0f9bac494e3e7a547a047447e3445 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 2 Apr 2020 08:54:22 -0400
Subject: [PATCH] Per previous commit, suspicious state is not sensible
---
src/_zkapauthorizer/model.py | 35 -------------------------
src/_zkapauthorizer/tests/strategies.py | 7 -----
2 files changed, 42 deletions(-)
diff --git a/src/_zkapauthorizer/model.py b/src/_zkapauthorizer/model.py
index 67ac95a..8691ffa 100644
--- a/src/_zkapauthorizer/model.py
+++ b/src/_zkapauthorizer/model.py
@@ -727,35 +727,6 @@ class Redeemed(object):
}
-@attr.s(frozen=True)
-class Suspicious(object):
- """
- The voucher was successfully redeemed but the public key used in the
- redemption was suspicious.
-
- :ivar datetime finished: The time when the redemption finished.
-
- :ivar int token_count: The number of tokens the voucher was redeemed for.
-
- :ivar unicode public_key: The public part of the key used to sign the
- tokens for this voucher.
- """
- finished = attr.ib(validator=attr.validators.instance_of(datetime))
- token_count = attr.ib(validator=attr.validators.instance_of((int, long)))
- public_key = attr.ib(validator=attr.validators.optional(attr.validators.instance_of(unicode)))
-
- def should_start_redemption(self):
- return False
-
- def to_json_v1(self):
- return {
- u"name": u"suspicious",
- u"finished": self.finished.isoformat(),
- u"token-count": self.token_count,
- u"public-key": self.public_key,
- }
-
-
@attr.s(frozen=True)
class DoubleSpend(object):
finished = attr.ib(validator=attr.validators.instance_of(datetime))
@@ -892,12 +863,6 @@ class Voucher(object):
token_count=state_json[u"token-count"],
public_key=state_json[u"public-key"],
)
- elif state_name == u"suspicious":
- state = Suspicious(
- finished=parse_datetime(state_json[u"finished"]),
- token_count=state_json[u"token-count"],
- public_key=state_json[u"public-key"],
- )
elif state_name == u"unpaid":
state = Unpaid(
finished=parse_datetime(state_json[u"finished"]),
diff --git a/src/_zkapauthorizer/tests/strategies.py b/src/_zkapauthorizer/tests/strategies.py
index 6920e33..5186142 100644
--- a/src/_zkapauthorizer/tests/strategies.py
+++ b/src/_zkapauthorizer/tests/strategies.py
@@ -78,7 +78,6 @@ from ..model import (
Unpaid,
Error,
Redeemed,
- Suspicious,
)
# Sizes informed by
@@ -316,12 +315,6 @@ def voucher_states():
return one_of(
just(Pending()),
redeemed_states(),
- builds(
- Suspicious,
- finished=datetimes(),
- token_count=one_of(integers(min_value=1)),
- public_key=dummy_ristretto_keys(),
- ),
builds(
DoubleSpend,
finished=datetimes(),
--
GitLab