From a856829d91aa0f06c423bfd60341a0c01c67868e Mon Sep 17 00:00:00 2001 From: Zubin Pratap Date: Wed, 27 Sep 2023 12:55:27 +1000 Subject: [PATCH 1/2] Enable listenForResponses() to accept a string subId param. --- src/ResponseListener.ts | 8 ++++++-- test/integration/ResponseListener.test.ts | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/ResponseListener.ts b/src/ResponseListener.ts index 03d8ea9..83fcec5 100644 --- a/src/ResponseListener.ts +++ b/src/ResponseListener.ts @@ -59,14 +59,18 @@ export class ResponseListener { } public listenForResponses( - subscriptionId: number, + subscriptionId: number | string, callback: (functionsResponse: FunctionsResponse) => any, ) { + if (typeof subscriptionId === 'string') { + subscriptionId = Number(subscriptionId) + } + this.functionsRouter.on( 'RequestProcessed', ( requestId: string, - _subscriptionId: BigNumber, + _subscriptionId: BigNumber , totalCostJuels: BigNumber, _, resultCode: number, diff --git a/test/integration/ResponseListener.test.ts b/test/integration/ResponseListener.test.ts index a1821a9..c85df0f 100644 --- a/test/integration/ResponseListener.test.ts +++ b/test/integration/ResponseListener.test.ts @@ -138,8 +138,9 @@ describe('Functions toolkit classes', () => { functionsResponse = response responseEventEmitter.emit('response') } - - functionsListener.listenForResponses(subscriptionId, responseCallback) + + const subIdString = subscriptionId.toString() + functionsListener.listenForResponses(subIdString, responseCallback) await exampleClient.sendRequest( 'return Functions.encodeUint256(1)', From be4c7e7e4ae3e7926eb6fb1018fa8cd6aa3462e8 Mon Sep 17 00:00:00 2001 From: Zubin Pratap Date: Wed, 27 Sep 2023 13:20:25 +1000 Subject: [PATCH 2/2] lint --- src/ResponseListener.ts | 4 ++-- test/integration/ResponseListener.test.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ResponseListener.ts b/src/ResponseListener.ts index 83fcec5..5fafed2 100644 --- a/src/ResponseListener.ts +++ b/src/ResponseListener.ts @@ -65,12 +65,12 @@ export class ResponseListener { if (typeof subscriptionId === 'string') { subscriptionId = Number(subscriptionId) } - + this.functionsRouter.on( 'RequestProcessed', ( requestId: string, - _subscriptionId: BigNumber , + _subscriptionId: BigNumber, totalCostJuels: BigNumber, _, resultCode: number, diff --git a/test/integration/ResponseListener.test.ts b/test/integration/ResponseListener.test.ts index c85df0f..1ff7ac1 100644 --- a/test/integration/ResponseListener.test.ts +++ b/test/integration/ResponseListener.test.ts @@ -138,7 +138,7 @@ describe('Functions toolkit classes', () => { functionsResponse = response responseEventEmitter.emit('response') } - + const subIdString = subscriptionId.toString() functionsListener.listenForResponses(subIdString, responseCallback)