Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enforce no relative package imports #2890

Merged
merged 1 commit into from
Jul 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ module.exports = {
"func-call-spacing": "off",
//if --fix is run it messes imports like /lib/presets/minimal & /lib/presets/mainnet
"import/no-duplicates": "off",
"import/no-relative-packages": "error",
"node/no-deprecated-api": "error",
"new-parens": "error",
"no-caller": "error",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"codecov": "^3.6.5",
"concurrently": "^5.3.0",
"eslint": "^7.14.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-import": "^2.23.0",
"eslint-plugin-no-only-tests": "^2.4.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.1.4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {AggregatedAttestationPool} from "../../../../src/chain/opPools/aggregate
import {SLOTS_PER_EPOCH} from "@chainsafe/lodestar-params";
import {List} from "@chainsafe/ssz";
import {profilerLogger} from "@chainsafe/lodestar-beacon-state-transition/test/utils/logger";
import {generatePerfTestCachedStateAltair} from "../../../../../beacon-state-transition/test/perf/util";
import {generatePerfTestCachedStateAltair} from "@chainsafe/lodestar-beacon-state-transition/test/perf/util";

// Jul-21 09:20:46.653 [] info: Number of participations in state previousEpoch=250000, currentEpoch=250000
// Jul-21 09:23:38.382 [] info: Number of attestations in pool 1952
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import {itBench, setBenchOpts} from "@dapplion/benchmark";
import {CachedBeaconState} from "@chainsafe/lodestar-beacon-state-transition";
import {allForks, ssz} from "@chainsafe/lodestar-types";
import {allForks, ssz, phase0} from "@chainsafe/lodestar-types";
import {generateCachedState} from "../../../utils/state";
import {CheckpointStateCache} from "../../../../src/chain/stateCache";
import {Checkpoint} from "../../../../../types/phase0";

describe.skip("CheckpointStateCache perf tests", function () {
let state: CachedBeaconState<allForks.BeaconState>;
let checkpoint: Checkpoint;
let checkpoint: phase0.Checkpoint;
let checkpointStateCache: CheckpointStateCache;

setBenchOpts({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {createIChainForkConfig, defaultChainConfig} from "@chainsafe/lodestar-co
import {SLOTS_PER_EPOCH} from "@chainsafe/lodestar-params";
import {List} from "@chainsafe/ssz";
import {expect} from "chai";
import {ssz} from "../../../../../types/lib/phase0";
import {ssz, phase0} from "@chainsafe/lodestar-types";
import {
AggregatedAttestationPool,
aggregateInto,
Expand All @@ -17,7 +17,6 @@ import {generateCachedState} from "../../../utils/state";
import * as attestationUtils from "@chainsafe/lodestar-beacon-state-transition/lib/phase0/block/processAttestation";
import {SinonStubFn} from "../../../utils/types";
import sinon from "sinon";
import {phase0} from "../../../../../types/lib";

describe("AggregatedAttestationPool", function () {
let pool: AggregatedAttestationPool;
Expand Down Expand Up @@ -62,7 +61,7 @@ describe("MatchingDataAttestationGroup", function () {
let attestationGroup: MatchingDataAttestationGroup;
const committee = [100, 200, 300];
const attestationSeed = generateEmptyAttestation();
const attestationDataRoot = ssz.AttestationData.serialize(attestationSeed.data);
const attestationDataRoot = ssz.phase0.AttestationData.serialize(attestationSeed.data);
let sk1: SecretKey;
const attestation1 = {...attestationSeed, ...{aggregationBits: [true, true, false] as List<boolean>}};

Expand Down Expand Up @@ -175,7 +174,7 @@ describe("aggregateInto", function () {
const attestationSeed = generateEmptyAttestation();
const attestation1 = {...attestationSeed, ...{aggregationBits: [false, true] as List<boolean>}};
const attestation2 = {...attestationSeed, ...{aggregationBits: [true, false] as List<boolean>}};
const attestationDataRoot = ssz.AttestationData.serialize(attestationSeed.data);
const attestationDataRoot = ssz.phase0.AttestationData.serialize(attestationSeed.data);
let sk1: SecretKey;
let sk2: SecretKey;
before("Init BLS", async () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/validator/src/slashingProtection/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Epoch, Root, Slot} from "../../../types/phase0";
import {Epoch, Root, Slot} from "@chainsafe/lodestar-types";

/* eslint-disable @typescript-eslint/naming-convention */

Expand Down
Loading