From b3464e0cb7dc9941e690de2ef3b24fba8bd69572 Mon Sep 17 00:00:00 2001
From: Kisaragi Marine <kisaragi.effective@gmail.com>
Date: Fri, 21 Jun 2024 05:10:01 +0900
Subject: [PATCH] =?UTF-8?q?Revert=20"=E4=BD=95=E6=95=85=E3=81=8B=E3=81=86?=
 =?UTF-8?q?=E3=81=BE=E3=81=8F=E8=A1=8C=E3=81=8B=E3=81=AA=E3=81=84=E3=81=AE?=
 =?UTF-8?q?=E3=81=A7=E3=80=81=E3=81=A8=E3=82=8A=E3=81=82=E3=81=88=E3=81=9A?=
 =?UTF-8?q?XOR=E3=81=97=E3=81=A6=E3=81=BF=E3=82=8B"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 48cf32c930924840d0892af92d71b9437acb5844.
---
 packages/backend/test/utils.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/backend/test/utils.ts b/packages/backend/test/utils.ts
index da0a54cf33..a04a20c478 100644
--- a/packages/backend/test/utils.ts
+++ b/packages/backend/test/utils.ts
@@ -17,7 +17,6 @@ import { validateContentTypeSetAsActivityPub } from '@/core/activitypub/misc/val
 import { entities } from '../src/postgres.js';
 import { loadConfig } from '../src/config.js';
 import type * as misskey from 'misskey-js';
-import { ApiError } from "@/server/api/error.js";
 
 export { server as startServer, jobQueue as startJobQueue } from '@/boot/common.js';
 
@@ -67,13 +66,10 @@ export const failedApiCall = async <E extends keyof misskey.Endpoints, P extends
 	return res.body;
 };
 
-type Without<T, U> = { [P in Exclude<keyof T, keyof U>]?: never };
-type XOR<T, U> = (T | U) extends object ? (Without<T, U> & U) | (Without<U, T> & T) : T | U;
-
 export const api = async <E extends keyof misskey.Endpoints>(path: E, params: misskey.Endpoints[E]['req'], me?: UserToken): Promise<{
 	status: number,
 	headers: Headers,
-	body: XOR<misskey.Endpoints[E]['res'], { error: ApiError }>
+	body: misskey.Endpoints[E]['res']
 }> => {
 	const bodyAuth: Record<string, string> = {};
 	const headers: Record<string, string> = {