From 7b4367fa25a0f29d7ab51a6cac93f0a456bcbe70 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Fri, 4 Mar 2022 17:36:46 +0000
Subject: [PATCH 1/4] Remove old "msc2403" build flag from complement.sh

This flag will no longer be required after https://github.com/matrix-org/complement/pull/331 is merged.
---
 scripts-dev/complement.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts-dev/complement.sh b/scripts-dev/complement.sh
index 0a79a4063f5a..d1b59ff0401b 100755
--- a/scripts-dev/complement.sh
+++ b/scripts-dev/complement.sh
@@ -71,4 +71,4 @@ fi
 
 # Run the tests!
 echo "Images built; running complement"
-go test -v -tags synapse_blacklist,msc2403,msc2716,msc3030 -count=1 $EXTRA_COMPLEMENT_ARGS ./tests/...
+go test -v -tags synapse_blacklist,msc2716,msc3030 -count=1 $EXTRA_COMPLEMENT_ARGS ./tests/...

From cf7bf8e1c523a9ac82b136fb8edabe8443f3b9da Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrewm@element.io>
Date: Fri, 4 Mar 2022 17:39:37 +0000
Subject: [PATCH 2/4] Remove msc2403 build flag from Complement CI

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3bce95b0e057..2216f268d9ff 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -377,7 +377,7 @@ jobs:
       # Run Complement
       - run: |
           set -o pipefail
-          go test -v -json -p 1 -tags synapse_blacklist,msc2403,msc2716,msc3030 ./tests/... 2>&1 | gotestfmt
+          go test -v -json -p 1 -tags synapse_blacklist,msc2716,msc3030 ./tests/... 2>&1 | gotestfmt
         shell: bash
         name: Run Complement Tests
         env:

From 7f41db88e6110d02b20e5be857abd2364909aa5f Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrewm@element.io>
Date: Fri, 4 Mar 2022 17:40:08 +0000
Subject: [PATCH 3/4] Remove old msc2403_enabled config flag from unit tests

---
 tests/federation/transport/test_knocking.py | 3 +--
 tests/rest/client/test_sync.py              | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/federation/transport/test_knocking.py b/tests/federation/transport/test_knocking.py
index 648a01618e8b..d21c11b716cd 100644
--- a/tests/federation/transport/test_knocking.py
+++ b/tests/federation/transport/test_knocking.py
@@ -23,7 +23,7 @@
 from synapse.types import RoomAlias
 
 from tests.test_utils import event_injection
-from tests.unittest import FederatingHomeserverTestCase, TestCase, override_config
+from tests.unittest import FederatingHomeserverTestCase, TestCase
 
 
 class KnockingStrippedStateEventHelperMixin(TestCase):
@@ -221,7 +221,6 @@ async def _check_event_auth(origin, event, context, *args, **kwargs):
 
         return super().prepare(reactor, clock, homeserver)
 
-    @override_config({"experimental_features": {"msc2403_enabled": True}})
     def test_room_state_returned_when_knocking(self):
         """
         Tests that specific, stripped state events from a room are returned after
diff --git a/tests/rest/client/test_sync.py b/tests/rest/client/test_sync.py
index 435101395204..1751e26f0842 100644
--- a/tests/rest/client/test_sync.py
+++ b/tests/rest/client/test_sync.py
@@ -341,7 +341,6 @@ def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None:
             hs, self.room_id, self.user_id
         )
 
-    @override_config({"experimental_features": {"msc2403_enabled": True}})
     def test_knock_room_state(self) -> None:
         """Tests that /sync returns state from a room after knocking on it."""
         # Knock on a room

From dd4ce329d91f9682648892e828258199291652d2 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrewm@element.io>
Date: Fri, 4 Mar 2022 17:43:00 +0000
Subject: [PATCH 4/4] Changelog

---
 changelog.d/12165.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/12165.misc

diff --git a/changelog.d/12165.misc b/changelog.d/12165.misc
new file mode 100644
index 000000000000..4b80b0562e59
--- /dev/null
+++ b/changelog.d/12165.misc
@@ -0,0 +1 @@
+Remove lingering unstable references to MSC2403 (knocking).