remove old abort controller shim

trufflesuite · Aug 5, 2023 · ebd739e · ebd739e
1 parent 9d4c43a
commit ebd739e
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 43 deletions.
diff --git a/packages/ethereum/ethereum/package-lock.json b/packages/ethereum/ethereum/package-lock.json
diff --git a/packages/ethereum/ethereum/package.json b/packages/ethereum/ethereum/package.json
@@ -69,7 +69,6 @@
     "@ganache/rlp": "0.9.0",
     "@ganache/secp256k1": "0.5.0",
     "@ganache/utils": "0.9.0",
-    "abort-controller": "3.0.0",
     "bip39": "3.0.4",
     "chalk": "4.1.2",
     "emittery": "0.10.0",

diff --git a/packages/ethereum/ethereum/src/forking/fork.ts b/packages/ethereum/ethereum/src/forking/fork.ts
@@ -1,6 +1,5 @@
 import { EthereumInternalOptions } from "@ganache/ethereum-options";
 import { Data, Quantity, KNOWN_CHAINIDS } from "@ganache/utils";
-import AbortController from "abort-controller";
 import { Common } from "@ethereumjs/common";
 import { HttpHandler } from "./handlers/http-handler";
 import { WsHandler } from "./handlers/ws-handler";

diff --git a/packages/ethereum/ethereum/src/forking/handlers/base-handler.ts b/packages/ethereum/ethereum/src/forking/handlers/base-handler.ts
@@ -1,6 +1,5 @@
 import { EthereumInternalOptions } from "@ganache/ethereum-options";
 import { hasOwn, JsonRpcError } from "@ganache/utils";
-import { AbortSignal } from "abort-controller";
 import { OutgoingHttpHeaders } from "http";
 import RateLimiter from "../rate-limiter/rate-limiter";
 import LRU from "lru-cache";
@@ -164,9 +163,7 @@ export class BaseHandler {
     method: string,
     params: any[],
     key: string,
-    send: (
-      ...args: unknown[]
-    ) => Promise<{
+    send: (...args: unknown[]) => Promise<{
       response: { result: any } | { error: { message: string; code: number } };
       raw: string | Buffer;
     }>,

diff --git a/packages/ethereum/ethereum/src/forking/handlers/http-handler.ts b/packages/ethereum/ethereum/src/forking/handlers/http-handler.ts
@@ -5,7 +5,6 @@ import { AbortError } from "@ganache/ethereum-utils";
 // Issue: https://github.com/trufflesuite/ganache/issues/3474
 import http, { RequestOptions, Agent as HttpAgent } from "http";
 import https, { Agent as HttpsAgent } from "https";
-import { AbortSignal } from "abort-controller";
 import { BaseHandler } from "./base-handler";
 import { Handler } from "../types";
 import Deferred from "../deferred";

diff --git a/packages/ethereum/ethereum/src/forking/handlers/provider-handler.ts b/packages/ethereum/ethereum/src/forking/handlers/provider-handler.ts
@@ -1,7 +1,6 @@
 import { EthereumInternalOptions } from "@ganache/ethereum-options";
 import { BaseHandler } from "./base-handler";
 import { Handler } from "../types";
-import { AbortSignal } from "abort-controller";
 
 import { JsonRpcError, JsonRpcResponse } from "@ganache/utils";
 

diff --git a/packages/ethereum/ethereum/src/forking/handlers/ws-handler.ts b/packages/ethereum/ethereum/src/forking/handlers/ws-handler.ts
@@ -1,6 +1,5 @@
 import { EthereumInternalOptions } from "@ganache/ethereum-options";
 import { AbortError } from "@ganache/ethereum-utils";
-import { AbortSignal } from "abort-controller";
 import WebSocket from "ws";
 import { Handler } from "../types";
 import { BaseHandler } from "./base-handler";

diff --git a/packages/ethereum/ethereum/src/forking/rate-limiter/rate-limiter.ts b/packages/ethereum/ethereum/src/forking/rate-limiter/rate-limiter.ts
@@ -1,6 +1,5 @@
 import { AbortError } from "@ganache/ethereum-utils";
 import { JsonRpcError, JsonRpcErrorCode, hasOwn } from "@ganache/utils";
-import { AbortSignal } from "abort-controller";
 import Semaphore from "semaphore";
 import { LimitCounter } from "./limit-counter";