From c226c651f7fa2b384eed5b82018f5a892ebb745a Mon Sep 17 00:00:00 2001
From: Harshit Bansal <harshitbansal2015@gmail.com>
Date: Fri, 31 Mar 2017 18:00:05 +0000
Subject: [PATCH] actions.py: Rename `do_remove_realm_alias()` to
 `do_remove_realm_domain()`.

---
 zerver/lib/actions.py              | 2 +-
 zerver/tests/test_events.py        | 4 ++--
 zerver/tests/test_realm_aliases.py | 4 ++--
 zerver/views/realm_aliases.py      | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py
index b1cb6e4235..4e12e55d27 100644
--- a/zerver/lib/actions.py
+++ b/zerver/lib/actions.py
@@ -3240,7 +3240,7 @@ def do_change_realm_domain(alias, allow_subdomains):
                             allow_subdomains=alias.allow_subdomains))
     send_event(event, active_user_ids(alias.realm))
 
-def do_remove_realm_alias(alias):
+def do_remove_realm_domain(alias):
     # type: (RealmDomain) -> None
     realm = alias.realm
     domain = alias.domain
diff --git a/zerver/tests/test_events.py b/zerver/tests/test_events.py
index 1606f720f0..22ce79f813 100644
--- a/zerver/tests/test_events.py
+++ b/zerver/tests/test_events.py
@@ -72,7 +72,7 @@ from zerver.lib.actions import (
     do_change_enable_digest_emails,
     do_add_realm_domain,
     do_change_realm_domain,
-    do_remove_realm_alias,
+    do_remove_realm_domain,
     do_change_icon_source,
 )
 from zerver.lib.events import (
@@ -1165,7 +1165,7 @@ class EventsRegisterTest(ZulipTestCase):
             ('op', equals('remove')),
             ('domain', equals('zulip.org')),
         ])
-        events = self.do_test(lambda: do_remove_realm_alias(alias))
+        events = self.do_test(lambda: do_remove_realm_domain(alias))
         error = schema_checker('events[0]', events[0])
         self.assert_on_error(error)
 
diff --git a/zerver/tests/test_realm_aliases.py b/zerver/tests/test_realm_aliases.py
index 326adbd6c6..9e95715b1b 100644
--- a/zerver/tests/test_realm_aliases.py
+++ b/zerver/tests/test_realm_aliases.py
@@ -7,7 +7,7 @@ from typing import Optional, Text
 
 from zerver.lib.actions import do_change_is_admin, \
     do_change_realm_domain, do_create_realm, \
-    do_remove_realm_alias
+    do_remove_realm_domain
 from zerver.lib.domains import validate_domain
 from zerver.lib.test_classes import ZulipTestCase
 from zerver.models import email_allowed_for_realm, get_realm, \
@@ -111,7 +111,7 @@ class RealmDomainTest(ZulipTestCase):
 
         self.assertTrue(realm.restricted_to_domain)
         for alias in query.all():
-            do_remove_realm_alias(alias)
+            do_remove_realm_domain(alias)
         self.assertEqual(query.count(), 0)
         # Deleting last alias should set `restricted_to_domain` to False.
         # This should be tested on a fresh instance, since the cached
diff --git a/zerver/views/realm_aliases.py b/zerver/views/realm_aliases.py
index 8224bad77b..bfabad68bf 100644
--- a/zerver/views/realm_aliases.py
+++ b/zerver/views/realm_aliases.py
@@ -6,7 +6,7 @@ from django.utils.translation import ugettext as _
 
 from zerver.decorator import has_request_variables, require_realm_admin, REQ
 from zerver.lib.actions import do_add_realm_domain, do_change_realm_domain, \
-    do_remove_realm_alias, get_realm_domains
+    do_remove_realm_domain, get_realm_domains
 from zerver.lib.domains import validate_domain
 from zerver.lib.response import json_error, json_success
 from zerver.lib.validator import check_bool, check_string
@@ -52,7 +52,7 @@ def delete_alias(request, user_profile, domain):
     # type: (HttpRequest, UserProfile, Text) -> (HttpResponse)
     try:
         alias = RealmDomain.objects.get(realm=user_profile.realm, domain=domain)
-        do_remove_realm_alias(alias)
+        do_remove_realm_domain(alias)
     except RealmDomain.DoesNotExist:
         return json_error(_('No entry found for domain %(domain)s.' % {'domain': domain}))
     return json_success()