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

Monorepo: Vitest Test Transition / ESM Part 2 #2764

Merged
merged 63 commits into from
Jun 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
f78730f
RLP: Switch Tape -> Vitest, add dependencies, remove Karma config
holgerd77 Jun 8, 2023
760e5e7
Rebuild package-lock.json
holgerd77 Jun 8, 2023
f307e22
(Hopefully) fix coverage
holgerd77 Jun 8, 2023
5f20d50
RLP: update import file path references
holgerd77 Jun 8, 2023
0e3a126
RLP: switch to type module in package.json, fix linter (explcitly swi…
holgerd77 Jun 9, 2023
ec80bf1
Util: tape -> vitest
holgerd77 Jun 9, 2023
378742d
Util: add internal .js file references
holgerd77 Jun 9, 2023
03b6625
Monorepo: renamed other .eslintrc.js files to .eslintrc.cjs
holgerd77 Jun 9, 2023
6ae874c
Util: adjust external import path references
holgerd77 Jun 9, 2023
a223078
ESLint config path fix
holgerd77 Jun 9, 2023
89a8c1e
Common: tape -> vitest transition
holgerd77 Jun 9, 2023
73407d8
Common: fix browser tests
holgerd77 Jun 10, 2023
96852eb
Common: add missing path references
holgerd77 Jun 10, 2023
0a3abca
Common fixes
holgerd77 Jun 12, 2023
0a2d4ef
Block: Tape -> Vitest test transition (Node tests)
holgerd77 Jun 12, 2023
d38c9c0
Migrate blockchain tests to vitest
acolytec3 Jun 12, 2023
d6d510e
Remove karma from blockchain
acolytec3 Jun 12, 2023
bb9207a
Small syntax updates
holgerd77 Jun 13, 2023
0a72d41
Block: require -> import JSON updates
holgerd77 Jun 13, 2023
35d82b4
Block: JSON import related test fixes
holgerd77 Jun 13, 2023
b71f509
Block: update .js path references
holgerd77 Jun 13, 2023
20a035e
Blockchain: .js additions
holgerd77 Jun 13, 2023
5c8b275
Blockchain: add more .js path references
holgerd77 Jun 13, 2023
d8cd20a
Run browser tests in headless mode
holgerd77 Jun 13, 2023
4984b11
StateManager: vitest transition part 1
holgerd77 Jun 13, 2023
a9990ad
StateManager: tape -> vitest test transitions (EthersStateManager tes…
holgerd77 Jun 13, 2023
aa6f033
Remove require() from ESM test
holgerd77 Jun 13, 2023
f9c0e31
StateManager: update lru-cache dependency from v7 -> v9
holgerd77 Jun 13, 2023
65308b2
StateManager: more .js file additions
holgerd77 Jun 13, 2023
64718a4
Add browser config for vitest in block
acolytec3 Jun 13, 2023
04d8a46
Tx: tape -> vitest test transition
holgerd77 Jun 14, 2023
f0ab52a
Tx: adopt tx test runner
holgerd77 Jun 14, 2023
8142ea6
Tx: JSON require -> import
holgerd77 Jun 14, 2023
6fa9a3c
Tx: fixes
holgerd77 Jun 14, 2023
dddc6cd
Tx: add .js path references
holgerd77 Jun 14, 2023
64b3c5a
Rebuild package-lock.json
holgerd77 Jun 14, 2023
7708881
migrate wallet to esm/vitest
acolytec3 Jun 14, 2023
500d886
move devp2p to esm/vitest
acolytec3 Jun 14, 2023
496ed3f
Fix port in use errors in tests
acolytec3 Jun 14, 2023
9cd2a40
ESM/Vitest Transition: add Trie and EVM (#2783)
holgerd77 Jun 14, 2023
9fc449c
Fix typo
acolytec3 Jun 14, 2023
bcec08e
Wrap async tests in promises so vitest waits for them to finish
acolytec3 Jun 15, 2023
d20eaa2
Various lint fixes
holgerd77 Jun 15, 2023
645a3c8
VM: tape -> vitest transition (API tests)
holgerd77 Jun 15, 2023
2e8d255
VM: keep Blockchain/State tests on Tape for now
holgerd77 Jun 15, 2023
b62ed3a
VM: run Blockchain/State tests on CJS dist folder
holgerd77 Jun 15, 2023
9961da2
make most devp2p tests async
acolytec3 Jun 15, 2023
a59a6ab
Vitest/ESM: VM File Path Additions and Ethash Transition (#2786)
holgerd77 Jun 15, 2023
4a8b423
Wrap runBlock/runTx in describe
acolytec3 Jun 15, 2023
fc6e16e
turn off vm browser tests in ci
acolytec3 Jun 15, 2023
f01bd88
Fix examples CI
acolytec3 Jun 15, 2023
ca0b20f
Fix wallet/ethash CI work
acolytec3 Jun 15, 2023
4dada55
Adjust dpt setup
acolytec3 Jun 15, 2023
4d33c97
Catch addpeer errors silently
acolytec3 Jun 15, 2023
e949d51
Make trie/vm type module
acolytec3 Jun 15, 2023
76e8fed
fix vm examples
acolytec3 Jun 15, 2023
4f394d1
set higher timeout
acolytec3 Jun 15, 2023
983df10
revert vm module type
acolytec3 Jun 15, 2023
65ca782
Merge branch 'master' into esm-part-2-5-with-tests
acolytec3 Jun 16, 2023
75f36f7
Fix Util tests
holgerd77 Jun 16, 2023
ee9f5ac
Etash: take timeout from script command (60000)
holgerd77 Jun 16, 2023
54d8800
Etash test timeout adjustments
holgerd77 Jun 16, 2023
d25b168
Etash timeout adjustment
holgerd77 Jun 16, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/vm-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

- run: npm run lint
- run: npm run coverage
- run: npm run test:API:browser
# - run: npm run test:API:browser

- uses: codecov/codecov-action@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/vm-nightly-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
working-directory: ${{github.workspace}}

- run: npm run test:API
- run: npm run test:API:browser
# - run: npm run test:API:browser

test-vm-state:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/vm-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

- run: npm run lint
- run: npm run coverage
- run: npm run test:API:browser
# - run: npm run test:API:browser -- disabled until we fix browser tests for vitest

- uses: codecov/codecov-action@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wallet-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ jobs:
working-directory: ${{github.workspace}}

- run: npm run lint
- run: npm run test
- run: npm run test:node # Only run node tests for now until vitest browser test issues are sorted out
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,6 @@ Temporary Items

# ethereumjs
datadir*

## Vitest
__snapshots__
4 changes: 2 additions & 2 deletions config/cli/lint-diff.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dim() {
echo "${DIM}$1${NOCOLOR}"
}

dim "> eslint --format codeframe --config ./.eslintrc.js . \\ "
dim "> eslint --format codeframe --config ./.eslintrc.cjs . \\ "
dim "\t --ext .js,.jsx,.ts,.tsx \\ "

blue "[Lint]${NOCOLOR} checking..."
Expand All @@ -35,7 +35,7 @@ if [ -z "$FILESCHANGED" ]; then
exit
fi

eslint --format codeframe --config ./.eslintrc.js $FILESCHANGED
eslint --format codeframe --config ./.eslintrc.cjs $FILESCHANGED

RETURN_CODE=$?

Expand Down
4 changes: 2 additions & 2 deletions config/cli/lint-fix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ dim() {
echo "${DIM}$1${NOCOLOR}"
}

dim "> eslint --fix --config ./.eslintrc.js . \\ "
dim "> eslint --fix --config ./.eslintrc.cjs . \\ "
dim "\t --ext .js,.jsx,.ts,.tsx \\ "

blue "[Lint]${NOCOLOR} fixing..."

eslint --fix --config ./.eslintrc.js . --ext .js,.jsx,.ts,.tsx
eslint --fix --config ./.eslintrc.cjs . --ext .js,.jsx,.ts,.tsx

RETURN_CODE=$?

Expand Down
4 changes: 2 additions & 2 deletions config/cli/lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ dim() {
echo "${DIM}$1${NOCOLOR}"
}

dim "> eslint --format codeframe --config ./.eslintrc.js . \\ "
dim "> eslint --format codeframe --config ./.eslintrc.cjs . \\ "
dim "\t --ext .js,.jsx,.ts,.tsx \\ "

blue "[Lint]${NOCOLOR} checking..."

eslint --format codeframe --config ./.eslintrc.js . --ext .js,.jsx,.ts,.tsx
eslint --format codeframe --config ./.eslintrc.cjs . --ext .js,.jsx,.ts,.tsx

RETURN_CODE=$?

Expand Down
File renamed without changes.
Loading