From 84adce8f12c71311cc295fdb0d504937cc964210 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone <exarkun@twistedmatrix.com> Date: Wed, 17 Nov 2021 22:07:30 -0500 Subject: [PATCH] fix mismerge: call the internal slot_testv_and_readv_and_writev The remote method does not expose the renew_leases parameter, intentionally. --- src/_zkapauthorizer/_storage_server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_zkapauthorizer/_storage_server.py b/src/_zkapauthorizer/_storage_server.py index 6eb263c..75c3ad4 100644 --- a/src/_zkapauthorizer/_storage_server.py +++ b/src/_zkapauthorizer/_storage_server.py @@ -378,7 +378,7 @@ class ZKAPAuthorizerStorageServer(Referenceable): validation.raise_for(required_new_passes) # Perform the operation. - result = self._original.remote_slot_testv_and_readv_and_writev( + result = self._original.slot_testv_and_readv_and_writev( storage_index, secrets, tw_vectors, -- GitLab