Consume more imports from matrix-js-sdk/src/matrix (#11449)

test/test-utils/beacon.ts

@@ -22,8 +22,9 @@ import {
     getBeaconInfoIdentifier,
     ContentHelpers,
     LocationAssetType,
+    M_BEACON,
+    M_BEACON_INFO,
 } from "matrix-js-sdk/src/matrix";
-import { M_BEACON, M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon";
 
 import { getMockGeolocationPositionError } from "./location";
 import { makeRoomWithStateEvents } from "./room";

test/test-utils/location.ts

@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { LocationAssetType, M_LOCATION } from "matrix-js-sdk/src/@types/location";
-import { MatrixEvent, EventType, ContentHelpers } from "matrix-js-sdk/src/matrix";
+import { LocationAssetType, M_LOCATION, MatrixEvent, EventType, ContentHelpers } from "matrix-js-sdk/src/matrix";
 
 let id = 1;
 export const makeLegacyLocationEvent = (geoUri: string): MatrixEvent => {

test/test-utils/poll.ts

@@ -15,15 +15,17 @@ limitations under the License.
 */
 
 import { Mocked } from "jest-mock";
-import { MatrixClient, MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
 import {
+    MatrixClient,
+    MatrixEvent,
+    Room,
     M_POLL_START,
     PollAnswer,
     M_POLL_KIND_DISCLOSED,
     M_POLL_END,
     M_POLL_RESPONSE,
-} from "matrix-js-sdk/src/@types/polls";
-import { M_TEXT } from "matrix-js-sdk/src/@types/extensible_events";
+    M_TEXT,
+} from "matrix-js-sdk/src/matrix";
 import { uuid4 } from "@sentry/utils";
 
 import { flushPromises } from "./utilities";

test/test-utils/test-utils.ts

@@ -36,13 +36,13 @@ import {
     IPushRules,
     RelationType,
     JoinRule,
+    IEventDecryptionResult,
 } from "matrix-js-sdk/src/matrix";
 import { normalize } from "matrix-js-sdk/src/utils";
 import { ReEmitter } from "matrix-js-sdk/src/ReEmitter";
 import { MediaHandler } from "matrix-js-sdk/src/webrtc/mediaHandler";
 import { Feature, ServerSupport } from "matrix-js-sdk/src/feature";
 import { CryptoBackend } from "matrix-js-sdk/src/common-crypto/CryptoBackend";
-import { IEventDecryptionResult } from "matrix-js-sdk/src/@types/crypto";
 import { MapperOpts } from "matrix-js-sdk/src/event-mapper";
 
 import type { GroupCall } from "matrix-js-sdk/src/matrix";