4 files changed, 13 insertions, 11 deletions
diff --git a/src/mailman/rest/members.py b/src/mailman/rest/members.py
index ed2246366..fd9f141cc 100644
--- a/src/mailman/rest/members.py
+++ b/src/mailman/rest/members.py
@@ -25,9 +25,9 @@ from mailman.interfaces.listmanager import IListManager
 from mailman.interfaces.member import (
     AlreadySubscribedError, DeliveryMode, MemberRole, MembershipError,
     MembershipIsBannedError, MissingPreferredAddressError)
-from mailman.interfaces.workflowmanager import IWorkflowManager
 from mailman.interfaces.subscriptions import (
-    ISubscriptionService, RequestRecord, SubscriptionPendingError, TokenOwner)
+    ISubscriptionManager, ISubscriptionService, RequestRecord,
+    SubscriptionPendingError, TokenOwner)
 from mailman.interfaces.user import IUser, UnverifiedAddressError
 from mailman.interfaces.usermanager import IUserManager
 from mailman.rest.helpers import (
@@ -253,7 +253,8 @@ class AllMembers(_MemberBase):
             # Now we can run the registration process until either the
             # subscriber is subscribed, or the workflow is paused for
             # verification, confirmation, or approval.
-            registrar = getAdapter(mlist, IWorkflowManager, name='subscribe')
+            registrar = getAdapter(
+                mlist, ISubscriptionManager, name='subscribe')
             try:
                 token, token_owner, member = registrar.register(
                     subscriber,
diff --git a/src/mailman/rest/sub_moderation.py b/src/mailman/rest/sub_moderation.py
index f37e62ac5..273d4c3a0 100644
--- a/src/mailman/rest/sub_moderation.py
+++ b/src/mailman/rest/sub_moderation.py
@@ -23,7 +23,7 @@ from mailman.core.i18n import _
 from mailman.interfaces.action import Action
 from mailman.interfaces.member import AlreadySubscribedError
 from mailman.interfaces.pending import IPendings
-from mailman.interfaces.workflowmanager import IWorkflowManager
+from mailman.interfaces.subscriptions import ISubscriptionManager
 from mailman.rest.helpers import (
     CollectionMixin, bad_request, child, conflict, etag, no_content,
     not_found, okay)
@@ -55,7 +55,7 @@ class IndividualRequest(_ModerationBase):
         super().__init__()
         self._mlist = mlist
         self._registrar = getAdapter(
-            self._mlist, IWorkflowManager, name='subscribe')
+            self._mlist, ISubscriptionManager, name='subscribe')
         self._token = token
 
     def on_get(self, request, response):
diff --git a/src/mailman/rest/tests/test_membership.py b/src/mailman/rest/tests/test_membership.py
index 2726a480f..9e5a486f3 100644
--- a/src/mailman/rest/tests/test_membership.py
+++ b/src/mailman/rest/tests/test_membership.py
@@ -25,8 +25,7 @@ from mailman.database.transaction import transaction
 from mailman.interfaces.bans import IBanManager
 from mailman.interfaces.mailinglist import SubscriptionPolicy
 from mailman.interfaces.member import DeliveryMode, MemberRole
-from mailman.interfaces.workflowmanager import IWorkflowManager
-from mailman.interfaces.subscriptions import TokenOwner
+from mailman.interfaces.subscriptions import ISubscriptionManager, TokenOwner
 from mailman.interfaces.usermanager import IUserManager
 from mailman.runners.incoming import IncomingRunner
 from mailman.testing.helpers import (
@@ -215,7 +214,8 @@ class TestMembership(unittest.TestCase):
     def test_duplicate_pending_subscription(self):
         # Issue #199 - a member's subscription is already pending and they try
         # to subscribe again.
-        registrar = getAdapter(self._mlist, IWorkflowManager, name='subscribe')
+        registrar = getAdapter(
+            self._mlist, ISubscriptionManager, name='subscribe')
         with transaction():
             self._mlist.subscription_policy = SubscriptionPolicy.moderate
             anne = self._usermanager.create_address('anne@example.com')
@@ -238,7 +238,8 @@ class TestMembership(unittest.TestCase):
         # Issue #199 - a member's subscription is already pending and they try
         # to subscribe again.  Unlike above, this pend is waiting for the user
         # to confirm their subscription.
-        registrar = getAdapter(self._mlist, IWorkflowManager, name='subscribe')
+        registrar = getAdapter(
+            self._mlist, ISubscriptionManager, name='subscribe')
         with transaction():
             self._mlist.subscription_policy = (
                 SubscriptionPolicy.confirm_then_moderate)
diff --git a/src/mailman/rest/tests/test_moderation.py b/src/mailman/rest/tests/test_moderation.py
index 1adc1aa83..374398502 100644
--- a/src/mailman/rest/tests/test_moderation.py
+++ b/src/mailman/rest/tests/test_moderation.py
@@ -24,7 +24,7 @@ from mailman.app.moderator import hold_message
 from mailman.database.transaction import transaction
 from mailman.interfaces.bans import IBanManager
 from mailman.interfaces.mailinglist import SubscriptionPolicy
-from mailman.interfaces.workflowmanager import IWorkflowManager
+from mailman.interfaces.subscriptions import ISubscriptionManager
 from mailman.interfaces.requests import IListRequests, RequestType
 from mailman.interfaces.usermanager import IUserManager
 from mailman.testing.helpers import (
@@ -151,7 +151,7 @@ class TestSubscriptionModeration(unittest.TestCase):
         with transaction():
             self._mlist = create_list('ant@example.com')
             self._registrar = getAdapter(
-                self._mlist, IWorkflowManager, name='subscribe')
+                self._mlist, ISubscriptionManager, name='subscribe')
             manager = getUtility(IUserManager)
             self._anne = manager.create_address(
                 'anne@example.com', 'Anne Person')