Skip to content

Commit

Permalink
Merge branch 'master' into eip-2537
Browse files Browse the repository at this point in the history
  • Loading branch information
holgerd77 authored Sep 9, 2020
2 parents 4763f36 + 7c354a4 commit e8865cf
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
17 changes: 12 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Installs dependencies for all sub-packages, and links them to create an integrat

#### `npm run build`

Produces `dist` files for all sub-packages. This command can be scoped
Produces `dist` files for all sub-packages. This command can be scoped.

#### `npm run build:tree -- --scope @ethereumjs/blockchain`

Expand Down Expand Up @@ -95,15 +95,19 @@ Generates package documentation and outputs it to `./packages/<name>/docs`.

#### `npm run lint`

Checks code style, according to the rules defined in [ethereumjs-config](https://github.com/ethereumjs/ethereumjs-config).
Checks code style according to the rules defined in [ethereumjs-config](https://github.com/ethereumjs/ethereumjs-config).

#### `npm run lint:fix`

Fixes code style, according to the rules
Fixes code style according to the rules.

#### `npm run test`

Runs all package tests. Note that the VM have several test scopes. Refer to their package.json for more info.
Runs all package tests. Note that the VM has several test scopes - refer to [packages/vm/package.json](https://github.com/ethereumjs/ethereumjs-vm/blob/master/packages/vm/package.json) for more info.

#### `npm run clean`

Removes root and package `node_modules` directories. Useful to run before `npm i` for a fresh install.

### Going further

Expand All @@ -112,7 +116,10 @@ As this project is powered by Lerna, you can install it globally to enjoy lots m
- `npm install -g lerna`
- `lerna run`
- `lerna exec`
- `lerna clean`

#### Cleaning `node_modules`

Hoisting is enabled so dependencies are moved to the root `node_modules`. `lerna clean` [does not remove the root `node_modules`](https://github.com/lerna/lerna/issues/1304) so for convenience you can use the project script `npm run clean`.

# EthereumJS

Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"lint:fix": "lerna run lint:fix --stream --parallel",
"test": "lerna exec npm run test --parallel",
"coverage": "lerna run coverage --stream",
"docs:build": "lerna run docs:build --ignore @ethereumjs/ethash"
"docs:build": "lerna run docs:build --ignore @ethereumjs/ethash",
"clean": "lerna exec -- rm -rf node_modules && rm -rf node_modules"
}
}

1 comment on commit e8865cf

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Benchmark

Benchmark suite Current: e8865cf Previous: 7c354a4 Ratio
Block 9422905 1954 ops/sec (±3.33%) 1896 ops/sec (±6.44%) 0.97
Block 9422906 1916 ops/sec (±5.23%) 1997 ops/sec (±5.83%) 1.04
Block 9422907 1974 ops/sec (±1.25%) 1921 ops/sec (±8.88%) 0.97
Block 9422908 1920 ops/sec (±1.14%) 2116 ops/sec (±1.15%) 1.10
Block 9422909 1635 ops/sec (±12.25%) 2071 ops/sec (±1.72%) 1.27
Block 9422910 1899 ops/sec (±0.98%) 1724 ops/sec (±14.31%) 0.91
Block 9422911 1879 ops/sec (±1.01%) 2059 ops/sec (±1.82%) 1.10
Block 9422912 1802 ops/sec (±0.98%) 2136 ops/sec (±1.61%) 1.19
Block 9422913 1779 ops/sec (±1.49%) 2128 ops/sec (±1.82%) 1.20
Block 9422914 1169 ops/sec (±16.70%) 2131 ops/sec (±1.63%) 1.82

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.