From 2b30039d184abc0e7de13e0cd4b449be54e7bedf Mon Sep 17 00:00:00 2001
From: Denis Davidyuk <denis_davidyuk@hotmail.com>
Date: Sun, 23 Jul 2023 16:08:10 +0600
Subject: [PATCH] test(aepp,wallet): use `assertNotNull` instead throwing
 `UnexpectedTsError`

---
 test/integration/rpc.ts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/integration/rpc.ts b/test/integration/rpc.ts
index 65f631bb39..4659dbbf6c 100644
--- a/test/integration/rpc.ts
+++ b/test/integration/rpc.ts
@@ -24,7 +24,6 @@ import {
   verify,
   NoWalletConnectedError,
   UnAuthorizedAccountError,
-  UnexpectedTsError,
   UnknownRpcClientError,
   UnsubscribedAccountError,
   AccountBase,
@@ -38,6 +37,7 @@ import {
   getSdk, ignoreVersion, networkId, url, compilerUrl,
 } from '.';
 import { Accounts, Network } from '../../src/aepp-wallet-communication/rpc/types';
+import { assertNotNull } from '../utils';
 
 const WindowPostMessageFake = (
   name: string,
@@ -149,7 +149,6 @@ describe('Aepp<->Wallet', function aeppWallet() {
 
     it('Should receive `announcePresence` message from wallet', async () => {
       const isReceived = new Promise<boolean>((resolve) => {
-        if (connections.aeppWindow.addEventListener == null) throw new UnexpectedTsError();
         connections.aeppWindow.addEventListener('message', (msg) => {
           resolve(msg.data.method === 'connection.announcePresence');
         });
@@ -321,7 +320,7 @@ describe('Aepp<->Wallet', function aeppWallet() {
 
     it('Try to sign using unpermited account', async () => {
       const { publicKey: pub } = generateKeyPair();
-      if (aepp.rpcClient == null) throw new UnexpectedTsError();
+      assertNotNull(aepp.rpcClient);
       await expect(aepp.rpcClient.request(METHODS.sign, {
         tx: 'tx_+NkLAfhCuECIIeWttRUiZ32uriBdmM1t+dCg90KuG2ABxOiuXqzpAul6uTWvsyfx3EFJDah6trudrityh+6XSX3mkPEimhgGuJH4jzIBoQELtO15J/l7UeG8teE0DRIzWyorEsi8UiHWPEvLOdQeYYgbwW1nTsgAAKEB6bv2BOYRtUYKOzmZ6Xcbb2BBfXPOfFUZ4S9+EnoSJcqIG8FtZ07IAACIAWNFeF2KAAAKAIYSMJzlQADAoDBrIcoop8JfZ4HOD9p3nDTiNthj7jjl+ArdHwEMUrvQgitwOr/v3Q==',
         onAccount: pub,
@@ -351,8 +350,9 @@ describe('Aepp<->Wallet', function aeppWallet() {
         payload: encode(Buffer.from('zerospend'), Encoding.Bytearray),
       });
       const res = await aepp.sendTransaction(tx);
-      if (res.tx?.payload == null || res.blockHeight == null) throw new UnexpectedTsError();
+      assertNotNull(res.tx?.payload);
       decode(res.tx.payload as Encoded.Any).toString().should.be.equal('zerospend2');
+      assertNotNull(res.blockHeight);
       res.blockHeight.should.be.a('number');
     });
 
@@ -454,7 +454,7 @@ describe('Aepp<->Wallet', function aeppWallet() {
 
     describe('Subscriptions', () => {
       it('Add new account to wallet: receive notification for update accounts', async () => {
-        if (aepp._accounts == null) throw new UnexpectedTsError();
+        assertNotNull(aepp._accounts);
         const connectedLength = Object.keys(aepp._accounts.connected).length;
         const accountsPromise = new Promise<Accounts>((resolve) => {
           aepp.onAddressChange = resolve;
@@ -464,7 +464,7 @@ describe('Aepp<->Wallet', function aeppWallet() {
       });
 
       it('Receive update for wallet select account', async () => {
-        if (aepp._accounts == null) throw new UnexpectedTsError();
+        assertNotNull(aepp._accounts);
         const connectedAccount = Object
           .keys(aepp._accounts.connected)[0] as Encoded.AccountAddress;
         const accountsPromise = new Promise<Accounts>((resolve) => {
@@ -472,7 +472,6 @@ describe('Aepp<->Wallet', function aeppWallet() {
         });
         wallet.selectAccount(connectedAccount);
         const { connected, current } = await accountsPromise;
-        if (current == null || connected == null) throw new UnexpectedTsError();
         expect(current[connectedAccount]).to.be.eql({});
         expect(Object.keys(connected).includes(connectedAccount)).to.be.equal(false);
       });
@@ -488,7 +487,7 @@ describe('Aepp<->Wallet', function aeppWallet() {
     });
 
     it('Try to connect unsupported protocol', async () => {
-      if (aepp.rpcClient == null) throw new UnexpectedTsError();
+      assertNotNull(aepp.rpcClient);
       await expect(aepp.rpcClient.request(METHODS.connect, { name: 'test-aepp', version: 2 as 1, connectNode: false })).to.be.eventually.rejectedWith('Unsupported Protocol Version').with.property('code', 5);
     });
 
@@ -610,8 +609,9 @@ describe('Aepp<->Wallet', function aeppWallet() {
         payload: encode(Buffer.from('zerospend'), Encoding.Bytearray),
       });
       const res = await aepp.sendTransaction(tx);
-      if (res.tx?.payload == null || res.blockHeight == null) throw new UnexpectedTsError();
+      assertNotNull(res.tx?.payload);
       decode(res.tx.payload as Encoded.Any).toString().should.be.equal('zerospend2');
+      assertNotNull(res.blockHeight);
       res.blockHeight.should.be.a('number');
     });
 
@@ -621,7 +621,7 @@ describe('Aepp<->Wallet', function aeppWallet() {
         wallet.addNode('second_node', node, true);
       });
       message.networkId.should.be.equal(networkId);
-      if (message.node == null) throw new UnexpectedTsError();
+      assertNotNull(message.node);
       message.node.should.be.an('object');
       expect(wallet.selectedNodeName).to.be.equal('second_node');
     });