chore: resolve comments

Signed-off-by: nikolay <[email protected]>

Author: natanasow

packages/ws-server/tests/unit/controllers/subscribeController.spec.ts

@@ -5,18 +5,19 @@ import constants from '@hashgraph/json-rpc-relay/dist/lib/constants';
 import { Relay } from '@hashgraph/json-rpc-relay/dist/lib/relay';
 import { RequestDetails } from '@hashgraph/json-rpc-relay/dist/lib/types/RequestDetails';
 import { IJsonRpcRequest } from '@hashgraph/json-rpc-server/dist/koaJsonRpc/lib/IJsonRpcRequest';
-import { expect } from 'chai';
+import chai, { expect } from 'chai';
+import chaiAsPromised from 'chai-as-promised';
 import Koa from 'koa';
 import { Counter } from 'prom-client';
 import sinon from 'sinon';
 
 import { contractAddress1, contractAddress2 } from '../../../../relay/tests/helpers';
-import Assertions from '../../../../server/tests/helpers/assertions';
 import { handleEthSubscribe } from '../../../dist/controllers/subscribeController';
 import WsMetricRegistry from '../../../dist/metrics/wsMetricRegistry';
 import { SubscriptionService } from '../../../dist/service/subscriptionService';
 import ConnectionLimiter from '../../../src/metrics/connectionLimiter';
 import { WS_CONSTANTS } from '../../../src/utils/constants';
+chai.use(chaiAsPromised);
 
 function createMockContext(): Koa.Context {
   return {
@@ -114,26 +115,18 @@ describe('Subscribe Controller', function () {
       stubMirrorNodeClient.resolveEntityType.returns(true);
       stubSubscriptionService.subscribe.returns(subscriptionId);
 
-      try {
-        await handleEthSubscribe({
+      await expect(
+        handleEthSubscribe({
           ...defaultParams,
           params: [constants.SUBSCRIBE_EVENTS.LOGS, { address: [contractAddress1, contractAddress2] }],
-        });
-        Assertions.expectedError();
-      } catch (e) {
-        expect(e.code).to.equal(-32602);
-      }
+        }),
+      ).to.be.eventually.rejected.and.have.property('code', -32602);
     });
 
     it('should not be able to subscribe to new heads if WS_NEW_HEADS_ENABLED is disabled', async function () {
       stubConfigService.withArgs('WS_NEW_HEADS_ENABLED').returns(false);
 
-      try {
-        await handleEthSubscribe(defaultParams);
-        Assertions.expectedError();
-      } catch (e: any) {
-        expect(e.code).to.equal(-32601);
-      }
+      await expect(handleEthSubscribe(defaultParams)).to.be.eventually.rejected.and.have.property('code', -32601);
     });
 
     it('should be able to subscribe to new heads', async function () {
@@ -145,14 +138,12 @@ describe('Subscribe Controller', function () {
     });
 
     it('should throw unsupported method for non-existing method', async function () {
-      try {
-        await handleEthSubscribe({
+      await expect(
+        handleEthSubscribe({
           ...defaultParams,
           params: [nonExistingMethod, {}],
-        });
-      } catch (e: any) {
-        expect(e.code).to.equal(-32601);
-      }
+        }),
+      ).to.be.eventually.rejected.and.have.property('code', -32601);
     });
   });
 });

packages/ws-server/tests/unit/validations.spec.ts

@@ -2,19 +2,21 @@
 
 import { MirrorNodeClient } from '@hashgraph/json-rpc-relay/dist/lib/clients';
 import { RequestDetails } from '@hashgraph/json-rpc-relay/dist/lib/types';
-import { expect } from 'chai';
+import chai, { expect } from 'chai';
 import pino from 'pino';
 import sinon from 'sinon';
 
-import { contractAddress1 } from '../../../relay/tests/helpers';
-import Assertions from '../../../server/tests/helpers/assertions';
+import { contractAddress1, contractAddress2 } from '../../../relay/tests/helpers';
 import { validateSubscribeEthLogsParams } from '../../dist/utils/validators';
 import { WS_CONSTANTS } from '../../src/utils/constants';
 import { validateJsonRpcRequest, verifySupportedMethod } from '../../src/utils/utils';
 import { WsTestHelper } from '../helper';
 
 const logger = pino({ level: 'silent' });
 
+import chaiAsPromised from 'chai-as-promised';
+chai.use(chaiAsPromised);
+
 describe('validations unit test', async function () {
   const FAKE_REQUEST_ID = '3';
   const FAKE_CONNECTION_ID = '9';
@@ -107,35 +109,29 @@ describe('validations unit test', async function () {
     it('should throw error if passed address as string is non-existing', async function () {
       stubMirrorNodeClient.resolveEntityType.returns(false);
 
-      try {
-        await validateSubscribeEthLogsParams(
+      await expect(
+        validateSubscribeEthLogsParams(
           {
             address: contractAddress1,
           },
           stubMirrorNodeClient,
           requestDetails,
-        );
-        Assertions.expectedError();
-      } catch (e) {
-        expect(e.code).to.equal(-32602);
-      }
+        ),
+      ).to.be.eventually.rejected.and.have.property('code', -32602);
     });
 
     it('should throw error if passed address as array is non-existing', async function () {
       stubMirrorNodeClient.resolveEntityType.returns(false);
 
-      try {
-        await validateSubscribeEthLogsParams(
+      await expect(
+        validateSubscribeEthLogsParams(
           {
-            address: [contractAddress1],
+            address: [contractAddress1, contractAddress2],
           },
           stubMirrorNodeClient,
           requestDetails,
-        );
-        Assertions.expectedError();
-      } catch (e) {
-        expect(e.code).to.equal(-32602);
-      }
+        ),
+      ).to.be.eventually.rejected.and.have.property('code', -32602);
     });
 
     it('should be able to pass address as a string', async function () {