From e31588c5f61cf5d3d3c396827fb1a6a6b30d4d6e Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 9 Feb 2020 18:40:56 +0000
Subject: [PATCH 1/2] remove checks on m.room.aliases

---
 tests/30rooms/60version_upgrade.pl | 42 ++++++++++++++++--------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/tests/30rooms/60version_upgrade.pl b/tests/30rooms/60version_upgrade.pl
index 51f5f37f9..b06b67921 100644
--- a/tests/30rooms/60version_upgrade.pl
+++ b/tests/30rooms/60version_upgrade.pl
@@ -697,19 +697,21 @@ sub upgrade_room_synced {
             $creator, $room_id,
             new_version => $TEST_NEW_VERSION,
             expected_event_counts => {
-               'm.room.aliases' => 1, 'm.room.canonical_alias' => 1,
+               'm.room.aliases' => 0, 'm.room.canonical_alias' => 1,
             },
          );
       })->then( sub {
          ( $new_room_id ) = @_;
 
-         matrix_get_room_state(
-            $creator, $room_id,
-            type=>'m.room.aliases', state_key=>$server_name,
-         );
-      })->then( sub {
-         my ( $old_aliases ) = @_;
-         assert_deeply_eq( $old_aliases, {aliases => []}, "aliases on old room" );
+      # m.room.aliases are filtered out until MSC2261 lands
+      #
+      #    matrix_get_room_state(
+      #       $creator, $room_id,
+      #       type=>'m.room.aliases', state_key=>$server_name,
+      #    );
+      # })->then( sub {
+      #    my ( $old_aliases ) = @_;
+      #    assert_deeply_eq( $old_aliases, {aliases => []}, "aliases on old room" );
 
          matrix_get_room_state( $creator, $room_id, type=>'m.room.canonical_alias' );
       })->then( sub {
@@ -718,17 +720,19 @@ sub upgrade_room_synced {
             $old_canonical_alias, {}, "canonical_alias on old room",
          );
 
-         matrix_get_room_state(
-            $creator, $new_room_id,
-            type=>'m.room.aliases', state_key=>$server_name,
-         );
-      })->then( sub {
-         my ( $new_aliases ) = @_;
-         assert_deeply_eq(
-            [ sort( @{ $new_aliases->{aliases} } ) ],
-            [ sort( $room_alias_1, $room_alias_2 ) ],
-            "aliases on new room",
-         );
+      # m.room.aliases are filtered out until MSC2261 lands
+      #
+      #    matrix_get_room_state(
+      #       $creator, $new_room_id,
+      #       type=>'m.room.aliases', state_key=>$server_name,
+      #    );
+      # })->then( sub {
+      #    my ( $new_aliases ) = @_;
+      #    assert_deeply_eq(
+      #       [ sort( @{ $new_aliases->{aliases} } ) ],
+      #       [ sort( $room_alias_1, $room_alias_2 ) ],
+      #       "aliases on new room",
+      #    );
 
          matrix_get_room_state(
             $creator, $new_room_id, type=>'m.room.canonical_alias',

From a24c8eb16dcb0bea26617f99673a9175529b7e19 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Mon, 10 Feb 2020 00:06:18 +0000
Subject: [PATCH 2/2] Correct wording

redaction is neither necessary nor sufficent for this filter to be removed
---
 tests/30rooms/60version_upgrade.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/30rooms/60version_upgrade.pl b/tests/30rooms/60version_upgrade.pl
index b06b67921..0f1c8e0f5 100644
--- a/tests/30rooms/60version_upgrade.pl
+++ b/tests/30rooms/60version_upgrade.pl
@@ -703,7 +703,7 @@ sub upgrade_room_synced {
       })->then( sub {
          ( $new_room_id ) = @_;
 
-      # m.room.aliases are filtered out until MSC2261 lands
+      # m.room.aliases are filtered out until a better solution to mitigating abuse is is specced.
       #
       #    matrix_get_room_state(
       #       $creator, $room_id,
@@ -720,7 +720,7 @@ sub upgrade_room_synced {
             $old_canonical_alias, {}, "canonical_alias on old room",
          );
 
-      # m.room.aliases are filtered out until MSC2261 lands
+      # m.room.aliases are filtered out until a better solution to mitigating abuse is is specced.
       #
       #    matrix_get_room_state(
       #       $creator, $new_room_id,