fix: clean up faucet utils and return types

anoma · Feb 9, 2024 · d007863 · d007863
1 parent 4a362a1
commit d007863
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 90 deletions.
diff --git a/apps/faucet/src/App/Faucet.tsx b/apps/faucet/src/App/Faucet.tsx
@@ -132,16 +132,9 @@ export const FaucetForm: React.FC<Props> = ({
             throw new Error(`${code} - ${message}`);
           }
         )) || {};
-      if (!tag || !challenge) {
-        throw new Error("Request challenge did not return a valid response");
-      }
 
       const solution = computePowSolution(challenge, difficulty || 0);
 
-      if (!solution) {
-        throw new Error("A solution was not computed!");
-      }
-
       const signer = integration.signer();
       if (!signer) {
         throw new Error("signer not defined");

diff --git a/apps/faucet/src/utils/index.ts b/apps/faucet/src/utils/index.ts
@@ -1,26 +1,20 @@
 import { fromHex, toHex } from "@cosmjs/encoding";
 import { sha256 } from "node-forge";
-
-type ChallengeResponse = {
-  challenge: string;
-  tag: string;
-};
-
-type SettingsResponse = {
-  difficulty: number;
-  chain_id: string;
-  start_at: number;
-  tokens_alias_to_address: Record<string, string>;
-};
-
+import {
+  ChallengeResponse,
+  Data,
+  SettingsResponse,
+  TransferResponse,
+} from "./types";
 /**
- * Request faucet settings
+ * Wrapper for fetch requests to handle ReadableStream response when errors are received from API
  */
-export const requestSettings = async (
-  url: string
-): Promise<SettingsResponse> => {
-  return await fetch(new URL(`${url}/setting`), {
-    method: "GET",
+export async function request<T = unknown>(
+  url: string,
+  options: RequestInit = { method: "GET" }
+): Promise<T> {
+  return (await fetch(new URL(url), {
+    ...options,
   })
     .then((response) => {
       if (response.ok) {
@@ -29,15 +23,25 @@ export const requestSettings = async (
       const reader = response?.body?.getReader();
       return reader
         ?.read()
-        .then(({ value }) =>
-          Promise.reject(JSON.parse(new TextDecoder().decode(value)))
+        .then((data) =>
+          Promise.reject(JSON.parse(new TextDecoder().decode(data.value)))
         );
     })
     .catch((e) => {
       console.error(e);
       return Promise.reject(e);
-    });
+    })) as T;
+}
+
+/**
+ * Request faucet settings
+ */
+export const requestSettings = async (
+  url: string
+): Promise<SettingsResponse> => {
+  return request(`${url}/setting`);
 };
+
 /**
  * Request challenge from endpoint url
  *
@@ -47,49 +51,8 @@ export const requestSettings = async (
 export const requestChallenge = async (
   url: string,
   publicKey: string
-): Promise<ChallengeResponse | undefined> => {
-  const response = await fetch(new URL(`${url}/challenge/${publicKey}`), {
-    method: "GET",
-  })
-    .then((response) => {
-      if (response.ok) {
-        return response.json() as Promise<ChallengeResponse>;
-      }
-      const reader = response?.body?.getReader();
-      return reader
-        ?.read()
-        .then(({ value }) =>
-          Promise.reject(JSON.parse(new TextDecoder().decode(value)))
-        );
-    })
-    .catch((e) => {
-      console.error(e);
-      return Promise.reject(e);
-    });
-
-  return response;
-};
-
-export type TransferDetails = {
-  target: string;
-  token: string;
-  amount: number;
-};
-
-export type Data = {
-  solution: string;
-  tag: string;
-  challenge: unknown;
-  challenge_signature: string;
-  transfer: TransferDetails;
-  player_id: string;
-};
-
-export type TransferResponse = {
-  amount: number;
-  sent: boolean;
-  target: string;
-  token: string;
+): Promise<ChallengeResponse> => {
+  return request(`${url}/challenge/${publicKey}`);
 };
 
 /**
@@ -103,28 +66,13 @@ export const requestTransfer = async (
   url: string,
   data: Data
 ): Promise<TransferResponse> => {
-  return await fetch(new URL(url), {
+  return request(url, {
     method: "POST",
     body: JSON.stringify(data),
     headers: {
       "Content-Type": "application/json",
     },
-  })
-    .then((response) => {
-      if (response.ok) {
-        return response.json();
-      }
-      // Handle ReadableStream
-      const reader = response?.body?.getReader();
-      return reader
-        ?.read()
-        .then(({ value }) =>
-          Promise.reject(JSON.parse(new TextDecoder().decode(value)))
-        );
-    })
-    .catch((e) => {
-      return Promise.reject(e);
-    });
+  });
 };
 
 /**
@@ -171,7 +119,7 @@ export const getSolutionBytes = (int: number): Uint8Array => {
 export const computePowSolution = (
   challenge: string,
   difficulty: number
-): string | undefined => {
+): string => {
   let i = 0;
   let solution: string = "";
 
@@ -202,3 +150,5 @@ export const computePowSolution = (
   }
   return solution;
 };
+
+export * from "./types";