fix(currency): Fix tests + make errors more consistent (#58)

Author: NathanFlurry

modules/currency/module.yaml

@@ -13,7 +13,6 @@ scripts:
 errors:
   INVALID_USER: {}
   INVALID_AMOUNT: {}
-  INVALID_BALANCE: {}
   NOT_ENOUGH_FUNDS: {}
 dependencies:
   rate_limit: {}

modules/currency/scripts/deposit.ts

@@ -16,9 +16,9 @@ export async function run(
   ctx: ScriptContext,
   req: Request,
 ): Promise<Response> {
-  await ctx.call("rate_limit", "throttle", { requests: 25 });
+  await ctx.modules.rateLimit.throttle({ requests: 25 });
 
-  if (req.amount < 0) throw new RuntimeError("INVALID_AMOUNT");
+  if (req.amount < 0 || !Number.isFinite(req.amount)) throw new RuntimeError("INVALID_AMOUNT");
 
   return ctx.db.$transaction(async (tx) => {
     const balance = await getBalance(tx, req.userId);
@@ -30,7 +30,7 @@ export async function run(
     try {
       await setBalance(tx, req.userId, updatedBalance);
     } catch {
-      throw new RuntimeError("INVALID_BALANCE");
+      throw new RuntimeError("INVALID_AMOUNT");
     }
 
     return {

modules/currency/scripts/get_balance.ts

@@ -14,7 +14,7 @@ export async function run(
 	ctx: ScriptContext,
 	req: Request,
 ): Promise<Response> {
-	await ctx.call("rate_limit", "throttle", { requests: 25 });
+	await ctx.modules.rateLimit.throttle({ requests: 25 });
 
 	return {
 		balance: await getBalance(ctx.db, req.userId),

modules/currency/scripts/get_balance_by_token.ts

@@ -13,15 +13,10 @@ export async function run(
 	ctx: ScriptContext,
 	req: Request,
 ): Promise<Response> {
-	await ctx.call("rate_limit", "throttle", { requests: 25 });
+	await ctx.modules.rateLimit.throttle({ requests: 25 });
 
-	const { userId } = await ctx.call("users", "validate_token", {
-		userToken: req.userToken,
-	}) as any;
-
-	const { balance } = await ctx.call("currency", "get_balance", {
-		userId,
-	}) as any;
+	const { userId } = await ctx.modules.users.validateToken({ userToken: req.userToken });
+	const { balance } = await ctx.modules.currency.getBalance({ userId });
 
 	return {
 		userId,

modules/currency/scripts/set_balance.ts

@@ -16,12 +16,12 @@ export async function run(
 ): Promise<Response> {
 	await ctx.modules.rateLimit.throttle({ requests: 25 });
 
-	if (req.balance < 0) throw new RuntimeError("INVALID_AMOUNT");
+	if (req.balance < 0 || !Number.isFinite(req.balance)) throw new RuntimeError("INVALID_AMOUNT");
 
 	try {
 		await setBalance(ctx.db, req.userId, req.balance);
 	} catch {
-		throw new RuntimeError("INVALID_BALANCE");
+		throw new RuntimeError("INVALID_AMOUNT");
 	}
 
 	return {};

modules/currency/scripts/withdraw.ts

@@ -19,9 +19,9 @@ export async function run(
 	ctx: ScriptContext,
 	req: Request,
 ): Promise<Response> {
-	await ctx.call("rate_limit", "throttle", { requests: 25 });
+	await ctx.modules.rateLimit.throttle({ requests: 25 });
 
-	if (req.amount < 0) throw new RuntimeError("INVALID_AMOUNT");
+	if (req.amount < 0 || !Number.isFinite(req.amount)) throw new RuntimeError("INVALID_AMOUNT");
 
 	return ctx.db.$transaction(async (tx) => {
 		const balance = await getBalance(tx, req.userId);
@@ -33,7 +33,7 @@ export async function run(
 		try {
 			await setBalance(tx, req.userId, updatedBalance);
 		} catch {
-			throw new RuntimeError("INVALID_BALANCE");
+			throw new RuntimeError("INVALID_AMOUNT");
 		}
 
 		return {

modules/currency/tests/errors.ts

@@ -6,7 +6,7 @@ test (
     "get balance for nonexistent user",
     async (ctx: TestContext) => {
 		const { balance } = await ctx.modules.currency.getBalance({
-			userId: "Not a real user",
+			userId: "00000000-0000-0000-0000-000000000000",
 		});
 
         assertEquals(balance, 0);

modules/currency/utils/set_balance.ts

@@ -10,7 +10,7 @@ export const setBalance = async (
 	userId: string,
 	balance: number,
 ) => {
-	if (balance < 0) throw new RuntimeError("INVALID_BALANCE");
+	if (balance < 0) throw new RuntimeError("INVALID_AMOUNT");
 
 	await db.userWallet.upsert({
 		where: {