From b642aa3ef62c9ea19bd68ae741a9d446c11b5066 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone <exarkun@twistedmatrix.com> Date: Mon, 7 Feb 2022 14:18:16 -0500 Subject: [PATCH] fold helper into the only remaining caller --- src/_zkapauthorizer/model.py | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/src/_zkapauthorizer/model.py b/src/_zkapauthorizer/model.py index 8b289f4..2990348 100644 --- a/src/_zkapauthorizer/model.py +++ b/src/_zkapauthorizer/model.py @@ -351,16 +351,6 @@ class VoucherStore(object): return list(Voucher.from_row(row) for row in refs) - def _insert_unblinded_tokens(self, cursor, unblinded_tokens, group_id): - """ - Helper function to really insert unblinded tokens into the database. - """ - cursor.executemany( - """ - INSERT INTO [unblinded-tokens] ([token], [redemption-group]) VALUES (?, ?) - """, - list((token, group_id) for token in unblinded_tokens), - ) @with_cursor def insert_unblinded_tokens_for_voucher( @@ -435,10 +425,15 @@ class VoucherStore(object): "Cannot insert tokens for unknown voucher; add voucher first" ) - self._insert_unblinded_tokens( - cursor, - list(t.unblinded_token.decode("ascii") for t in unblinded_tokens), - group_id, + cursor.executemany( + """ + INSERT INTO [unblinded-tokens] ([token], [redemption-group]) VALUES (?, ?) + """, + list( + (token.unblinded_token.decode("ascii"), group_id) + for token + in unblinded_tokens + ), ) @with_cursor -- GitLab