Skip to content

Commit 06b4c2d

Browse files
authored
chore: fix import order with biome syntax (#7211)
Fix import order
1 parent 794e5ef commit 06b4c2d

File tree

1,068 files changed

+3633
-3636
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,068 files changed

+3633
-3636
lines changed

biome.jsonc

+1-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@
1818
"ignore": ["**/lib", "**/.nyc_output", "./packages/*/spec-tests", "**/node_modules", "./packages/*/node_modules/**"]
1919
},
2020
"organizeImports": {
21-
// TODO: We will enable this settings as soon mono-repo support is provided in biome.
22-
// Currently it didn't recognize local packages in repo and sort those higher than npm packages
23-
// https://github.com/biomejs/biome/issues/2228
24-
"enabled": false
21+
"enabled": true
2522
},
2623
"linter": {
2724
"enabled": true,

packages/api/src/beacon/client/debug.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {ChainForkConfig} from "@lodestar/config";
2-
import {ApiClientMethods, createApiClientMethods, IHttpClient} from "../../utils/client/index.js";
2+
import {ApiClientMethods, IHttpClient, createApiClientMethods} from "../../utils/client/index.js";
33
import {Endpoints, getDefinitions} from "../routes/debug.js";
44

55
export type ApiClient = ApiClientMethods<Endpoints>;

packages/api/src/beacon/routes/beacon/block.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
import {ContainerType, ListCompositeType, ValueOf} from "@chainsafe/ssz";
22
import {ChainForkConfig} from "@lodestar/config";
3+
import {ForkName, ForkPreElectra, ForkPreExecution, isForkBlobs, isForkExecution} from "@lodestar/params";
34
import {
4-
Slot,
5-
ssz,
5+
BeaconBlockBody,
66
RootHex,
7-
deneb,
8-
isSignedBlockContents,
97
SignedBeaconBlock,
10-
BeaconBlockBody,
118
SignedBeaconBlockOrContents,
129
SignedBlindedBeaconBlock,
1310
SignedBlockContents,
11+
Slot,
12+
deneb,
13+
isSignedBlockContents,
14+
ssz,
1415
sszTypesFor,
1516
} from "@lodestar/types";
16-
import {ForkName, ForkPreElectra, ForkPreExecution, isForkBlobs, isForkExecution} from "@lodestar/params";
17-
import {Endpoint, RequestCodec, RouteDefinitions, Schema} from "../../../utils/index.js";
1817
import {EmptyMeta, EmptyResponseCodec, EmptyResponseData, WithVersion} from "../../../utils/codecs.js";
18+
import {getExecutionForkTypes, toForkName} from "../../../utils/fork.js";
19+
import {fromHeaders} from "../../../utils/headers.js";
20+
import {Endpoint, RequestCodec, RouteDefinitions, Schema} from "../../../utils/index.js";
1921
import {
2022
ExecutionOptimisticAndFinalizedCodec,
2123
ExecutionOptimisticAndFinalizedMeta,
2224
ExecutionOptimisticFinalizedAndVersionCodec,
2325
ExecutionOptimisticFinalizedAndVersionMeta,
2426
MetaHeader,
2527
} from "../../../utils/metadata.js";
26-
import {getExecutionForkTypes, toForkName} from "../../../utils/fork.js";
27-
import {fromHeaders} from "../../../utils/headers.js";
2828
import {WireFormat} from "../../../utils/wireFormat.js";
2929

3030
// See /packages/api/src/routes/index.ts for reasoning and instructions to add new routes

packages/api/src/beacon/routes/beacon/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import {ChainForkConfig} from "@lodestar/config";
22
import {phase0, ssz} from "@lodestar/types";
3+
import {EmptyArgs, EmptyMeta, EmptyMetaCodec, EmptyRequest, EmptyRequestCodec} from "../../../utils/codecs.js";
34
import {Endpoint, RouteDefinitions} from "../../../utils/types.js";
4-
import {EmptyArgs, EmptyRequestCodec, EmptyMeta, EmptyMetaCodec, EmptyRequest} from "../../../utils/codecs.js";
55
import * as block from "./block.js";
66
import * as pool from "./pool.js";
7-
import * as state from "./state.js";
87
import * as rewards from "./rewards.js";
8+
import * as state from "./state.js";
99

1010
// See /packages/api/src/routes/index.ts for reasoning and instructions to add new routes
1111

packages/api/src/beacon/routes/beacon/pool.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
import {ValueOf} from "@chainsafe/ssz";
22
import {ChainForkConfig} from "@lodestar/config";
33
import {isForkPostElectra} from "@lodestar/params";
4-
import {phase0, capella, CommitteeIndex, Slot, ssz, electra, AttesterSlashing} from "@lodestar/types";
5-
import {Schema, Endpoint, RouteDefinitions} from "../../../utils/index.js";
4+
import {AttesterSlashing, CommitteeIndex, Slot, capella, electra, phase0, ssz} from "@lodestar/types";
65
import {
76
ArrayOf,
87
EmptyArgs,
9-
EmptyRequestCodec,
108
EmptyMeta,
119
EmptyMetaCodec,
1210
EmptyRequest,
11+
EmptyRequestCodec,
1312
EmptyResponseCodec,
1413
EmptyResponseData,
1514
WithVersion,
1615
} from "../../../utils/codecs.js";
17-
import {MetaHeader, VersionCodec, VersionMeta} from "../../../utils/metadata.js";
1816
import {toForkName} from "../../../utils/fork.js";
1917
import {fromHeaders} from "../../../utils/headers.js";
18+
import {Endpoint, RouteDefinitions, Schema} from "../../../utils/index.js";
19+
import {MetaHeader, VersionCodec, VersionMeta} from "../../../utils/metadata.js";
2020

2121
// See /packages/api/src/routes/index.ts for reasoning and instructions to add new routes
2222

packages/api/src/beacon/routes/beacon/rewards.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import {ContainerType, ValueOf} from "@chainsafe/ssz";
22
import {ChainForkConfig} from "@lodestar/config";
33
import {Epoch, ssz} from "@lodestar/types";
44

5-
import {Schema, Endpoint, RouteDefinitions} from "../../../utils/index.js";
6-
import {fromValidatorIdsStr, toValidatorIdsStr} from "../../../utils/serdes.js";
75
import {ArrayOf, JsonOnlyReq} from "../../../utils/codecs.js";
6+
import {Endpoint, RouteDefinitions, Schema} from "../../../utils/index.js";
87
import {ExecutionOptimisticAndFinalizedCodec, ExecutionOptimisticAndFinalizedMeta} from "../../../utils/metadata.js";
8+
import {fromValidatorIdsStr, toValidatorIdsStr} from "../../../utils/serdes.js";
99
import {BlockArgs} from "./block.js";
1010
import {ValidatorId} from "./state.js";
1111

packages/api/src/beacon/routes/beacon/state.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import {ContainerType, ValueOf} from "@chainsafe/ssz";
22
import {ChainForkConfig} from "@lodestar/config";
33
import {MAX_VALIDATORS_PER_COMMITTEE} from "@lodestar/params";
4-
import {phase0, CommitteeIndex, Slot, Epoch, ssz, RootHex, StringType, ValidatorStatus} from "@lodestar/types";
5-
import {Endpoint, RequestCodec, RouteDefinitions, Schema} from "../../../utils/index.js";
4+
import {CommitteeIndex, Epoch, RootHex, Slot, StringType, ValidatorStatus, phase0, ssz} from "@lodestar/types";
65
import {ArrayOf, JsonOnlyReq} from "../../../utils/codecs.js";
6+
import {Endpoint, RequestCodec, RouteDefinitions, Schema} from "../../../utils/index.js";
77
import {ExecutionOptimisticAndFinalizedCodec, ExecutionOptimisticAndFinalizedMeta} from "../../../utils/metadata.js";
88
import {fromValidatorIdsStr, toValidatorIdsStr} from "../../../utils/serdes.js";
99
import {WireFormat} from "../../../utils/wireFormat.js";

packages/api/src/beacon/routes/config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import {ssz} from "@lodestar/types";
44
import {
55
ArrayOf,
66
EmptyArgs,
7-
EmptyRequestCodec,
87
EmptyMeta,
98
EmptyMetaCodec,
109
EmptyRequest,
10+
EmptyRequestCodec,
1111
JsonOnlyResp,
1212
} from "../../utils/codecs.js";
1313
import {Endpoint, RouteDefinitions} from "../../utils/index.js";

packages/api/src/beacon/routes/debug.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
import {ContainerType, Type, ValueOf} from "@chainsafe/ssz";
22
import {ChainForkConfig} from "@lodestar/config";
3-
import {ssz, StringType, BeaconState} from "@lodestar/types";
3+
import {BeaconState, StringType, ssz} from "@lodestar/types";
44
import {
55
ArrayOf,
66
EmptyArgs,
7-
EmptyRequestCodec,
87
EmptyMeta,
98
EmptyMetaCodec,
109
EmptyRequest,
10+
EmptyRequestCodec,
1111
WithVersion,
1212
} from "../../utils/codecs.js";
1313
import {
1414
ExecutionOptimisticFinalizedAndVersionCodec,
1515
ExecutionOptimisticFinalizedAndVersionMeta,
1616
} from "../../utils/metadata.js";
17+
import {Schema} from "../../utils/schema.js";
1718
import {Endpoint, RouteDefinitions} from "../../utils/types.js";
1819
import {WireFormat} from "../../utils/wireFormat.js";
19-
import {Schema} from "../../utils/schema.js";
2020
import {StateArgs} from "./beacon/state.js";
2121

2222
// See /packages/api/src/routes/index.ts for reasoning and instructions to add new routes

packages/api/src/beacon/routes/events.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
import {ContainerType, ValueOf} from "@chainsafe/ssz";
22
import {ChainForkConfig} from "@lodestar/config";
3+
import {ForkName} from "@lodestar/params";
34
import {
5+
Attestation,
6+
AttesterSlashing,
47
Epoch,
5-
phase0,
6-
capella,
8+
LightClientFinalityUpdate,
9+
LightClientOptimisticUpdate,
10+
RootHex,
11+
SSEPayloadAttributes,
712
Slot,
8-
ssz,
913
StringType,
10-
RootHex,
11-
altair,
1214
UintNum64,
13-
LightClientOptimisticUpdate,
14-
LightClientFinalityUpdate,
15-
SSEPayloadAttributes,
16-
Attestation,
17-
AttesterSlashing,
15+
altair,
16+
capella,
17+
phase0,
18+
ssz,
1819
sszTypesFor,
1920
} from "@lodestar/types";
20-
import {ForkName} from "@lodestar/params";
2121

22-
import {Endpoint, RouteDefinitions, Schema} from "../../utils/index.js";
2322
import {EmptyMeta, EmptyResponseCodec, EmptyResponseData} from "../../utils/codecs.js";
2423
import {getExecutionForkTypes, getLightClientForkTypes} from "../../utils/fork.js";
24+
import {Endpoint, RouteDefinitions, Schema} from "../../utils/index.js";
2525
import {VersionType} from "../../utils/metadata.js";
2626

2727
// See /packages/api/src/routes/index.ts for reasoning and instructions to add new routes

packages/api/src/beacon/routes/lightclient.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
import {ListCompositeType, ValueOf} from "@chainsafe/ssz";
2+
import {BeaconConfig, ChainForkConfig, createBeaconConfig} from "@lodestar/config";
3+
import {NetworkName, genesisData} from "@lodestar/config/networks";
4+
import {ForkName, ZERO_HASH} from "@lodestar/params";
25
import {
36
LightClientBootstrap,
47
LightClientFinalityUpdate,
58
LightClientOptimisticUpdate,
69
LightClientUpdate,
7-
ssz,
810
SyncPeriod,
11+
ssz,
912
} from "@lodestar/types";
1013
import {fromHex} from "@lodestar/utils";
11-
import {ForkName, ZERO_HASH} from "@lodestar/params";
12-
import {BeaconConfig, ChainForkConfig, createBeaconConfig} from "@lodestar/config";
13-
import {genesisData, NetworkName} from "@lodestar/config/networks";
14-
import {Endpoint, RouteDefinitions, Schema} from "../../utils/index.js";
15-
import {MetaHeader, VersionCodec, VersionMeta} from "../../utils/metadata.js";
16-
import {getLightClientForkTypes, toForkName} from "../../utils/fork.js";
1714
import {
1815
EmptyArgs,
19-
EmptyRequestCodec,
2016
EmptyMeta,
2117
EmptyMetaCodec,
2218
EmptyRequest,
19+
EmptyRequestCodec,
2320
WithVersion,
2421
} from "../../utils/codecs.js";
22+
import {getLightClientForkTypes, toForkName} from "../../utils/fork.js";
23+
import {Endpoint, RouteDefinitions, Schema} from "../../utils/index.js";
24+
import {MetaHeader, VersionCodec, VersionMeta} from "../../utils/metadata.js";
2525

2626
// See /packages/api/src/routes/index.ts for reasoning and instructions to add new routes
2727

packages/api/src/beacon/routes/lodestar.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import {ChainForkConfig} from "@lodestar/config";
22
import {Epoch, RootHex, Slot} from "@lodestar/types";
3-
import {Schema, Endpoint, RouteDefinitions} from "../../utils/index.js";
43
import {
54
EmptyArgs,
6-
EmptyRequestCodec,
75
EmptyMeta,
86
EmptyRequest,
7+
EmptyRequestCodec,
98
EmptyResponseCodec,
109
EmptyResponseData,
1110
JsonOnlyResponseCodec,
1211
} from "../../utils/codecs.js";
12+
import {Endpoint, RouteDefinitions, Schema} from "../../utils/index.js";
1313
import {FilterGetPeers, NodePeer, PeerDirection, PeerState} from "./node.js";
1414

1515
// See /packages/api/src/routes/index.ts for reasoning and instructions to add new routes

packages/api/src/beacon/routes/node.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
import {ContainerType, ValueOf} from "@chainsafe/ssz";
22
import {ChainForkConfig} from "@lodestar/config";
33
import {ssz, stringType} from "@lodestar/types";
4-
import {Endpoint, RouteDefinitions, Schema} from "../../utils/index.js";
54
import {
65
ArrayOf,
76
EmptyArgs,
8-
EmptyRequestCodec,
97
EmptyMeta,
108
EmptyMetaCodec,
119
EmptyRequest,
10+
EmptyRequestCodec,
1211
EmptyResponseCodec,
1312
EmptyResponseData,
1413
JsonOnlyResponseCodec,
1514
} from "../../utils/codecs.js";
1615
import {HttpStatusCode} from "../../utils/httpStatusCode.js";
16+
import {Endpoint, RouteDefinitions, Schema} from "../../utils/index.js";
1717
import {WireFormat} from "../../utils/wireFormat.js";
1818

1919
// See /packages/api/src/routes/index.ts for reasoning and instructions to add new routes

packages/api/src/beacon/routes/proof.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import {CompactMultiProof, ProofType} from "@chainsafe/persistent-merkle-tree";
22
import {ByteListType, ContainerType} from "@chainsafe/ssz";
3-
import {fromHex, toHex} from "@lodestar/utils";
43
import {ChainForkConfig} from "@lodestar/config";
54
import {ssz} from "@lodestar/types";
6-
import {Endpoint, RouteDefinitions, Schema} from "../../utils/index.js";
5+
import {fromHex, toHex} from "@lodestar/utils";
76
import {ArrayOf} from "../../utils/codecs.js";
7+
import {Endpoint, RouteDefinitions, Schema} from "../../utils/index.js";
88
import {VersionCodec, VersionMeta} from "../../utils/metadata.js";
99

1010
export const CompactMultiProofType = new ContainerType({

packages/api/src/beacon/routes/validator.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,24 @@ import {ContainerType, Type, ValueOf} from "@chainsafe/ssz";
22
import {ChainForkConfig} from "@lodestar/config";
33
import {isForkBlobs, isForkPostElectra} from "@lodestar/params";
44
import {
5-
altair,
5+
Attestation,
66
BLSSignature,
7+
BeaconBlockOrContents,
8+
BlindedBeaconBlock,
79
CommitteeIndex,
810
Epoch,
9-
phase0,
11+
ProducedBlockSource,
1012
Root,
1113
Slot,
12-
ssz,
1314
UintBn64,
1415
ValidatorIndex,
15-
ProducedBlockSource,
16-
stringType,
17-
BeaconBlockOrContents,
18-
BlindedBeaconBlock,
19-
Attestation,
16+
altair,
17+
phase0,
18+
ssz,
2019
sszTypesFor,
20+
stringType,
2121
} from "@lodestar/types";
2222
import {fromHex, toHex, toRootHex} from "@lodestar/utils";
23-
import {Endpoint, RouteDefinitions, Schema} from "../../utils/index.js";
24-
import {fromGraffitiHex, toBoolean, toGraffitiHex} from "../../utils/serdes.js";
25-
import {getExecutionForkTypes, toForkName} from "../../utils/fork.js";
2623
import {
2724
ArrayOf,
2825
EmptyMeta,
@@ -33,6 +30,9 @@ import {
3330
WithMeta,
3431
WithVersion,
3532
} from "../../utils/codecs.js";
33+
import {getExecutionForkTypes, toForkName} from "../../utils/fork.js";
34+
import {fromHeaders} from "../../utils/headers.js";
35+
import {Endpoint, RouteDefinitions, Schema} from "../../utils/index.js";
3636
import {
3737
ExecutionOptimisticAndDependentRootCodec,
3838
ExecutionOptimisticAndDependentRootMeta,
@@ -43,7 +43,7 @@ import {
4343
VersionMeta,
4444
VersionType,
4545
} from "../../utils/metadata.js";
46-
import {fromHeaders} from "../../utils/headers.js";
46+
import {fromGraffitiHex, toBoolean, toGraffitiHex} from "../../utils/serdes.js";
4747

4848
// See /packages/api/src/routes/index.ts for reasoning and instructions to add new routes
4949

packages/api/src/beacon/server/events.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {ChainForkConfig} from "@lodestar/config";
22
import {ApiError, ApplicationMethods, FastifyRoutes, createFastifyRoutes} from "../../utils/server/index.js";
3-
import {Endpoints, getDefinitions, eventTypes, getEventSerdes} from "../routes/events.js";
3+
import {Endpoints, eventTypes, getDefinitions, getEventSerdes} from "../routes/events.js";
44

55
export function getRoutes(config: ChainForkConfig, methods: ApplicationMethods<Endpoints>): FastifyRoutes<Endpoints> {
66
const eventSerdes = getEventSerdes(config);

packages/api/src/beacon/server/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import type {FastifyInstance} from "fastify";
21
import {ChainForkConfig} from "@lodestar/config";
2+
import type {FastifyInstance} from "fastify";
33
import {ApplicationMethods, FastifyRoute} from "../../utils/server/index.js";
44
import {Endpoints} from "../routes/index.js";
55

packages/api/src/builder/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {ChainForkConfig} from "@lodestar/config";
22
import {HttpClient, HttpClientModules, HttpClientOptions, IHttpClient} from "../utils/client/httpClient.js";
3-
import {Endpoints} from "./routes.js";
43
import type {ApiClient} from "./client.js";
4+
import {Endpoints} from "./routes.js";
55

66
import * as builder from "./client.js";
77

0 commit comments

Comments
 (0)