PR review

Co-Authored-By: Thomas Pischulski <[email protected]>
raiden-network · Feb 12, 2020 · a0ef008 · a0ef008
1 parent c2c39ca
commit a0ef008
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 25 deletions.
diff --git a/raiden-ts/src/channels/epics.ts b/raiden-ts/src/channels/epics.ts
@@ -891,6 +891,33 @@ export const channelSettleableEpic = (
     }),
   );
 
+function checkPendingAction(
+  action: ConfirmableAction,
+  provider: RaidenEpicDeps['provider'],
+  blockNumber: number,
+  confirmationBlocks: number,
+): Observable<ConfirmableAction> {
+  return defer(() => provider.getTransactionReceipt(action.payload.txHash)).pipe(
+    map(receipt => {
+      if (receipt?.confirmations !== undefined && receipt.confirmations >= confirmationBlocks) {
+        return {
+          ...action,
+          // beyond setting confirmed, also re-set blockNumber,
+          // which may have changed on a reorg
+          payload: { ...action.payload, txBlock: receipt.blockNumber!, confirmed: true },
+        };
+      } else if (action.payload.txBlock + 2 * confirmationBlocks < blockNumber) {
+        // if this txs didn't get confirmed for more than 2*confirmationBlocks, it was removed
+        return {
+          ...action,
+          payload: { ...action.payload, confirmed: false },
+        };
+      } // else, it seems removed, but give it twice confirmationBlocks to be picked up again
+    }),
+    filter(isntNil),
+  );
+}
+
 /**
  * Process new blocks and re-emit confirmed or removed actions
  *
@@ -916,30 +943,7 @@ export const confirmationEpic = (
         ...pendingTxs
           // only txs/confirmable actions which are more than confirmationBlocks in the past
           .filter(a => a.payload.txBlock + confirmationBlocks <= blockNumber)
-          .map(a =>
-            defer(() => provider.getTransactionReceipt(a.payload.txHash)).pipe(
-              map(receipt => {
-                if (
-                  receipt?.confirmations !== undefined &&
-                  receipt.confirmations >= confirmationBlocks
-                ) {
-                  return {
-                    ...a,
-                    // beyond setting confirmed, also re-set blockNumber,
-                    // which may have changed on a reorg
-                    payload: { ...a.payload, txBlock: receipt.blockNumber!, confirmed: true },
-                  };
-                } else if (a.payload.txBlock + 2 * confirmationBlocks < blockNumber) {
-                  // if this txs didn't get confirmed for more than 2*confirmationBlocks, it was removed
-                  return {
-                    ...a,
-                    payload: { ...a.payload, confirmed: false },
-                  };
-                } // else, it seems removed, but give it twice confirmationBlocks to be picked up again
-              }),
-              filter(isntNil),
-            ),
-          ),
+          .map(action => checkPendingAction(action, provider, blockNumber, confirmationBlocks)),
       ),
     ),
   );
diff --git a/raiden-ts/src/config.ts b/raiden-ts/src/config.ts
@@ -27,7 +27,7 @@ const logLevels = t.keyof({
  * - pfsSafetyMargin - Safety margin to be added to fees received from PFS. Use `1.1` to add a 10% safety margin.
  * - matrixExcessRooms - Keep this much rooms for a single user of interest (partner, target).
  *                       Leave LRU beyond this threshold.
- *   confirmationBlocks - How much blocks to wait before considering a transaction as confirmed
+ * - confirmationBlocks - How many blocks to wait before considering a transaction as confirmed
  * - matrixServer? - Specify a matrix server to use.
  * - logger? - String specifying the console log level of redux-logger. Use '' to disable.
  *             Defaults to 'debug' if undefined and process.env.NODE_ENV === 'development'