From 59ec076d04340245101de98633705d312374d9fe Mon Sep 17 00:00:00 2001
From: J08nY
Date: Mon, 7 Aug 2017 00:50:19 +0200
Subject: Use the KeyRevokeWorkflow when the key needs to be reset.

 - Also make workflows work, deduplicate some stuff.
---
 src/mailman_pgp/workflows/key_set.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/mailman_pgp/workflows/key_set.py')

diff --git a/src/mailman_pgp/workflows/key_set.py b/src/mailman_pgp/workflows/key_set.py
index e76e299..95e6e7c 100644
--- a/src/mailman_pgp/workflows/key_set.py
+++ b/src/mailman_pgp/workflows/key_set.py
@@ -22,7 +22,6 @@ from pgpy import PGPKey
 from public import public
 
 from mailman_pgp.database import transaction
-from mailman_pgp.model.address import PGPAddress
 
 KEY_REQUEST = """\
 ----------
@@ -51,15 +50,14 @@ class SetPubkeyMixin:
             self.pubkey = None
 
     def _step_pubkey_checks(self):
-        pgp_address = PGPAddress.for_address(self.address)
-        assert pgp_address is not None
+        assert self.pgp_address is not None
 
         if self.pubkey is None:
-            if pgp_address.key is None:
+            if self.pgp_address.key is None:
                 self.push('send_key_request')
         else:
             with transaction():
-                pgp_address.key = self.pubkey
+                self.pgp_address.key = self.pubkey
 
     def _step_send_key_request(self):
         self._set_token(TokenOwner.subscriber)
@@ -75,5 +73,4 @@ class SetPubkeyMixin:
         raise StopIteration
 
     def _step_receive_key(self):
-        self._restore_subscriber()
         self._set_token(TokenOwner.no_one)
-- 
cgit v1.2.3-70-g09d2