Cleanup/simplify callback functions

8 files changed, 10 insertions, 10 deletions

diff --git a/_pytest/test_everything.py b/_pytest/test_everything.py
index 5aa5138..ed045ae 100644
--- a/_pytest/test_everything.py
+++ b/_pytest/test_everything.py
@@ -10,7 +10,7 @@ def test_everything(realish_eventrouter, team):
     for fname in sorted(datafiles):
         data = json.loads(open(fname, 'r').read())
         team.ws.add(data)
-        realish_eventrouter.receive_ws_callback(team.team_hash)
+        realish_eventrouter.receive_ws_callback(team.team_hash, None)
         realish_eventrouter.handle_next()
 
     assert len(realish_eventrouter.queue) == 14
diff --git a/_pytest/test_presencechange.py b/_pytest/test_presencechange.py
index a6e9eb6..ffe28c9 100644
--- a/_pytest/test_presencechange.py
+++ b/_pytest/test_presencechange.py
@@ -12,7 +12,7 @@ def test_PresenceChange(realish_eventrouter, team, user_alice):
         "user": user_alice.identifier,
         "presence": "away",
     })
-    realish_eventrouter.receive_ws_callback(team.team_hash)
+    realish_eventrouter.receive_ws_callback(team.team_hash, None)
 
     realish_eventrouter.handle_next()
     assert user_alice.presence == "active"
diff --git a/_pytest/test_process_message.py b/_pytest/test_process_message.py
index eff81d4..1a1ab37 100644
--- a/_pytest/test_process_message.py
+++ b/_pytest/test_process_message.py
@@ -21,7 +21,7 @@ def test_process_message(realish_eventrouter, team, user_alice):
         m["user"] = user_alice.id
         team.ws.add(m)
 
-    realish_eventrouter.receive_ws_callback(team.team_hash)
+    realish_eventrouter.receive_ws_callback(team.team_hash, None)
     realish_eventrouter.handle_next()
     realish_eventrouter.handle_next()
     realish_eventrouter.handle_next()
diff --git a/_pytest/test_processreply.py b/_pytest/test_processreply.py
index 8b95e11..59ff560 100644
--- a/_pytest/test_processreply.py
+++ b/_pytest/test_processreply.py
@@ -8,7 +8,7 @@ def test_process_reply(realish_eventrouter, team, channel_general):
     message_text = 'reply test'
     channel_general.send_message(message_text)
     team.ws.add({'reply_to': 1, '_team': team.team_hash, 'ts': str(message_ts)})
-    realish_eventrouter.receive_ws_callback(team.team_hash)
+    realish_eventrouter.receive_ws_callback(team.team_hash, None)
     realish_eventrouter.handle_next()
 
     assert message_ts in channel_general.messages
diff --git a/_pytest/test_processsubteamcreated.py b/_pytest/test_processsubteamcreated.py
index 6c2bb35..299ac6f 100644
--- a/_pytest/test_processsubteamcreated.py
+++ b/_pytest/test_processsubteamcreated.py
@@ -9,7 +9,7 @@ def test_process_subteam_created(realish_eventrouter, team):
     datafile = '_pytest/data/websocket/1483975206.59-subteam_created.json'
     data = json.loads(open(datafile, 'r').read())
     team.ws.add(data)
-    realish_eventrouter.receive_ws_callback(team.team_hash)
+    realish_eventrouter.receive_ws_callback(team.team_hash, None)
     realish_eventrouter.handle_next()
 
     assert len(team.subteams) == 2
diff --git a/_pytest/test_processsubteamupdated.py b/_pytest/test_processsubteamupdated.py
index 94c6054..e3eb824 100644
--- a/_pytest/test_processsubteamupdated.py
+++ b/_pytest/test_processsubteamupdated.py
@@ -9,7 +9,7 @@ def test_process_subteam_self_updated(realish_eventrouter, team):
     datafile = '_pytest/data/websocket/1483975206.59-subteam_updated.json'
     data = json.loads(open(datafile, 'r').read())
     team.ws.add(data)
-    realish_eventrouter.receive_ws_callback(team.team_hash)
+    realish_eventrouter.receive_ws_callback(team.team_hash, None)
     realish_eventrouter.handle_next()
     subteam = team.subteams['TGX0ALBK3']
 
diff --git a/_pytest/test_processteamjoin.py b/_pytest/test_processteamjoin.py
index 8e83458..f965bbb 100644
--- a/_pytest/test_processteamjoin.py
+++ b/_pytest/test_processteamjoin.py
@@ -12,7 +12,7 @@ def test_process_team_join(realish_eventrouter, team):
     datafile = '_pytest/data/websocket/1485975606.59-team_join.json'
     data = json.loads(open(datafile, 'r').read())
     team.ws.add(data)
-    realish_eventrouter.receive_ws_callback(team.team_hash)
+    realish_eventrouter.receive_ws_callback(team.team_hash, None)
     realish_eventrouter.handle_next()
 
     assert len(team.users) == 4
diff --git a/_pytest/test_thread.py b/_pytest/test_thread.py
index 1eea31f..6567065 100644
--- a/_pytest/test_thread.py
+++ b/_pytest/test_thread.py
@@ -12,7 +12,7 @@ def test_message_has_thread_suffix(realish_eventrouter, team, channel_general):
     datafile = '_pytest/data/websocket/1485975824.48-message.json'
     data = json.loads(open(datafile).read())
     team.ws.add(data)
-    realish_eventrouter.receive_ws_callback(team.team_hash)
+    realish_eventrouter.receive_ws_callback(team.team_hash, None)
     realish_eventrouter.handle_next()
 
     message_text = channel_general.messages[thread_ts].message_json['_rendered_text']
@@ -21,7 +21,7 @@ def test_message_has_thread_suffix(realish_eventrouter, team, channel_general):
     datafile = '_pytest/data/websocket/1485975836.23-message.json'
     data = json.loads(open(datafile).read())
     team.ws.add(data)
-    realish_eventrouter.receive_ws_callback(team.team_hash)
+    realish_eventrouter.receive_ws_callback(team.team_hash, None)
     realish_eventrouter.handle_next()
 
     message_text = channel_general.messages[thread_ts].message_json['_rendered_text']
@@ -30,7 +30,7 @@ def test_message_has_thread_suffix(realish_eventrouter, team, channel_general):
     datafile = '_pytest/data/websocket/1485975842.1-message.json'
     data = json.loads(open(datafile).read())
     team.ws.add(data)
-    realish_eventrouter.receive_ws_callback(team.team_hash)
+    realish_eventrouter.receive_ws_callback(team.team_hash, None)
     realish_eventrouter.handle_next()
 
     message_text = channel_general.messages[thread_ts].message_json['_rendered_text']