Skip to content

Commit 573123b

Browse files
VictoriaAdeVictoriaAdenflaig
authored
chore: remove got dependency and move fetch code to the utils package (#7526)
Remove the `got` dependency from the codebase and move the fetch code to the utils package to allow reuse in places where `got` is currently used. Closes #6488 **Steps to test or reproduce** ``` yarn build yarn test:unit ``` <!--Steps to reproduce the behavior: ```sh git checkout <feature_branch> lodestar beacon --new-flag option1 ``` --> --------- Co-authored-by: VictoriaAde <adedayovicky123@gmail> Co-authored-by: Nico Flaig <nflaig@protonmail.com>
1 parent dd729f5 commit 573123b

File tree

29 files changed

+134
-70
lines changed

29 files changed

+134
-70
lines changed

packages/api/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export {HttpStatusCode} from "./utils/httpStatusCode.js";
44
export {WireFormat} from "./utils/wireFormat.js";
55
export {HttpHeader, MediaType} from "./utils/headers.js";
66
export type {HttpErrorCodes, HttpSuccessCodes} from "./utils/httpStatusCode.js";
7-
export {ApiResponse, HttpClient, FetchError, isFetchError, fetch, defaultInit} from "./utils/client/index.js";
7+
export {ApiResponse, HttpClient, defaultInit} from "./utils/client/index.js";
88
export type {ApiRequestInit} from "./utils/client/request.js";
99
export type {Endpoint} from "./utils/types.js";
1010
export type {

packages/api/src/utils/client/httpClient.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import {ErrorAborted, Logger, MapDef, TimeoutError, isValidHttpUrl, retry, toPrintableUrl} from "@lodestar/utils";
2+
import {fetch, isFetchError} from "@lodestar/utils";
23
import {mergeHeaders} from "../headers.js";
34
import {HttpStatusCode} from "../httpStatusCode.js";
45
import {Endpoint} from "../types.js";
56
import {WireFormat} from "../wireFormat.js";
6-
import {fetch, isFetchError} from "./fetch.js";
77
import {Metrics} from "./metrics.js";
88
import {
99
ApiRequestInit,

packages/api/src/utils/client/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
export * from "./fetch.js";
21
export * from "./httpClient.js";
32
export * from "./method.js";
43
export * from "./metrics.js";

packages/api/test/unit/client/httpClientFallback.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
import {fetch} from "@lodestar/utils";
12
import {afterEach, beforeEach, describe, expect, it, vi} from "vitest";
2-
import {HttpClient, RouteDefinitionExtra, fetch} from "../../../src/utils/client/index.js";
3+
import {HttpClient, RouteDefinitionExtra} from "../../../src/utils/client/index.js";
34
import {AnyEndpoint, EmptyRequestCodec, EmptyResponseCodec} from "../../../src/utils/codecs.js";
45
import {compileRouteUrlFormatter} from "../../../src/utils/urlFormat.js";
56

packages/api/test/utils/fetchOpenApiSpec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import fs from "node:fs";
22
import path from "node:path";
3-
import {fetch} from "@lodestar/api";
3+
import {fetch} from "@lodestar/utils";
44
import {OpenApiFile, OpenApiJson} from "./parseOpenApiSpec.js";
55

66
/* eslint-disable no-console */

packages/beacon-node/src/eth1/provider/eth1Provider.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
import {ChainConfig} from "@lodestar/config";
22
import {Logger} from "@lodestar/logger";
33
import {phase0} from "@lodestar/types";
4-
import {createElapsedTimeTracker, fromHex, isErrorAborted, toHex, toPrintableUrl} from "@lodestar/utils";
4+
import {
5+
FetchError,
6+
createElapsedTimeTracker,
7+
fromHex,
8+
isErrorAborted,
9+
isFetchError,
10+
toHex,
11+
toPrintableUrl,
12+
} from "@lodestar/utils";
513

6-
import {FetchError, isFetchError} from "@lodestar/api";
714
import {HTTP_CONNECTION_ERROR_CODES, HTTP_FATAL_ERROR_CODES} from "../../execution/engine/utils.js";
815
import {isValidAddress} from "../../util/address.js";
916
import {linspace} from "../../util/numpy.js";

packages/beacon-node/src/eth1/provider/jsonRpcHttpClient.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import {EventEmitter} from "node:events";
2-
import {fetch} from "@lodestar/api";
3-
import {ErrorAborted, Gauge, Histogram, TimeoutError, isValidHttpUrl, retry} from "@lodestar/utils";
2+
import {ErrorAborted, Gauge, Histogram, TimeoutError, fetch, isValidHttpUrl, retry} from "@lodestar/utils";
43
import {StrictEventEmitter} from "strict-event-emitter-types";
54
import {IJson, RpcPayload} from "../interface.js";
65
import {JwtClaim, encodeJwtToken} from "./jwt.js";

packages/beacon-node/src/execution/engine/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {isFetchError} from "@lodestar/api";
1+
import {isFetchError} from "@lodestar/utils";
22
import {isErrorAborted} from "@lodestar/utils";
33
import {IJson, RpcPayload} from "../../eth1/interface.js";
44
import {

packages/beacon-node/src/monitoring/service.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import {fetch} from "@lodestar/api";
2-
import {ErrorAborted, Histogram, Logger, TimeoutError} from "@lodestar/utils";
1+
import {ErrorAborted, Histogram, Logger, TimeoutError, fetch} from "@lodestar/utils";
32
import {Registry} from "prom-client";
43
import {RegistryMetricCreator} from "../metrics/index.js";
54
import {createClientStats} from "./clientStats.js";

packages/beacon-node/test/e2e/api/impl/config.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {fetch} from "@lodestar/api";
21
import {chainConfig} from "@lodestar/config/default";
32
import {ForkName, activePreset} from "@lodestar/params";
3+
import {fetch} from "@lodestar/utils";
44
import {describe, it} from "vitest";
55
import {specConstants} from "../../../../src/api/impl/config/constants.js";
66
import {ethereumConsensusSpecsTests} from "../../../spec/specTestVersioning.js";

0 commit comments

Comments
 (0)