Skip to content

Commit 0644ba3

Browse files
TarnadasTarnadas
committed
fix: tests
1 parent ab809dd commit 0644ba3

File tree

4 files changed

+104
-23
lines changed

4 files changed

+104
-23
lines changed

‎api/src/routes/admin.ts‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@ const customDomainOverrideSchema = z.object({
160160
app.post("/dex/:id/broker-id", async c => {
161161
const id = c.req.param("id");
162162
const body = await c.req.json();
163-
const { brokerId } = brokerIdSchema.parse(body);
164163

165164
try {
165+
const { brokerId } = brokerIdSchema.parse(body);
166166
const dex = await getDexById(id);
167167
if (!dex) {
168168
return c.json({ message: "DEX not found" }, 404);
@@ -216,6 +216,9 @@ app.post("/dex/:id/broker-id", async c => {
216216

217217
return c.json(updatedDex);
218218
} catch (error) {
219+
if (error && typeof error === "object" && "issues" in error) {
220+
return c.json({ error: (error as { issues: unknown }).issues }, 400);
221+
}
219222
console.error("Error updating broker ID:", error);
220223
return c.json(
221224
{ message: "Error updating broker ID", error: String(error) },
@@ -612,6 +615,12 @@ app.post("/dex/:dexId/create-broker", async c => {
612615
},
613616
});
614617
} catch (error) {
618+
if (error && typeof error === "object" && "issues" in error) {
619+
return c.json(
620+
{ success: false, error: (error as { issues: unknown }).issues },
621+
{ status: 400 }
622+
);
623+
}
615624
console.error("Error in admin manual broker creation:", error);
616625
return c.json(
617626
{

‎api/tests/routes/admin.test.ts‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,10 @@ describe("Admin Routes", () => {
216216

217217
const requestBody = {
218218
brokerId: "testbroker123",
219-
makerFee: 30,
220-
takerFee: 60,
219+
makerFee: 10,
220+
takerFee: 10,
221+
rwaMakerFee: 5,
222+
rwaTakerFee: 10,
221223
txHash: "0x1234567890abcdef1234567890abcdef12345678",
222224
};
223225

@@ -247,8 +249,10 @@ describe("Admin Routes", () => {
247249

248250
const requestBody = {
249251
brokerId: "newbroker123",
250-
makerFee: 30,
251-
takerFee: 60,
252+
makerFee: 10,
253+
takerFee: 10,
254+
rwaMakerFee: 5,
255+
rwaTakerFee: 10,
252256
txHash: "0x1234567890abcdef1234567890abcdef12345678",
253257
};
254258

@@ -279,8 +283,10 @@ describe("Admin Routes", () => {
279283

280284
const requestBody = {
281285
brokerId: "takenbroker123",
282-
makerFee: 30,
283-
takerFee: 60,
286+
makerFee: 10,
287+
takerFee: 10,
288+
rwaMakerFee: 5,
289+
rwaTakerFee: 10,
284290
txHash: "0x1234567890abcdef1234567890abcdef12345678",
285291
};
286292

@@ -305,8 +311,10 @@ describe("Admin Routes", () => {
305311

306312
const requestBody = {
307313
brokerId: "testbroker123",
308-
makerFee: 30,
309-
takerFee: 60,
314+
makerFee: 10,
315+
takerFee: 10,
316+
rwaMakerFee: 5,
317+
rwaTakerFee: 10,
310318
txHash: "0x1234567890abcdef1234567890abcdef12345678",
311319
};
312320

@@ -330,8 +338,10 @@ describe("Admin Routes", () => {
330338

331339
const requestBody = {
332340
brokerId: "INVALID_BROKER_ID",
333-
makerFee: 30,
334-
takerFee: 60,
341+
makerFee: 10,
342+
takerFee: 10,
343+
rwaMakerFee: 5,
344+
rwaTakerFee: 10,
335345
txHash: "0x1234567890abcdef1234567890abcdef12345678",
336346
};
337347

@@ -356,7 +366,9 @@ describe("Admin Routes", () => {
356366
const requestBody = {
357367
brokerId: "testbroker123",
358368
makerFee: -10,
359-
takerFee: 200,
369+
takerFee: 10,
370+
rwaMakerFee: 5,
371+
rwaTakerFee: 10,
360372
txHash: "0x1234567890abcdef1234567890abcdef12345678",
361373
};
362374

‎api/tests/routes/graduation.test.ts‎

Lines changed: 48 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,12 @@ describe("Graduation Routes", () => {
4444
const graduationData = {
4545
txHash,
4646
chain: "ethereum",
47+
chainId: 1,
4748
brokerId: createMockBrokerId(),
4849
makerFee: 10,
49-
takerFee: 30,
50+
takerFee: 10,
51+
rwaMakerFee: 5,
52+
rwaTakerFee: 10,
5053
paymentType: "order" as const,
5154
};
5255

@@ -78,9 +81,12 @@ describe("Graduation Routes", () => {
7881
txHash:
7982
"0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
8083
chain: "ethereum",
84+
chainId: 1,
8185
brokerId: "INVALID_BROKER_ID!",
8286
makerFee: 10,
83-
takerFee: 30,
87+
takerFee: 10,
88+
rwaMakerFee: 5,
89+
rwaTakerFee: 10,
8490
paymentType: "order" as const,
8591
};
8692

@@ -106,9 +112,12 @@ describe("Graduation Routes", () => {
106112
txHash:
107113
"0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
108114
chain: "ethereum",
115+
chainId: 1,
109116
brokerId: "my-orderly-dex",
110117
makerFee: 10,
111-
takerFee: 30,
118+
takerFee: 10,
119+
rwaMakerFee: 5,
120+
rwaTakerFee: 10,
112121
paymentType: "order" as const,
113122
};
114123

@@ -136,9 +145,12 @@ describe("Graduation Routes", () => {
136145
txHash:
137146
"0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
138147
chain: "ethereum",
148+
chainId: 1,
139149
brokerId: createMockBrokerId(),
140150
makerFee: 200,
141151
takerFee: 10,
152+
rwaMakerFee: 5,
153+
rwaTakerFee: 10,
142154
paymentType: "order" as const,
143155
};
144156

@@ -159,6 +171,7 @@ describe("Graduation Routes", () => {
159171
txHash:
160172
"0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
161173
chain: "ethereum",
174+
chainId: 1,
162175
paymentType: "order" as const,
163176
};
164177

@@ -179,9 +192,12 @@ describe("Graduation Routes", () => {
179192
txHash:
180193
"0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
181194
chain: "ethereum",
195+
chainId: 1,
182196
brokerId: createMockBrokerId(),
183197
makerFee: 10,
184-
takerFee: 30,
198+
takerFee: 10,
199+
rwaMakerFee: 5,
200+
rwaTakerFee: 10,
185201
paymentType: "order" as const,
186202
};
187203

@@ -219,18 +235,24 @@ describe("Graduation Routes", () => {
219235
const graduationData1 = {
220236
txHash: txHash1,
221237
chain: "ethereum",
238+
chainId: 1,
222239
brokerId: sameBrokerId,
223240
makerFee: 10,
224-
takerFee: 30,
241+
takerFee: 10,
242+
rwaMakerFee: 5,
243+
rwaTakerFee: 10,
225244
paymentType: "order" as const,
226245
};
227246

228247
const graduationData2 = {
229248
txHash: txHash2,
230249
chain: "ethereum",
250+
chainId: 1,
231251
brokerId: sameBrokerId,
232252
makerFee: 10,
233-
takerFee: 30,
253+
takerFee: 10,
254+
rwaMakerFee: 5,
255+
rwaTakerFee: 10,
234256
paymentType: "order" as const,
235257
};
236258

@@ -277,18 +299,24 @@ describe("Graduation Routes", () => {
277299
const graduationData1 = {
278300
txHash: txHash1,
279301
chain: "ethereum",
302+
chainId: 1,
280303
brokerId: createMockBrokerId(),
281304
makerFee: 10,
282-
takerFee: 30,
305+
takerFee: 10,
306+
rwaMakerFee: 5,
307+
rwaTakerFee: 10,
283308
paymentType: "order" as const,
284309
};
285310

286311
const graduationData2 = {
287312
txHash: txHash2,
288313
chain: "ethereum",
314+
chainId: 1,
289315
brokerId: createMockBrokerId(),
290316
makerFee: 10,
291-
takerFee: 30,
317+
takerFee: 10,
318+
rwaMakerFee: 5,
319+
rwaTakerFee: 10,
292320
paymentType: "order" as const,
293321
};
294322

@@ -315,9 +343,12 @@ describe("Graduation Routes", () => {
315343
const graduationData1 = {
316344
txHash,
317345
chain: "ethereum",
346+
chainId: 1,
318347
brokerId: createMockBrokerId(),
319348
makerFee: 10,
320-
takerFee: 30,
349+
takerFee: 10,
350+
rwaMakerFee: 5,
351+
rwaTakerFee: 10,
321352
paymentType: "order" as const,
322353
};
323354

@@ -339,9 +370,12 @@ describe("Graduation Routes", () => {
339370
const graduationData2 = {
340371
txHash,
341372
chain: "ethereum",
373+
chainId: 1,
342374
brokerId: createMockBrokerId(),
343375
makerFee: 10,
344-
takerFee: 30,
376+
takerFee: 10,
377+
rwaMakerFee: 5,
378+
rwaTakerFee: 10,
345379
paymentType: "order" as const,
346380
};
347381

@@ -369,9 +403,12 @@ describe("Graduation Routes", () => {
369403
txHash:
370404
"0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
371405
chain: "ethereum",
406+
chainId: 1,
372407
brokerId: createMockBrokerId(),
373408
makerFee: 10,
374-
takerFee: 30,
409+
takerFee: 10,
410+
rwaMakerFee: 5,
411+
rwaTakerFee: 10,
375412
paymentType: "order" as const,
376413
};
377414

‎api/tests/utils/test-app.ts‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,11 @@ vi.mock("../../src/lib/rateLimiter", () => ({
152152
recordRequest: vi.fn(),
153153
getRemainingCooldown: vi.fn().mockReturnValue(0),
154154
},
155+
fineTuneRateLimiter: {
156+
isRateLimited: vi.fn().mockReturnValue(false),
157+
recordRequest: vi.fn(),
158+
getRemainingCooldown: vi.fn().mockReturnValue(0),
159+
},
155160
createDeploymentRateLimit: vi.fn().mockReturnValue(
156161
vi.fn().mockImplementation(async (c, next) => {
157162
await next();
@@ -233,6 +238,18 @@ vi.mock("../../src/models/graduation", () => ({
233238
takerFee: 6,
234239
});
235240
}),
241+
getDexBrokerTier: vi.fn().mockImplementation(async () => {
242+
return Promise.resolve({
243+
success: true,
244+
data: { tier: "standard", makerFee: 3, takerFee: 6 },
245+
});
246+
}),
247+
invalidateDexFeesCache: vi.fn().mockImplementation(async () => {
248+
return Promise.resolve({
249+
success: true,
250+
data: { message: "Fee cache invalidated" },
251+
});
252+
}),
236253
}));
237254

238255
vi.mock("../../src/lib/orderlyDb", async () => {
@@ -267,6 +284,12 @@ vi.mock("../../src/lib/orderlyDb", async () => {
267284
};
268285
});
269286

287+
vi.mock("../../src/lib/errorLogger", () => ({
288+
errorLoggerMiddleware: vi.fn().mockImplementation(async (c, next) => {
289+
await next();
290+
}),
291+
}));
292+
270293
vi.mock("../../src/lib/auth", () => ({
271294
authMiddleware: vi.fn().mockImplementation((c, next) => {
272295
c.set("userId", "test-user-id");

0 commit comments

Comments
 (0)