From 566ac40939404649d58c053e97dba75810f95339 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Tue, 24 Sep 2019 17:01:09 +0100
Subject: [PATCH] remove unused parameter to get_user_id_by_threepid (#6099)

Added in #5377, apparently in error
---
 changelog.d/6099.misc           | 1 +
 synapse/storage/registration.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/6099.misc

diff --git a/changelog.d/6099.misc b/changelog.d/6099.misc
new file mode 100644
index 000000000000..8415c6759b12
--- /dev/null
+++ b/changelog.d/6099.misc
@@ -0,0 +1 @@
+Remove unused parameter to get_user_id_by_threepid.
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py
index 805411a6b299..5cf2c893aa4f 100644
--- a/synapse/storage/registration.py
+++ b/synapse/storage/registration.py
@@ -495,7 +495,7 @@ def _find_next_generated_user_id(txn):
         )
 
     @defer.inlineCallbacks
-    def get_user_id_by_threepid(self, medium, address, require_verified=False):
+    def get_user_id_by_threepid(self, medium, address):
         """Returns user id from threepid
 
         Args: