Fix notify and return old test

btbt520 · May 26, 2021 · a585298 · a585298
1 parent beaf1f8
commit a585298
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/core/tests/ts-tests/tests/transfer.ts b/core/tests/ts-tests/tests/transfer.ts
@@ -119,20 +119,14 @@ Tester.prototype.testIgnoredBatch = async function (
         { ...tx, amount: amount.mul(10 ** 6) }
     ]);
 
-    // One correct tx is needed because block will not be committed if it contains only rejected txs.
-    const handle = await sender.syncTransfer(tx);
-
     for (const handle of handles) {
         await suppress(handle.awaitReceipt());
     }
-    await handle.awaitReceipt();
 
     const senderAfter = await sender.getBalance(token);
     const receiverAfter = await receiver.getBalance(token);
-    expect(senderBefore.eq(senderAfter.add(amount).add(fee.div(2))), 'Wrong batch was not ignored').to.be.true;
-    expect(receiverAfter.eq(receiverBefore.add(amount)), 'Wrong batch was not ignored').to.be.true;
-
-    this.runningFee = this.runningFee.add(fee.div(2));
+    expect(senderBefore.eq(senderAfter), 'Wrong batch was not ignored').to.be.true;
+    expect(receiverAfter.eq(receiverBefore), 'Wrong batch was not ignored').to.be.true;
 };
 
 Tester.prototype.testRejectedBatch = async function (

diff --git a/sdk/zksync.js/src/rest-provider.ts b/sdk/zksync.js/src/rest-provider.ts
@@ -425,7 +425,7 @@ export class RestProvider extends SyncProvider {
                         // it cannot be known if transaction is queued, committed or finalized.
                         // That is why there is separate `blockByPosition` query.
                         const blockStatus = await this.blockByPosition(transactionStatus.rollupBlock);
-                        notifyDone = blockStatus.status === 'finalized';
+                        notifyDone = blockStatus && blockStatus.status === 'finalized';
                     } else {
                         notifyDone = transactionStatus.status === 'finalized';
                     }
@@ -568,9 +568,9 @@ export class RestProvider extends SyncProvider {
             if (receipt.status === 'rejected') {
                 const blockFullInfo = await this.blockByPosition(receipt.rollupBlock);
                 const blockInfo = {
-                    blockNumber: blockFullInfo.blockNumber,
-                    committed: <boolean>(<any>blockFullInfo.commitTxHash),
-                    verified: <boolean>(<any>blockFullInfo.verifyTxHash)
+                    blockNumber: receipt.rollupBlock,
+                    committed: blockFullInfo ? true : false,
+                    verified: blockFullInfo && blockFullInfo.status === 'finalized' ? true : false
                 };
                 return {
                     executed: true,