Skip to content

Commit

Permalink
Rename packages using @lodestar namespace (#4231)
Browse files Browse the repository at this point in the history
* Remove event handlers file

* exposing util module from the light-client package

* Rename packages using @lodestar namespace

* Fix linter errors

* Fix merge

Co-authored-by: dapplion <35266934+dapplion@users.noreply.github.com>
Co-authored-by: Dadepo Aderemi <dadepo@gmail.com>
  • Loading branch information
3 people committed Jul 6, 2022
1 parent 3682e4c commit e5dabac
Show file tree
Hide file tree
Showing 990 changed files with 1,959 additions and 1,924 deletions.
7 changes: 7 additions & 0 deletions .eslintrc.js
Expand Up @@ -31,6 +31,13 @@ module.exports = {
"error",
{
groups: ["builtin", "external", "internal", "parent", "sibling", "index"],
pathGroups: [
{
pattern: "@lodestar/**",
group: "internal",
}
],
pathGroupsExcludedImportTypes: ["builtin"],
},
],
"@typescript-eslint/await-thenable": "error",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/benchmark.yml
Expand Up @@ -50,8 +50,8 @@ jobs:
- name: Restore performance state cache
uses: actions/cache@master
with:
path: packages/beacon-state-transition/test-cache
key: perf-states-${{ hashFiles('packages/beacon-state-transition/test/perf/params.ts') }}
path: packages/state-transition/test-cache
key: perf-states-${{ hashFiles('packages/state-transition/test/perf/params.ts') }}

- name: Run benchmarks
run: yarn benchmark
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-dev.yml
Expand Up @@ -86,7 +86,7 @@ jobs:
# --exact
# lerna will link the dependencies of monorepo packages without ^ operator as npm
# is apparently bad at resolving ^ dependencies of the canary versions. For e.g
# @chainsafe/lodestar-cli@^0.34.0-dev.4 resolves to => 0.34.0
# @chainsafe/lodestar@^0.34.0-dev.4 resolves to => 0.34.0
#
# NOTE: Using --preid dev.$(git rev-parse --short=7 HEAD) results in `0.24.3-dev.3ddb91d.0+3ddb91d`
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-sim-merge.yml
Expand Up @@ -46,7 +46,7 @@ jobs:

- name: Test Lodestar <> Geth interop
run: yarn test:sim:merge-interop
working-directory: packages/lodestar
working-directory: packages/beacon-node
env:
EL_BINARY_DIR: ../../go-ethereum/build/bin
EL_SCRIPT_DIR: kiln/geth
Expand All @@ -65,7 +65,7 @@ jobs:

- name: Test Lodestar <> Nethermind interop
run: yarn test:sim:merge-interop
working-directory: packages/lodestar
working-directory: packages/beacon-node
env:
EL_BINARY_DIR: ../../nethermind/src/Nethermind/Nethermind.Runner
EL_SCRIPT_DIR: kiln/nethermind
Expand All @@ -77,4 +77,4 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: debug-test-logs
path: packages/lodestar/test-logs
path: packages/beacon-node/test-logs
12 changes: 6 additions & 6 deletions .github/workflows/test-sim.yml
Expand Up @@ -33,25 +33,25 @@ jobs:

- name: Simulation single thread single node test
run: yarn test:sim:singleThread
working-directory: packages/lodestar
working-directory: packages/beacon-node
- name: Simulation single thread multi node test
run: yarn test:sim:singleThreadMultiNode
working-directory: packages/lodestar
working-directory: packages/beacon-node
# - name: Simulation multi thread multi node test phase0
# run: yarn test:sim:multiThread
# working-directory: packages/lodestar
# working-directory: packages/beacon-node
# env: {RUN_ONLY_SIM_TEST: phase0}
# - name: Simulation multi thread multi node test altair epoch genesis
# run: yarn test:sim:multiThread
# working-directory: packages/lodestar
# working-directory: packages/beacon-node
# env: {RUN_ONLY_SIM_TEST: altair-genesis}
# - name: Simulation multi thread multi node test altair epoch 2
# run: yarn test:sim:multiThread
# working-directory: packages/lodestar
# working-directory: packages/beacon-node
# env: {RUN_ONLY_SIM_TEST: altair-epoch2}
- name: Upload debug log test files
if: ${{ always() }}
uses: actions/upload-artifact@v2
with:
name: debug-test-logs
path: packages/lodestar/test-logs
path: packages/beacon-node/test-logs
12 changes: 6 additions & 6 deletions .github/workflows/test-spec.yml
Expand Up @@ -38,21 +38,21 @@ jobs:
- name: Restore spec tests cache
uses: actions/cache@master
with:
path: packages/lodestar/spec-tests
key: spec-test-data-${{ hashFiles('packages/lodestar/test/spec/specTestVersioning.ts') }}
path: packages/beacon-node/spec-tests
key: spec-test-data-${{ hashFiles('packages/beacon-node/test/spec/specTestVersioning.ts') }}
- name: Download spec tests
run: yarn download-spec-tests
working-directory: packages/lodestar
working-directory: packages/beacon-node

# Run them in different steps to quickly identifying which command failed
# Otherwise just doing `yarn test:spec` you can't tell which specific suite failed
# many of the suites have identical names for minimal and mainnet
- name: Spec tests general
run: yarn test:spec-general
working-directory: packages/lodestar
working-directory: packages/beacon-node
- name: Spec tests minimal
run: yarn test:spec-minimal
working-directory: packages/lodestar
working-directory: packages/beacon-node
- name: Spec tests mainnet
run: yarn test:spec-mainnet
working-directory: packages/lodestar
working-directory: packages/beacon-node
6 changes: 3 additions & 3 deletions .gitignore
Expand Up @@ -28,11 +28,11 @@ validators
# Tests artifacts
packages/*/spec-tests
packages/*/benchmark_data
packages/lodestar/test-logs/
packages/beacon-state-transition/test-cache
packages/beacon-node/test-logs/
packages/state-transition/test-cache
benchmark_data
invalidSszObjects/
packages/lodestar/mainnet_pubkeys.csv
packages/beacon-node/mainnet_pubkeys.csv

# Autogenerated docs
packages/**/docs
Expand Down
26 changes: 13 additions & 13 deletions CONTRIBUTING.md
Expand Up @@ -168,19 +168,19 @@ Status labels only apply to pull requests.

The Module labels should be applied to all issues and pull requests if possible.

- `mod1-beaconchain`: The @chainsafe/lodestar beacon-chain module.
- `mod2-validator`: The @chainsafe/lodestar-validator module.
- `mod3-lightclient`: The @chainsafe/lodestar-light-client module.
- `mod4-api`: The @chainsafe/lodestar-api module.
- `mod5-cli`: The @chainsafe/lodestar-cli module.
- `mod6-statetransition`: The @chainsafe/lodestar-beacon-state-transition module.
- `mod7-types`: The @chainsafe/lodestar-types module.
- `mod8-params`: The @chainsafe/lodestar-params module.
- `mod9-utils`: The @chainsafe/lodestar-utils module.
- `moda-config`: The @chainsafe/lodestar-config module.
- `modb-database`: The @chainsafe/lodestar-db module.
- `modc-forkchoice`: The @chainsafe/lodestar-fork-choice module.
- `modd-spectests`: The @chainsafe/lodestar-spec-test-\* modules.
- `mod1-beaconchain`: The @lodestar/beacon-node beacon-chain module.
- `mod2-validator`: The @lodestar/validator module.
- `mod3-lightclient`: The @lodestar/light-client module.
- `mod4-api`: The @lodestar/api module.
- `mod5-cli`: The @chainsafe/lodestar module.
- `mod6-statetransition`: The @lodestar/state-transition module.
- `mod7-types`: The @lodestar/types module.
- `mod8-params`: The @lodestar/params module.
- `mod9-utils`: The @lodestar/utils module.
- `moda-config`: The @lodestar/config module.
- `modb-database`: The @lodestar/db module.
- `modc-forkchoice`: The @lodestar/fork-choice module.
- `modd-spectests`: The @lodestar/spec-test-\* modules.

###### `scope.*` Scope Indicator

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Expand Up @@ -4,7 +4,7 @@ RUN apk update && apk add --no-cache g++ make python3 && rm -rf /var/cache/apk/*

ARG VERSION=latest
ENV VERSION=$VERSION
RUN npm install @chainsafe/lodestar-cli@$VERSION
RUN npm install @chainsafe/lodestar@$VERSION

FROM node:16-alpine
WORKDIR /usr/app
Expand Down

0 comments on commit e5dabac

Please sign in to comment.