From 0f84b6cc07ff6d051ea4a2bcb3d2d469b858f482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Carneiro?= Date: Tue, 15 Apr 2025 08:57:59 -0300 Subject: [PATCH 1/2] feat: version api should return the camelCase version data --- packages/wallet-service/src/api/version.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/wallet-service/src/api/version.ts b/packages/wallet-service/src/api/version.ts index 73eb66e0..729a3618 100644 --- a/packages/wallet-service/src/api/version.ts +++ b/packages/wallet-service/src/api/version.ts @@ -11,9 +11,10 @@ import 'source-map-support/register'; import { closeDbConnection, getDbConnection, + getUnixTimestamp, } from '@src/utils'; import { warmupMiddleware } from '@src/api/utils'; -import { getRawFullnodeData } from '@src/nodeConfig' +import { getFullnodeData } from '@src/nodeConfig' import errorHandler from '@src/api/middlewares/errorHandler'; import middy from '@middy/core'; import cors from '@middy/http-cors'; @@ -26,7 +27,7 @@ const mysql = getDbConnection(); * This lambda is called by API Gateway on GET /version */ export const get: APIGatewayProxyHandler = middy(async () => { - const versionData = await getRawFullnodeData(mysql); + const versionData = await getFullnodeData(mysql); await closeDbConnection(mysql); @@ -34,7 +35,10 @@ export const get: APIGatewayProxyHandler = middy(async () => { statusCode: 200, body: JSON.stringify({ success: true, - data: versionData, + data: { + ...versionData, + timestamp: getUnixTimestamp(), + }, }), }; }).use(cors()) From b5d38d5fffd86efa011d5ea0f2d5fe6e898efae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Carneiro?= Date: Tue, 15 Apr 2025 09:46:48 -0300 Subject: [PATCH 2/2] tests: version data as camelCase on tests --- packages/wallet-service/tests/api.test.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/wallet-service/tests/api.test.ts b/packages/wallet-service/tests/api.test.ts index 260457f7..ca17a30c 100644 --- a/packages/wallet-service/tests/api.test.ts +++ b/packages/wallet-service/tests/api.test.ts @@ -60,6 +60,7 @@ import { import fullnode from '@src/fullnode'; import { getHealthcheck } from '@src/api/healthcheck'; import { Severity } from '@wallet-service/common'; +import { convertApiVersionData } from '@src/nodeConfig'; // Monkey patch bitcore-lib @@ -1682,17 +1683,22 @@ test('GET /version', async () => { genesis_tx2_hash: 'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc', native_token: { name: 'Hathor', symbol: 'HTR'}, }; + const returnData = convertApiVersionData(mockData); const ts = getUnixTimestamp() await updateVersionData(mysql, ts, mockData); + const event = makeGatewayEvent({}); const result = await getVersionDataGet(event, null, null) as APIGatewayProxyResult; const returnBody = JSON.parse(result.body as string); expect(result.statusCode).toBe(200); expect(returnBody.success).toBe(true); - expect(returnBody.data).toStrictEqual(mockData); + expect(returnBody.data).toEqual(expect.objectContaining({ + timestamp: expect.anything(), + ...returnData, + })); }); test('GET /wallet/proxy/transactions/{txId}', async () => {