From ffe61ea0f90e2157c54b3f78ac51f6de698c5c06 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 19 Sep 2019 10:35:23 -0400
Subject: [PATCH] Reorder things to match the docs for the protocol more
 closely

---
 src/_zkapauthorizer/controller.py | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/_zkapauthorizer/controller.py b/src/_zkapauthorizer/controller.py
index c2a890c..2cc8430 100644
--- a/src/_zkapauthorizer/controller.py
+++ b/src/_zkapauthorizer/controller.py
@@ -253,22 +253,20 @@ class RistrettoRedeemer(object):
             for token
             in unblinded_tokens
         )
-        clients_preimages = list(
-            token.preimage()
-            for token
-            in unblinded_tokens
-        )
         clients_verification_keys = list(
             token.derive_verification_key_sha512()
             for token
             in unblinded_tokens
         )
-        clients_passes = zip(
-            clients_preimages, (
-                verification_key.sign_sha512(message)
-                for verification_key
-                in clients_verification_keys
-            ),
+        clients_signatures = list(
+            verification_key.sign_sha512(message)
+            for verification_key
+            in clients_verification_keys
+        )
+        clients_preimages = list(
+            token.preimage()
+            for token
+            in unblinded_tokens
         )
         marshaled_passes = list(
             (
-- 
GitLab