From c418b0b9147c219c68548882188ea4d9674d9afc Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Sun, 2 Jan 2022 16:46:22 +0100
Subject: [PATCH] fix: move errors

Moves `AbortError` to root and exposes it for importing. Also dedupes
`AbortOptions`.
---
 .../src/transport/dial-test.ts                               | 2 +-
 packages/libp2p-interfaces/package.json                      | 4 ++++
 packages/libp2p-interfaces/src/{transport => }/errors.ts     | 0
 packages/libp2p-interfaces/src/transport/index.ts            | 5 +----
 4 files changed, 6 insertions(+), 5 deletions(-)
 rename packages/libp2p-interfaces/src/{transport => }/errors.ts (100%)

diff --git a/packages/libp2p-interfaces-compliance-tests/src/transport/dial-test.ts b/packages/libp2p-interfaces-compliance-tests/src/transport/dial-test.ts
index c2d2dea06..b376dbfc6 100644
--- a/packages/libp2p-interfaces-compliance-tests/src/transport/dial-test.ts
+++ b/packages/libp2p-interfaces-compliance-tests/src/transport/dial-test.ts
@@ -5,7 +5,7 @@ import goodbye from 'it-goodbye'
 import { collect } from 'streaming-iterables'
 import { pipe } from 'it-pipe'
 import AbortController from 'abort-controller'
-import { AbortError } from 'libp2p-interfaces/transport/errors'
+import { AbortError } from 'libp2p-interfaces/errors'
 import sinon from 'sinon'
 import type { TestSetup } from '../index.js'
 import type { Transport, Listener } from 'libp2p-interfaces/transport'
diff --git a/packages/libp2p-interfaces/package.json b/packages/libp2p-interfaces/package.json
index 49f3060fa..a580e9c4d 100644
--- a/packages/libp2p-interfaces/package.json
+++ b/packages/libp2p-interfaces/package.json
@@ -73,6 +73,10 @@
       "import": "./dist/src/dht/index.js",
       "types": "./dist/src/dht/index.d.ts"
     },
+    "./errors": {
+      "import": "./dist/src/errors/index.js",
+      "types": "./dist/src/errors/index.d.ts"
+    },
     "./keys": {
       "import": "./dist/src/keys/index.js",
       "types": "./dist/src/keys/index.d.ts"
diff --git a/packages/libp2p-interfaces/src/transport/errors.ts b/packages/libp2p-interfaces/src/errors.ts
similarity index 100%
rename from packages/libp2p-interfaces/src/transport/errors.ts
rename to packages/libp2p-interfaces/src/errors.ts
diff --git a/packages/libp2p-interfaces/src/transport/index.ts b/packages/libp2p-interfaces/src/transport/index.ts
index e58bcb482..1d2a30ec5 100644
--- a/packages/libp2p-interfaces/src/transport/index.ts
+++ b/packages/libp2p-interfaces/src/transport/index.ts
@@ -1,10 +1,7 @@
 import type events from 'events'
 import type { Multiaddr } from 'multiaddr'
 import type { Connection } from '../connection'
-
-export interface AbortOptions {
-  signal?: AbortSignal
-}
+import type { AbortOptions } from '../index.js'
 
 export interface TransportFactory<DialOptions extends { signal?: AbortSignal }, ListenerOptions> {
   new(upgrader: Upgrader): Transport<DialOptions, ListenerOptions>