From ebd739e9c04b06d04f0b871b67b41d7bd4d0a24d Mon Sep 17 00:00:00 2001 From: David Murdoch <187813+davidmurdoch@users.noreply.github.com> Date: Fri, 7 Jul 2023 17:11:46 -0400 Subject: [PATCH] remove old abort controller shim --- packages/ethereum/ethereum/package-lock.json | 33 ------------------- packages/ethereum/ethereum/package.json | 1 - .../ethereum/ethereum/src/forking/fork.ts | 1 - .../src/forking/handlers/base-handler.ts | 5 +-- .../src/forking/handlers/http-handler.ts | 1 - .../src/forking/handlers/provider-handler.ts | 1 - .../src/forking/handlers/ws-handler.ts | 1 - .../src/forking/rate-limiter/rate-limiter.ts | 1 - 8 files changed, 1 insertion(+), 43 deletions(-) diff --git a/packages/ethereum/ethereum/package-lock.json b/packages/ethereum/ethereum/package-lock.json index dcdcc827a9..8bbf8c0b71 100644 --- a/packages/ethereum/ethereum/package-lock.json +++ b/packages/ethereum/ethereum/package-lock.json @@ -16,7 +16,6 @@ "@ethereumjs/tx": "4.1.1", "@ethereumjs/util": "8.0.5", "@ethereumjs/vm": "6.4.1", - "abort-controller": "3.0.0", "bip39": "3.0.4", "chalk": "4.1.2", "emittery": "0.10.0", @@ -4575,17 +4574,6 @@ "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", "dev": true }, - "node_modules/abort-controller": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", - "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", - "dependencies": { - "event-target-shim": "^5.0.0" - }, - "engines": { - "node": ">=6.5" - } - }, "node_modules/abstract-level": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/abstract-level/-/abstract-level-1.0.3.tgz", @@ -7197,14 +7185,6 @@ "npm": ">=3" } }, - "node_modules/event-target-shim": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", - "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", - "engines": { - "node": ">=6" - } - }, "node_modules/eventemitter3": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz", @@ -16587,14 +16567,6 @@ "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", "dev": true }, - "abort-controller": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", - "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", - "requires": { - "event-target-shim": "^5.0.0" - } - }, "abstract-level": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/abstract-level/-/abstract-level-1.0.3.tgz", @@ -18614,11 +18586,6 @@ "strip-hex-prefix": "1.0.0" } }, - "event-target-shim": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", - "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==" - }, "eventemitter3": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz", diff --git a/packages/ethereum/ethereum/package.json b/packages/ethereum/ethereum/package.json index 2453aaec55..5850e89a84 100644 --- 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 index 9f116f8cea..4cb93d2328 100644 --- 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 index 7edc82fda1..69d121a686 100644 --- 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 index 61f6aefc19..41b0fe5523 100644 --- 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 index 462a1177c0..7dce2405d3 100644 --- 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 index eca6f9e01a..7665705dd2 100644 --- 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 index 52e6a4abc2..eb5f3884ca 100644 --- 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";