From 3f2b8556e3a1d11f95dcc98bec2aa98d0395cf68 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 7 Oct 2019 15:57:41 -0400
Subject: [PATCH] decomplicate this at least until retry is implemented
---
src/_zkapauthorizer/controller.py | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/src/_zkapauthorizer/controller.py b/src/_zkapauthorizer/controller.py
index 5681bf0..89d08df 100644
--- a/src/_zkapauthorizer/controller.py
+++ b/src/_zkapauthorizer/controller.py
@@ -62,14 +62,6 @@ from .model import (
)
-class TransientRedemptionError(Exception):
- pass
-
-
-class PermanentRedemptionError(Exception):
- pass
-
-
class IRedeemer(Interface):
"""
An ``IRedeemer`` can exchange a voucher for one or more passes.
@@ -107,11 +99,8 @@ class IRedeemer(Interface):
the redemption process.
:return: A ``Deferred`` which fires with a list of ``UnblindedToken``
- instances on successful redemption or which fails with
- ``TransientRedemptionError`` on any error which may be resolved by
- simply trying again later or which fails with
- ``PermanentRedemptionError`` on any error which is definitive and
- final.
+ instances on successful redemption or which fails with any error
+ to allow a retry to be made at some future point.
"""
def tokens_to_passes(message, unblinded_tokens):
@@ -292,7 +281,7 @@ class RistrettoRedeemer(object):
result = yield json_content(response)
except ValueError:
self._log.failure("Parsing redeem response failed", response=response)
- raise TransientRedemptionError()
+ raise
self._log.info("Redeemed: {public-key} {proof} {signatures}", **result)
--
GitLab