From b7432bd02b48afcacca98ef1e7cad57ef75cc735 Mon Sep 17 00:00:00 2001
From: Jacob Heun <jacobheun@gmail.com>
Date: Wed, 4 Dec 2019 15:59:01 +0100
Subject: [PATCH] chore: use any-signal module

---
 package.json               |  1 +
 src/dialer.js              |  2 +-
 src/dialer/dial-request.js |  2 +-
 src/util/index.js          | 30 ------------------------------
 4 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/package.json b/package.json
index 4c844ac0..8c33202a 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
   "dependencies": {
     "abort-controller": "^3.0.0",
     "aggregate-error": "^3.0.1",
+    "any-signal": "^1.0.0",
     "async": "^2.6.2",
     "async-iterator-all": "^1.0.0",
     "bignumber.js": "^9.0.0",
diff --git a/src/dialer.js b/src/dialer.js
index 9bd2d314..6000c8d6 100644
--- a/src/dialer.js
+++ b/src/dialer.js
@@ -4,11 +4,11 @@ const multiaddr = require('multiaddr')
 const errCode = require('err-code')
 const AbortController = require('abort-controller')
 const delay = require('delay')
+const anySignal = require('any-signal')
 const debug = require('debug')
 const log = debug('libp2p:dialer')
 log.error = debug('libp2p:dialer:error')
 const { DialRequest } = require('./dialer/dial-request')
-const { anySignal } = require('./util')
 
 const { codes } = require('./errors')
 const {
diff --git a/src/dialer/dial-request.js b/src/dialer/dial-request.js
index 76c24433..b2739799 100644
--- a/src/dialer/dial-request.js
+++ b/src/dialer/dial-request.js
@@ -3,12 +3,12 @@
 const AbortController = require('abort-controller')
 const AggregateError = require('aggregate-error')
 const pDefer = require('p-defer')
+const anySignal = require('any-signal')
 const debug = require('debug')
 const log = debug('libp2p:dialer:request')
 log.error = debug('libp2p:dialer:request:error')
 const { AbortError } = require('libp2p-interfaces/src/transport/errors')
 
-const { anySignal } = require('../util')
 const { TokenHolder } = require('./token-holder')
 
 class DialRequest {
diff --git a/src/util/index.js b/src/util/index.js
index a53d537e..221b97f5 100644
--- a/src/util/index.js
+++ b/src/util/index.js
@@ -15,34 +15,4 @@ function toBuffer (source) {
   })()
 }
 
-/**
- * Takes an array of AbortSignals and returns a single signal.
- * If any signals are aborted, the returned signal will be aborted.
- * @param {Array<AbortSignal>} signals
- * @returns {AbortSignal}
- */
-function anySignal (signals) {
-  const controller = new AbortController()
-
-  function onAbort () {
-    controller.abort()
-
-    // Cleanup
-    for (const signal of signals) {
-      signal.removeEventListener('abort', onAbort)
-    }
-  }
-
-  for (const signal of signals) {
-    if (signal.aborted) {
-      onAbort()
-      break
-    }
-    signal.addEventListener('abort', onAbort)
-  }
-
-  return controller.signal
-}
-
 module.exports.toBuffer = toBuffer
-module.exports.anySignal = anySignal