fix(status): fix tests

fireblocks · Jan 17, 2024 · 8deb987 · 8deb987
1 parent a88e286
commit 8deb987
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -2,3 +2,4 @@
 . "$(dirname -- "$0")/_/husky.sh"
 
 npm run build
+npm run test
diff --git a/src/services/customerServer.api.test.ts b/src/services/customerServer.api.test.ts
@@ -22,7 +22,7 @@ describe('Customer Server API', () => {
         type: messagesToSign[0].type,
       },
     ];
-    customerServerApiDriver.mock.messagesToSign(messagesToSign, { messages: expectedRes });
+    customerServerApiDriver.mock.messagesToSign(messagesToSign, { statuses: expectedRes });
 
     const res = await service.messagesToSign(messagesToSign);
 

diff --git a/src/services/customerServer.api.ts b/src/services/customerServer.api.ts
@@ -14,7 +14,7 @@ const customerServerApi = {
           headers: { Authorization: CUSTOMER_SERVER_AUTHORIZATION },
         },
       );
-      return res.data.messages;
+      return res.data.statuses;
     } catch (e) {
       logger.error(`Error on customer server api {txToSign} request`, e);
       throw e;

diff --git a/src/services/fb-server.api.test.ts b/src/services/fb-server.api.test.ts
@@ -151,7 +151,7 @@ export function aSignedMessageStatus(): MessageStatus {
     status: 'SIGNED',
     payload: JSON.stringify(messageBuilder.aMessage()),
     signedPayload: 'signed payload',
-    type: 'TX',
+    type: 'EXTERNAL_KEY_SIGNING_REQUEST',
   };
 }
 export const messageBuilder = {
@@ -162,7 +162,7 @@ export const messageBuilder = {
   ): FBMessageEnvlope => {
     const msg = shouldEncode
       ? jwt.sign(JSON.stringify(fbMsg || c.string()), 'shhhhh')
-      : fbMsg || messageBuilder.fbMessage('TX', messageBuilder.aMessage());
+      : fbMsg || messageBuilder.fbMessage('EXTERNAL_KEY_SIGNING_REQUEST', messageBuilder.aMessage());
     return {
       msg,
       msgId: c.natural(),

diff --git a/src/services/messages.service.test.ts b/src/services/messages.service.test.ts
@@ -4,8 +4,8 @@ import { MessageStatus, TxType } from '../types';
 import * as messagesUtils from '../utils/messages-utils';
 import customerServerApi from './customerServer.api';
 import fbServerApi from './fb-server.api';
-import service from './messages.service';
 import { aSignedMessageStatus, messageBuilder } from './fb-server.api.test';
+import service from './messages.service';
 const c = new Chance();
 describe('messages service', () => {
   beforeEach(() => {
@@ -16,11 +16,11 @@ describe('messages service', () => {
     jest.clearAllMocks();
   });
 
-  const types: TxType[] = ['EXTERNAL_KEY_PROOF_OF_OWNERSHIP', 'TX'];
+  const types: TxType[] = ['EXTERNAL_KEY_PROOF_OF_OWNERSHIP', 'EXTERNAL_KEY_SIGNING_REQUEST'];
   it.each(types)('should send the customer server the messages to sign', async (type: TxType) => {
     const msgId = c.natural();
     const aTxToSignMessage = messageBuilder.aMessage();
-    const fbMessage = messageBuilder.fbMessage('TX', aTxToSignMessage);
+    const fbMessage = messageBuilder.fbMessage('EXTERNAL_KEY_SIGNING_REQUEST', aTxToSignMessage);
     const fbMessageEnvlope = messageBuilder.fbMsgEnvelope({ msgId }, fbMessage);
     const msgEnvelop = messageBuilder.anMessageEnvelope(msgId, type, aTxToSignMessage);
     jest.spyOn(customerServerApi, 'messagesToSign').mockResolvedValue([]);
@@ -60,9 +60,9 @@ describe('messages service', () => {
   it('should get pending messages from cache', async () => {
     const msgId = c.natural();
     const aTxToSignMessage = messageBuilder.aMessage();
-    const fbMessage = messageBuilder.fbMessage('TX', aTxToSignMessage);
+    const fbMessage = messageBuilder.fbMessage('EXTERNAL_KEY_SIGNING_REQUEST', aTxToSignMessage);
     const fbMessageEnvlope = messageBuilder.fbMsgEnvelope({ msgId }, fbMessage);
-    const msgEnvelop = messageBuilder.anMessageEnvelope(msgId, 'TX', aTxToSignMessage);
+    const msgEnvelop = messageBuilder.anMessageEnvelope(msgId, 'EXTERNAL_KEY_SIGNING_REQUEST', aTxToSignMessage);
 
     jest.spyOn(messagesUtils, 'decodeAndVerifyMessage').mockReturnValue(msgEnvelop);
     jest.spyOn(customerServerApi, 'messagesToSign').mockResolvedValue([
@@ -103,9 +103,9 @@ describe('messages service', () => {
   it('shuold remove acked messages from the cache', async () => {
     const msgId = c.natural();
     const aTxToSignMessage = messageBuilder.aMessage();
-    const fbMessage = messageBuilder.fbMessage('TX', aTxToSignMessage);
+    const fbMessage = messageBuilder.fbMessage('EXTERNAL_KEY_SIGNING_REQUEST', aTxToSignMessage);
     const fbMessageEnvlope = messageBuilder.fbMsgEnvelope({ msgId }, fbMessage);
-    const msgEnvelop = messageBuilder.anMessageEnvelope(msgId, 'TX', aTxToSignMessage);
+    const msgEnvelop = messageBuilder.anMessageEnvelope(msgId, 'EXTERNAL_KEY_SIGNING_REQUEST', aTxToSignMessage);
 
     jest.spyOn(messagesUtils, 'decodeAndVerifyMessage').mockReturnValue(msgEnvelop);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@
		. "$(dirname -- "$0")/_/husky.sh"

		npm run build
		npm run test