fix: from to errors

blockfrost · Aug 30, 2023 · eb3047c · eb3047c
1 parent 9ce31f8
commit eb3047c
Show file tree

Hide file tree

Showing 6 changed files with 110 additions and 170 deletions.
diff --git a/...utils-npm-2.7.1-e45decfbd8-2f24289fca.zip → ...utils-npm-2.8.0-7809fac5e3-f46163e55d.zip b/...utils-npm-2.7.1-e45decfbd8-2f24289fca.zip → ...utils-npm-2.8.0-7809fac5e3-f46163e55d.zip
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@blockfrost/blockfrost-js": "5.2.0",
-    "@blockfrost/blockfrost-utils": "2.7.1",
+    "@blockfrost/blockfrost-utils": "2.8.0",
     "@blockfrost/openapi": "0.1.58",
     "@emurgo/cardano-serialization-lib-nodejs": "11.3.0",
     "@emurgo/cip14-js": "^3.0.1",

diff --git a/src/routes/addresses/address/transactions.ts b/src/routes/addresses/address/transactions.ts
@@ -6,7 +6,8 @@ import * as QueryTypes from '../../../types/queries/addresses.js';
 import * as ResponseTypes from '../../../types/responses/addresses.js';
 import { getDbSync } from '../../../utils/database.js';
 import { handle400Custom, handle404, handleInvalidAddress } from '../../../utils/error-handler.js';
-import { getAdditionalParametersFromRequest, toJSONStream } from '../../../utils/string-utils.js';
+import { toJSONStream } from '../../../utils/string-utils.js';
+import { getAdditionalParametersFromRequest } from '@blockfrost/blockfrost-utils/lib/fastify.js';
 import { getAddressTypeAndPaymentCred } from '../../../utils/validation.js';
 
 async function route(fastify: FastifyInstance) {

diff --git a/src/utils/string-utils.ts b/src/utils/string-utils.ts
@@ -10,67 +10,6 @@ export const getEndpointFromUrl = (url: string): string => {
   return endpoint;
 };
 
-export const getAdditionalParametersFromRequest = (
-  from?: string,
-  to?: string,
-): unknown[] | 'outOfRangeOrMalformedErr' => {
-  // eslint-disable-next-line unicorn/no-useless-undefined
-  const parameterArray: unknown[] = Array.from({ length: 4 }).fill(undefined);
-
-  try {
-    const minInt = 0;
-    const maxInt = 2_147_483_647;
-
-    if (from !== undefined) {
-      const fromTokens = from.split(':');
-      const requestParameterIsOK = fromTokens.length <= 2;
-
-      if (requestParameterIsOK) {
-        const [heightString, indexString] = fromTokens;
-        const height = Number.parseInt(heightString, 10);
-        const index = Number.parseInt(indexString, 10); // NaN in case of missing index
-
-        if (
-          height >= minInt &&
-          height <= maxInt &&
-          (indexString === undefined || (index >= minInt && index <= maxInt))
-        ) {
-          parameterArray[0] = heightString;
-          parameterArray[1] = indexString;
-        } else {
-          return 'outOfRangeOrMalformedErr';
-        }
-      }
-    }
-
-    if (to !== undefined) {
-      const toTokens = to.split(':');
-      const requestParameterIsOK = toTokens.length <= 2;
-
-      if (requestParameterIsOK) {
-        const [heightString, indexString] = toTokens;
-        const height = Number.parseInt(heightString, 10);
-        const index = Number.parseInt(indexString, 10); // NaN in case of missing index
-
-        if (
-          height >= minInt &&
-          height <= maxInt &&
-          (indexString === undefined || (index >= minInt && index <= maxInt))
-        ) {
-          parameterArray[2] = heightString;
-          parameterArray[3] = indexString;
-        } else {
-          return 'outOfRangeOrMalformedErr';
-        }
-      }
-    }
-  } catch (error) {
-    console.error(error);
-    return 'outOfRangeOrMalformedErr';
-  }
-  return parameterArray;
-};
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const sortKeysInObject = (object: any) => {
   if (object === null || typeof object !== 'object') return object;