Skip to content

Commit

Permalink
Merge pull request #371 from HathorNetwork/dev
Browse files Browse the repository at this point in the history
Release v1.23.1-beta
  • Loading branch information
andreabadesso authored Jan 19, 2023
2 parents 0e140a4 + 93e1b1d commit ebe5b77
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 19 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hathor-wallet-service",
"version": "1.23.0-beta",
"version": "1.23.1-beta",
"description": "",
"scripts": {
"postinstall": "npm dedupe",
Expand Down
4 changes: 2 additions & 2 deletions serverless.yml
Original file line number Diff line number Diff line change
Expand Up @@ -600,10 +600,10 @@ functions:
walletWarmer:
enabled: false
proxiedGraphvizNeighborsQuery:
handler: src/api/fullnodeProxy.queryGraphvizNeighbors
handler: src/api/fullnodeProxy.queryGraphvizNeighbours
events:
- http:
path: wallet/proxy/graphviz/neighbors
path: wallet/proxy/graphviz/neighbours
method: get
cors: true
authorizer: ${self:custom.authorizer.walletBearer}
Expand Down
6 changes: 3 additions & 3 deletions src/api/fullnodeProxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ export const getConfirmationData: APIGatewayProxyHandler = middy(walletIdProxyHa
/*
* Makes graphviz queries on the fullnode
*
* This lambda is called by API Gateway on GET /wallet/proxy/graphviz/neighbors
* This lambda is called by API Gateway on GET /wallet/proxy/graphviz/neighbours
*/
export const queryGraphvizNeighbors: APIGatewayProxyHandler = middy(
export const queryGraphvizNeighbours: APIGatewayProxyHandler = middy(
walletIdProxyHandler(async (_walletId: string, event) => {
const params = event.queryStringParameters || {};
const validationResult: ParamValidationResult<GraphvizParams> = validateParams<GraphvizParams>(graphvizValidator, params, {
Expand All @@ -125,7 +125,7 @@ export const queryGraphvizNeighbors: APIGatewayProxyHandler = middy(
maxLevel,
} = validationResult.value;

const graphVizData = await fullnode.queryGraphvizNeighbors(txId, graphType, maxLevel);
const graphVizData = await fullnode.queryGraphvizNeighbours(txId, graphType, maxLevel);

await closeDbConnection(mysql);

Expand Down
4 changes: 2 additions & 2 deletions src/fullnode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const create = (baseURL = BASE_URL): any => {
return response.data;
};

const queryGraphvizNeighbors = async (
const queryGraphvizNeighbours = async (
txId: string,
graphType: string,
maxLevel: number,
Expand All @@ -58,7 +58,7 @@ export const create = (baseURL = BASE_URL): any => {
api, // exported so we can mock it on the tests
downloadTx,
getConfirmationData,
queryGraphvizNeighbors,
queryGraphvizNeighbours,
};
};

Expand Down
15 changes: 7 additions & 8 deletions tests/api.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,17 @@ import { get as addressesGet, checkMine } from '@src/api/addresses';
import { get as newAddressesGet } from '@src/api/newAddresses';
import { get as balancesGet } from '@src/api/balances';
import { get as txHistoryGet } from '@src/api/txhistory';
import { get as walletTokensGet } from '@src/api/tokens';
import { get as walletTokensGet, getTokenDetails } from '@src/api/tokens';
import { get as getVersionDataGet } from '@src/api/version';
import {
getTransactionById,
getConfirmationData,
queryGraphvizNeighbors,
queryGraphvizNeighbours,
} from '@src/api/fullnodeProxy';
import { create as txProposalCreate } from '@src/api/txProposalCreate';
import { send as txProposalSend } from '@src/api/txProposalSend';
import { destroy as txProposalDestroy } from '@src/api/txProposalDestroy';
import { getFilteredUtxos, getFilteredTxOutputs } from '@src/api/txOutputs';
import { getTokenDetails } from '@src/api/tokens';
import {
get as walletGet,
load as walletLoad,
Expand Down Expand Up @@ -1614,12 +1613,12 @@ test('GET /wallet/proxy/{txId}/confirmation_data', async () => {
`);
});

test('GET /wallet/proxy/graphviz/neighbors', async () => {
test('GET /wallet/proxy/graphviz/neighbours', async () => {
expect.hasAssertions();

const mockData = 'digraph {}';

const spy = jest.spyOn(fullnode, 'queryGraphvizNeighbors');
const spy = jest.spyOn(fullnode, 'queryGraphvizNeighbours');

const mockFullnodeResponse = jest.fn(() => Promise.resolve(mockData));
spy.mockImplementation(mockFullnodeResponse);
Expand All @@ -1629,7 +1628,7 @@ test('GET /wallet/proxy/graphviz/neighbors', async () => {
graphType: 'verification',
maxLevel: '1',
});
let result = await queryGraphvizNeighbors(event, null, null) as APIGatewayProxyResult;
let result = await queryGraphvizNeighbours(event, null, null) as APIGatewayProxyResult;
let returnBody = JSON.parse(result.body as string);

expect(result.statusCode).toBe(200);
Expand All @@ -1641,7 +1640,7 @@ test('GET /wallet/proxy/graphviz/neighbors', async () => {
graphType: 'verification',
});

result = await queryGraphvizNeighbors(event, null, null) as APIGatewayProxyResult;
result = await queryGraphvizNeighbours(event, null, null) as APIGatewayProxyResult;
returnBody = JSON.parse(result.body as string);
expect(result.statusCode).toBe(400);
expect(returnBody).toMatchInlineSnapshot(`
Expand All @@ -1661,7 +1660,7 @@ test('GET /wallet/proxy/graphviz/neighbors', async () => {

// Missing all attributes
event = makeGatewayEventWithAuthorizer('my-wallet', {});
result = await queryGraphvizNeighbors(event, null, null) as APIGatewayProxyResult;
result = await queryGraphvizNeighbours(event, null, null) as APIGatewayProxyResult;
returnBody = JSON.parse(result.body as string);
expect(result.statusCode).toBe(400);
expect(returnBody).toMatchInlineSnapshot(`
Expand Down
4 changes: 2 additions & 2 deletions tests/fullnode.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ test('getConfirmationData', async () => {
expect(response).toStrictEqual(mockData);
});

test('queryGraphvizNeighbors', async () => {
test('queryGraphvizNeighbours', async () => {
expect.hasAssertions();

const mockData = 'diagraph {}';
Expand All @@ -53,6 +53,6 @@ test('queryGraphvizNeighbors', async () => {
data: mockData,
}));

const response = await fullnode.queryGraphvizNeighbors('tx1', 'test', 1);
const response = await fullnode.queryGraphvizNeighbours('tx1', 'test', 1);
expect(response).toStrictEqual(mockData);
});

0 comments on commit ebe5b77

Please sign in to comment.