From 6d66eeec25eb1b3c71b040eb5ce27a7dabba6316 Mon Sep 17 00:00:00 2001 From: Phoebe Lew Date: Tue, 12 Dec 2023 13:04:20 +1100 Subject: [PATCH] PR changes --- packages/http-server/src/request-handlers/submit-close.ts | 2 +- packages/http-server/src/request-handlers/submit-order.ts | 4 +--- packages/http-server/tests/submit-close.spec.ts | 2 +- packages/http-server/tests/submit-order.spec.ts | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/http-server/src/request-handlers/submit-close.ts b/packages/http-server/src/request-handlers/submit-close.ts index 1b01b424..2afc3516 100644 --- a/packages/http-server/src/request-handlers/submit-close.ts +++ b/packages/http-server/src/request-handlers/submit-close.ts @@ -30,7 +30,7 @@ export function submitClose(opts: SubmitCloseOpts): RequestHandler { const exchange = await exchangesApi.getExchange({id: message.exchangeId}) if(exchange == undefined) { - const errorResponse: ErrorDetail = { detail: `exchangeId: ${message.exchangeId} is undefined` } + const errorResponse: ErrorDetail = { detail: `No exchange found for ${message.exchangeId}` } return res.status(404).json({ errors: [errorResponse] }) } diff --git a/packages/http-server/src/request-handlers/submit-order.ts b/packages/http-server/src/request-handlers/submit-order.ts index 0241c994..e913dcc1 100644 --- a/packages/http-server/src/request-handlers/submit-order.ts +++ b/packages/http-server/src/request-handlers/submit-order.ts @@ -30,13 +30,11 @@ export function submitOrder(opts: SubmitOrderOpts): RequestHandler { const exchange = await exchangesApi.getExchange({id: message.exchangeId}) if(exchange == undefined) { - const errorResponse: ErrorDetail = { detail: `exchangeId: ${message.exchangeId} is undefined` } + const errorResponse: ErrorDetail = { detail: `No exchange found for ${message.exchangeId}` } return res.status(404).json({ errors: [errorResponse] }) } - console.log('hiiiii') - const last = exchange[exchange.length-1] if(!last.validNext.has('order')) { const errorResponse: ErrorDetail = { detail: `cannot submit Order for an exchange where the last message is kind: ${last.kind}` } diff --git a/packages/http-server/tests/submit-close.spec.ts b/packages/http-server/tests/submit-close.spec.ts index 8ebd6145..7b5f6f40 100644 --- a/packages/http-server/tests/submit-close.spec.ts +++ b/packages/http-server/tests/submit-close.spec.ts @@ -73,7 +73,7 @@ describe('POST /exchanges/:exchangeId/close', () => { const [ error ] = responseBody.errors expect(error.detail).to.exist - expect(error.detail).to.include('is undefined') + expect(error.detail).to.include('No exchange found for') }) xit(`returns a 409 if close is not allowed based on the exchange's current state`, async () => { diff --git a/packages/http-server/tests/submit-order.spec.ts b/packages/http-server/tests/submit-order.spec.ts index 952b5aff..e80e381c 100644 --- a/packages/http-server/tests/submit-order.spec.ts +++ b/packages/http-server/tests/submit-order.spec.ts @@ -72,7 +72,7 @@ describe('POST /exchanges/:exchangeId/order', () => { const [ error ] = responseBody.errors expect(error.detail).to.exist - expect(error.detail).to.include('is undefined') + expect(error.detail).to.include('No exchange found for') }) xit(`returns a 409 if order is not allowed based on the exchange's current state`)