Tests

raiden-network · Feb 12, 2020 · 2bd7512 · 2bd7512
1 parent 6c5ec76
commit 2bd7512
Show file tree

Hide file tree

Showing 7 changed files with 168 additions and 49 deletions.
diff --git a/raiden-ts/tests/e2e/provider.ts b/raiden-ts/tests/e2e/provider.ts
@@ -60,8 +60,8 @@ export class TestProvider extends Web3Provider {
 
   public async mineUntil(block: number): Promise<number> {
     const blockNumber = await this.getBlockNumber();
+    block = Math.max(block, blockNumber + 1);
     console.debug(`mining until block=${block} from ${blockNumber}`);
-    if (blockNumber >= block) return blockNumber;
     const promise = new Promise<number>(resolve => {
       const cb = (b: number): void => {
         if (b < block) return;

diff --git a/raiden-ts/tests/e2e/raiden.spec.ts b/raiden-ts/tests/e2e/raiden.spec.ts
@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/camelcase */
+import { timer } from 'rxjs';
 import { first, filter, takeUntil } from 'rxjs/operators';
 import { Zero } from 'ethers/constants';
 import { parseEther, parseUnits, bigNumberify, BigNumber, keccak256, Network } from 'ethers/utils';
@@ -13,7 +14,7 @@ import 'raiden-ts/polyfills';
 import { Raiden } from 'raiden-ts/raiden';
 import { ShutdownReason } from 'raiden-ts/constants';
 import { makeInitialState, RaidenState } from 'raiden-ts/state';
-import { raidenShutdown } from 'raiden-ts/actions';
+import { raidenShutdown, ConfirmableActions } from 'raiden-ts/actions';
 import { newBlock, tokenMonitored } from 'raiden-ts/channels/actions';
 import { ChannelState } from 'raiden-ts/channels/state';
 import { Storage, Secret, Address } from 'raiden-ts/utils/types';
@@ -25,7 +26,6 @@ import { makeSecret, getSecrethash } from 'raiden-ts/transfers/utils';
 import { matrixSetup } from 'raiden-ts/transport/actions';
 import { losslessStringify } from 'raiden-ts/utils/data';
 import { ServiceRegistryFactory } from 'raiden-ts/contracts/ServiceRegistryFactory';
-import { timer } from 'rxjs';
 
 describe('Raiden', () => {
   const provider = new TestProvider();
@@ -68,18 +68,8 @@ describe('Raiden', () => {
     );
     raiden.action$
       .pipe(
-        filter(
-          (
-            a: any, // eslint-disable-line @typescript-eslint/no-explicit-any
-          ): a is {
-            payload: { txHash: string; txBlock: number; confirmed: undefined | boolean };
-          } =>
-            a &&
-            a.payload?.['txHash'] &&
-            a.payload['txBlock'] &&
-            'confirmed' in a.payload &&
-            a.payload.confirmed === undefined,
-        ),
+        filter(isActionOf(ConfirmableActions)),
+        filter(a => a.payload.confirmed === undefined),
       )
       .subscribe(a =>
         provider.mineUntil(a.payload.txBlock + raiden.config.confirmationBlocks + 1),

diff --git a/raiden-ts/tests/unit/epics/channels.spec.ts b/raiden-ts/tests/unit/epics/channels.spec.ts
@@ -76,8 +76,9 @@ describe('channels epic', () => {
           {
             id: channelId,
             participant: depsMock.address,
-            closeBlock,
             txHash,
+            txBlock: closeBlock,
+            confirmed: true,
           },
           { tokenNetwork, partner },
         ),
@@ -531,7 +532,13 @@ describe('channels epic', () => {
 
       await expect(promise).resolves.toEqual(
         channelClose.success(
-          { id: channelId, participant: partner, closeBlock, txHash },
+          {
+            id: channelId,
+            participant: partner,
+            txHash,
+            txBlock: closeBlock,
+            confirmed: undefined,
+          },
           { tokenNetwork, partner },
         ),
       );
@@ -552,7 +559,13 @@ describe('channels epic', () => {
           { tokenNetwork, partner },
         ),
         channelClose.success(
-          { id: channelId, participant: depsMock.address, closeBlock, txHash },
+          {
+            id: channelId,
+            participant: depsMock.address,
+            txHash,
+            txBlock: closeBlock,
+            confirmed: true,
+          },
           { tokenNetwork, partner },
         ), // channel is in "closed" state already
       ].reduce(raidenReducer, state);
@@ -579,7 +592,10 @@ describe('channels epic', () => {
       );
 
       await expect(promise).resolves.toEqual(
-        channelSettle.success({ id: channelId, settleBlock, txHash }, { tokenNetwork, partner }),
+        channelSettle.success(
+          { id: channelId, txHash, txBlock: settleBlock, confirmed: undefined },
+          { tokenNetwork, partner },
+        ),
       );
 
       // ensure ChannelSettledAction completed channel monitoring and unsubscribed from events
@@ -946,7 +962,13 @@ describe('channels epic', () => {
         ),
         newBlock({ blockNumber: closeBlock }),
         channelClose.success(
-          { id: channelId, participant: depsMock.address, closeBlock, txHash },
+          {
+            id: channelId,
+            participant: depsMock.address,
+            txHash,
+            txBlock: closeBlock,
+            confirmed: true,
+          },
           { tokenNetwork, partner },
         ),
       ].reduce(raidenReducer, state);
@@ -977,7 +999,13 @@ describe('channels epic', () => {
         ),
         newBlock({ blockNumber: closeBlock }),
         channelClose.success(
-          { id: channelId, participant: depsMock.address, closeBlock, txHash },
+          {
+            id: channelId,
+            participant: depsMock.address,
+            txHash,
+            txBlock: closeBlock,
+            confirmed: true,
+          },
           { tokenNetwork, partner },
         ),
         newBlock({ blockNumber: settleBlock }),
@@ -1024,7 +1052,13 @@ describe('channels epic', () => {
         ),
         newBlock({ blockNumber: closeBlock }),
         channelClose.success(
-          { id: channelId, participant: depsMock.address, closeBlock, txHash },
+          {
+            id: channelId,
+            participant: depsMock.address,
+            txHash,
+            txBlock: closeBlock,
+            confirmed: true,
+          },
           { tokenNetwork, partner },
         ),
         newBlock({ blockNumber: settleBlock }),

diff --git a/raiden-ts/tests/unit/epics/path.spec.ts b/raiden-ts/tests/unit/epics/path.spec.ts
@@ -784,7 +784,7 @@ describe('PFS: pathFindServiceEpic', () => {
     state$.next(
       [
         channelClose.success(
-          { id: channelId, participant: partner, closeBlock: 126, txHash },
+          { id: channelId, participant: partner, txHash, txBlock: 126, confirmed: true },
           { tokenNetwork, partner },
         ),
       ].reduce(raidenReducer, state$.value),

diff --git a/raiden-ts/tests/unit/epics/raiden.spec.ts b/raiden-ts/tests/unit/epics/raiden.spec.ts
@@ -134,7 +134,7 @@ describe('raiden epic', () => {
           ),
           newBlock({ blockNumber: 128 }),
           channelClose.success(
-            { id: channelId, participant: partner, closeBlock: 128, txHash },
+            { id: channelId, participant: partner, txHash, txBlock: 128, confirmed: true },
             { tokenNetwork, partner },
           ),
           newBlock({ blockNumber: 629 }),

diff --git a/raiden-ts/tests/unit/epics/transfers.spec.ts b/raiden-ts/tests/unit/epics/transfers.spec.ts
@@ -312,8 +312,9 @@ describe('transfers epic', () => {
               {
                 id: channelId + 1,
                 participant: closingPartner,
-                closeBlock: openBlock + 1,
                 txHash,
+                txBlock: openBlock + 1,
+                confirmed: true,
               },
               { tokenNetwork, partner: closingPartner },
             ),
@@ -457,12 +458,23 @@ describe('transfers epic', () => {
           state$ = of(
             [
               channelClose.success(
-                { id: channelId, participant: partner, closeBlock, txHash },
+                {
+                  id: channelId,
+                  participant: partner,
+                  txHash,
+                  txBlock: closeBlock,
+                  confirmed: true,
+                },
                 { tokenNetwork, partner },
               ),
               newBlock({ blockNumber: closeBlock + settleTimeout + 1 }),
               channelSettle.success(
-                { id: channelId, settleBlock: closeBlock + settleTimeout + 1, txHash },
+                {
+                  id: channelId,
+                  txHash,
+                  txBlock: closeBlock + settleTimeout + 1,
+                  confirmed: true,
+                },
                 { tokenNetwork, partner },
               ),
               newBlock({ blockNumber: closeBlock + settleTimeout + 2 }),
@@ -497,7 +509,13 @@ describe('transfers epic', () => {
           state$ = of(
             [
               channelClose.success(
-                { id: channelId, participant: partner, closeBlock, txHash },
+                {
+                  id: channelId,
+                  participant: partner,
+                  txHash,
+                  txBlock: closeBlock,
+                  confirmed: true,
+                },
                 { tokenNetwork, partner },
               ),
             ].reduce(raidenReducer, transferingState),
@@ -612,7 +630,13 @@ describe('transfers epic', () => {
           state$ = of(
             [
               channelClose.success(
-                { id: channelId, participant: partner, closeBlock, txHash },
+                {
+                  id: channelId,
+                  participant: partner,
+                  txHash,
+                  txBlock: closeBlock,
+                  confirmed: true,
+                },
                 { tokenNetwork, partner },
               ),
               newBlock({ blockNumber: signedTransfer.lock.expiration.toNumber() + 1 }),