Remove completely unused concepts from codebase

Removes device_id and ClientInfo

device_id is never actually written, and the matrix.org DB has no
non-null entries for it. Right now, it's just cluttering up code.

This doesn't remove the columns from the database, because that's
fiddly.

7 files changed, 4 insertions, 20 deletions

diff --git a/tests/api/test_auth.py b/tests/api/test_auth.py
index 3343c635cc..777eb0395e 100644
--- a/tests/api/test_auth.py
+++ b/tests/api/test_auth.py
@@ -40,7 +40,6 @@ class AuthTestCase(unittest.TestCase):
         self.store.get_app_service_by_token = Mock(return_value=None)
         user_info = {
             "name": self.test_user,
-            "device_id": "nothing",
             "token_id": "ditto",
             "admin": False
         }
@@ -49,7 +48,7 @@ class AuthTestCase(unittest.TestCase):
         request = Mock(args={})
         request.args["access_token"] = [self.test_token]
         request.requestHeaders.getRawHeaders = Mock(return_value=[""])
-        (user, info) = yield self.auth.get_user_by_req(request)
+        (user, _) = yield self.auth.get_user_by_req(request)
         self.assertEquals(user.to_string(), self.test_user)
 
     def test_get_user_by_req_user_bad_token(self):
@@ -66,7 +65,6 @@ class AuthTestCase(unittest.TestCase):
         self.store.get_app_service_by_token = Mock(return_value=None)
         user_info = {
             "name": self.test_user,
-            "device_id": "nothing",
             "token_id": "ditto",
             "admin": False
         }
@@ -86,7 +84,7 @@ class AuthTestCase(unittest.TestCase):
         request = Mock(args={})
         request.args["access_token"] = [self.test_token]
         request.requestHeaders.getRawHeaders = Mock(return_value=[""])
-        (user, info) = yield self.auth.get_user_by_req(request)
+        (user, _) = yield self.auth.get_user_by_req(request)
         self.assertEquals(user.to_string(), self.test_user)
 
     def test_get_user_by_req_appservice_bad_token(self):
@@ -121,7 +119,7 @@ class AuthTestCase(unittest.TestCase):
         request.args["access_token"] = [self.test_token]
         request.args["user_id"] = [masquerading_user_id]
         request.requestHeaders.getRawHeaders = Mock(return_value=[""])
-        (user, info) = yield self.auth.get_user_by_req(request)
+        (user, _) = yield self.auth.get_user_by_req(request)
         self.assertEquals(user.to_string(), masquerading_user_id)
 
     def test_get_user_by_req_appservice_valid_token_bad_user_id(self):
diff --git a/tests/rest/client/v1/test_presence.py b/tests/rest/client/v1/test_presence.py
index 0b78a82a66..4039a86d85 100644
--- a/tests/rest/client/v1/test_presence.py
+++ b/tests/rest/client/v1/test_presence.py
@@ -74,7 +74,6 @@ class PresenceStateTestCase(unittest.TestCase):
             return {
                 "user": UserID.from_string(myid),
                 "admin": False,
-                "device_id": None,
                 "token_id": 1,
             }
 
@@ -163,7 +162,6 @@ class PresenceListTestCase(unittest.TestCase):
             return {
                 "user": UserID.from_string(myid),
                 "admin": False,
-                "device_id": None,
                 "token_id": 1,
             }
 
diff --git a/tests/rest/client/v1/test_rooms.py b/tests/rest/client/v1/test_rooms.py
index 2e55cc08a1..dd1e67e0f9 100644
--- a/tests/rest/client/v1/test_rooms.py
+++ b/tests/rest/client/v1/test_rooms.py
@@ -58,7 +58,6 @@ class RoomPermissionsTestCase(RestTestCase):
             return {
                 "user": UserID.from_string(self.auth_user_id),
                 "admin": False,
-                "device_id": None,
                 "token_id": 1,
             }
         hs.get_v1auth().get_user_by_access_token = _get_user_by_access_token
@@ -445,7 +444,6 @@ class RoomsMemberListTestCase(RestTestCase):
             return {
                 "user": UserID.from_string(self.auth_user_id),
                 "admin": False,
-                "device_id": None,
                 "token_id": 1,
             }
         hs.get_v1auth().get_user_by_access_token = _get_user_by_access_token
@@ -525,7 +523,6 @@ class RoomsCreateTestCase(RestTestCase):
             return {
                 "user": UserID.from_string(self.auth_user_id),
                 "admin": False,
-                "device_id": None,
                 "token_id": 1,
             }
         hs.get_v1auth().get_user_by_access_token = _get_user_by_access_token
@@ -618,7 +615,6 @@ class RoomTopicTestCase(RestTestCase):
             return {
                 "user": UserID.from_string(self.auth_user_id),
                 "admin": False,
-                "device_id": None,
                 "token_id": 1,
             }
 
@@ -725,7 +721,6 @@ class RoomMemberStateTestCase(RestTestCase):
             return {
                 "user": UserID.from_string(self.auth_user_id),
                 "admin": False,
-                "device_id": None,
                 "token_id": 1,
             }
         hs.get_v1auth().get_user_by_access_token = _get_user_by_access_token
@@ -852,7 +847,6 @@ class RoomMessagesTestCase(RestTestCase):
             return {
                 "user": UserID.from_string(self.auth_user_id),
                 "admin": False,
-                "device_id": None,
                 "token_id": 1,
             }
         hs.get_v1auth().get_user_by_access_token = _get_user_by_access_token
@@ -949,7 +943,6 @@ class RoomInitialSyncTestCase(RestTestCase):
             return {
                 "user": UserID.from_string(self.auth_user_id),
                 "admin": False,
-                "device_id": None,
                 "token_id": 1,
             }
         hs.get_v1auth().get_user_by_access_token = _get_user_by_access_token
diff --git a/tests/rest/client/v1/test_typing.py b/tests/rest/client/v1/test_typing.py
index dc8bbaaf0e..0f70ce81dc 100644
--- a/tests/rest/client/v1/test_typing.py
+++ b/tests/rest/client/v1/test_typing.py
@@ -65,7 +65,6 @@ class RoomTypingTestCase(RestTestCase):
             return {
                 "user": UserID.from_string(self.auth_user_id),
                 "admin": False,
-                "device_id": None,
                 "token_id": 1,
             }
 
diff --git a/tests/rest/client/v2_alpha/__init__.py b/tests/rest/client/v2_alpha/__init__.py
index 15568b36cd..badb59f080 100644
--- a/tests/rest/client/v2_alpha/__init__.py
+++ b/tests/rest/client/v2_alpha/__init__.py
@@ -47,7 +47,6 @@ class V2AlphaRestTestCase(unittest.TestCase):
             return {
                 "user": UserID.from_string(self.USER_ID),
                 "admin": False,
-                "device_id": None,
                 "token_id": 1,
             }
         hs.get_auth().get_user_by_access_token = _get_user_by_access_token
diff --git a/tests/storage/test_registration.py b/tests/storage/test_registration.py
index a4f929796a..54fe10d58f 100644
--- a/tests/storage/test_registration.py
+++ b/tests/storage/test_registration.py
@@ -54,7 +54,6 @@ class RegistrationStoreTestCase(unittest.TestCase):
         self.assertDictContainsSubset(
             {
                 "admin": 0,
-                 "device_id": None,
                  "name": self.user_id,
             },
             result
@@ -72,7 +71,6 @@ class RegistrationStoreTestCase(unittest.TestCase):
         self.assertDictContainsSubset(
             {
                 "admin": 0,
-                 "device_id": None,
                  "name": self.user_id,
             },
             result
diff --git a/tests/utils.py b/tests/utils.py
index d0fba2252d..ff560ef342 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -282,7 +282,6 @@ class MemoryDataStore(object):
             return {
                 "name": self.tokens_to_users[token],
                 "admin": 0,
-                "device_id": None,
             }
         except:
             raise StoreError(400, "User does not exist.")
@@ -380,7 +379,7 @@ class MemoryDataStore(object):
     def get_ops_levels(self, room_id):
         return defer.succeed((5, 5, 5))
 
-    def insert_client_ip(self, user, device_id, access_token, ip, user_agent):
+    def insert_client_ip(self, user, access_token, ip, user_agent):
         return defer.succeed(None)