Skip to content

Commit

Permalink
now attempting to use unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
mike dupont committed Sep 27, 2024
1 parent 59401d6 commit a9867c8
Show file tree
Hide file tree
Showing 10 changed files with 287 additions and 184 deletions.
101 changes: 50 additions & 51 deletions .github/workflows/run-docker-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,57 +21,56 @@ jobs:
strategy:
matrix:
tests:
- "/app/dist/node/lib/util/base58.unit-test.js"
- "/app/dist/node/lib/ml/consistency.unit-test.js"
- "/app/dist/node/lib/mina/account-update.unit-test.js"
- "/app/dist/node/lib/mina/hash-input.unit-test.js"
- "/app/dist/node/lib/mina/mina.unit-test.js"
- "/app/dist/node/lib/mina/actions/offchain-contract.unit-test.js"
- "/app/dist/node/lib/mina/actions/batch-reducer.unit-test.js"
- "/app/dist/node/lib/mina/actions/batch-reducer-program.unit-test.js"
- "/app/dist/node/lib/mina/test/dynamic-call.unit-test.js"
- "/app/dist/node/lib/mina/token/forest-iterator.unit-test.js"
- "/app/dist/node/lib/mina/token/token-contract.unit-test.js"
- "/app/dist/node/lib/mina/fetch.unit-test.js"
- "/app/dist/node/lib/mina/account-update-layout.unit-test.js"
- "/app/dist/node/lib/proof-system/proof-system.unit-test.js"
- "/app/dist/node/lib/proof-system/sideloaded.unit-test.js"
- "/app/dist/node/lib/provable/test/bitwise.unit-test.js"
- "/app/dist/node/lib/provable/test/base64.unit-test.js"
- "/app/dist/node/lib/provable/test/field.unit-test.js"
- "/app/dist/node/lib/provable/test/nullifier.unit-test.js"
- "/app/dist/node/lib/provable/test/provable.unit-test.js"
- "/app/dist/node/lib/provable/test/sha256.unit-test.js"
- "/app/dist/node/lib/provable/test/string.unit-test.js"
- "/app/dist/node/lib/provable/test/range-check.unit-test.js"
- "/app/dist/node/lib/provable/test/foreign-field.unit-test.js"
- "/app/dist/node/lib/provable/test/group.unit-test.js"
- "/app/dist/node/lib/provable/test/custom-gates-recursion.unit-test.js"
- "/app/dist/node/lib/provable/test/foreign-curve.unit-test.js"
- "/app/dist/node/lib/provable/test/foreign-field-gadgets.unit-test.js"
- "/app/dist/node/lib/provable/test/elliptic-curve.unit-test.js"
- "/app/dist/node/lib/provable/test/lookup.unit-test.js"
- "/app/dist/node/lib/provable/test/ecdsa.unit-test.js"
- "/app/dist/node/lib/provable/test/arithmetic.unit-test.js"
- "/app/dist/node/lib/provable/test/primitives.unit-test.js"
- "/app/dist/node/lib/provable/test/keccak.unit-test.js"
- "/app/dist/node/lib/provable/test/struct.unit-test.js"
- "/app/dist/node/lib/provable/test/merkle-tree.unit-test.js"
- "/app/dist/node/lib/testing/testing.unit-test.js"
- "/app/dist/node/mina-signer/tests/verify-in-snark.unit-test.js"
- "/app/dist/node/mina-signer/tests/zkapp.unit-test.js"
- "/app/dist/node/mina-signer/src/sign-legacy.unit-test.js"
- "/app/dist/node/mina-signer/src/transaction-hash.unit-test.js"
- "/app/dist/node/mina-signer/src/signature.unit-test.js"
- "/app/dist/node/mina-signer/src/sign-zkapp-command.unit-test.js"
- "/app/dist/node/bindings/lib/binable.unit-test.js"
- "/app/dist/node/bindings/crypto/bigint.unit-test.js"
- "/app/dist/node/bindings/crypto/finite-field.unit-test.js"
- "/app/dist/node/bindings/crypto/glv.unit-test.js"
- "/app/dist/node/bindings/crypto/poseidon.unit-test.js"
- "/app/dist/node/bindings/crypto/bindings/bindings.unit-test.js"
- "/app/dist/node/bindings/crypto/elliptic-curve.unit-test.js"

- "/app/src/lib/util/base58.unit-test.ts"
- "/app/src/lib/ml/consistency.unit-test.ts"
- "/app/src/lib/mina/account-update.unit-test.ts"
- "/app/src/lib/mina/hash-input.unit-test.ts"
- "/app/src/lib/mina/mina.unit-test.ts"
- "/app/src/lib/mina/actions/offchain-contract.unit-test.ts"
- "/app/src/lib/mina/actions/batch-reducer.unit-test.ts"
- "/app/src/lib/mina/actions/batch-reducer-program.unit-test.ts"
- "/app/src/lib/mina/test/dynamic-call.unit-test.ts"
- "/app/src/lib/mina/token/forest-iterator.unit-test.ts"
- "/app/src/lib/mina/token/token-contract.unit-test.ts"
- "/app/src/lib/mina/fetch.unit-test.ts"
- "/app/src/lib/mina/account-update-layout.unit-test.ts"
- "/app/src/lib/proof-system/proof-system.unit-test.ts"
- "/app/src/lib/proof-system/sideloaded.unit-test.ts"
- "/app/src/lib/provable/test/bitwise.unit-test.ts"
- "/app/src/lib/provable/test/base64.unit-test.ts"
- "/app/src/lib/provable/test/field.unit-test.ts"
- "/app/src/lib/provable/test/nullifier.unit-test.ts"
- "/app/src/lib/provable/test/provable.unit-test.ts"
- "/app/src/lib/provable/test/sha256.unit-test.ts"
- "/app/src/lib/provable/test/string.unit-test.ts"
- "/app/src/lib/provable/test/range-check.unit-test.ts"
- "/app/src/lib/provable/test/foreign-field.unit-test.ts"
- "/app/src/lib/provable/test/group.unit-test.ts"
- "/app/src/lib/provable/test/custom-gates-recursion.unit-test.ts"
- "/app/src/lib/provable/test/foreign-curve.unit-test.ts"
- "/app/src/lib/provable/test/foreign-field-gadgets.unit-test.ts"
- "/app/src/lib/provable/test/elliptic-curve.unit-test.ts"
- "/app/src/lib/provable/test/lookup.unit-test.ts"
- "/app/src/lib/provable/test/ecdsa.unit-test.ts"
- "/app/src/lib/provable/test/arithmetic.unit-test.ts"
- "/app/src/lib/provable/test/primitives.unit-test.ts"
- "/app/src/lib/provable/test/keccak.unit-test.ts"
- "/app/src/lib/provable/test/struct.unit-test.ts"
- "/app/src/lib/provable/test/merkle-tree.unit-test.ts"
- "/app/src/lib/testing/testing.unit-test.ts"
- "/app/src/mina-signer/tests/verify-in-snark.unit-test.ts"
- "/app/src/mina-signer/tests/zkapp.unit-test.ts"
- "/app/src/mina-signer/src/sign-legacy.unit-test.ts"
- "/app/src/mina-signer/src/transaction-hash.unit-test.ts"
- "/app/src/mina-signer/src/signature.unit-test.ts"
- "/app/src/mina-signer/src/sign-zkapp-command.unit-test.ts"
- "/app/src/bindings/lib/binable.unit-test.ts"
- "/app/src/bindings/crypto/bigint.unit-test.ts"
- "/app/src/bindings/crypto/finite-field.unit-test.ts"
- "/app/src/bindings/crypto/glv.unit-test.ts"
- "/app/src/bindings/crypto/poseidon.unit-test.ts"
- "/app/src/bindings/crypto/bindings/bindings.unit-test.ts"
- "/app/src/bindings/crypto/elliptic-curve.unit-test.ts"
runs-on: ubuntu-latest
steps:
- name: Sets NAME
Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
unit-tests:
docker compose build unit-tests
TESTS="/app/dist/node/lib/util/base58.unit-test.js" docker compose up unit-tests

test:
docker compose build mina-local-network
docker compose up mina-local-network
6 changes: 1 addition & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:
mina-local-network:
restart: no
Expand Down Expand Up @@ -49,7 +47,7 @@ services:
# mount the source
volumes:
- type: bind
source: "/home/runner/work/o1js/o1js/"
source: "."
target: "/opt/introspector/test/"
cap_add:
- SYS_PTRACE
Expand All @@ -71,7 +69,6 @@ services:
environment:
- PROOF_LEVEL=full
- LOG_LEVEL=Debug
- WORKSPACE_DIR=$WORKSPACE_DIR
working_dir: /app
command: "bash -x /app/perf-reporting/perf-report.sh"

Expand All @@ -94,6 +91,5 @@ services:
environment:
- PROOF_LEVEL=full
- LOG_LEVEL=Debug
- WORKSPACE_DIR=$WORKSPACE_DIR
working_dir: /app
command: "bash -x /app/perf-reporting/perf-report.sh"
13 changes: 0 additions & 13 deletions jest.config.js

This file was deleted.

33 changes: 32 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,37 @@
"npm": "10.8.3",
"reflect-metadata": "^0.1.13",
"ts-jest": "^29.2.5",
"ts-node": "^10.9.2",
"tslib": "^2.3.0"
}
},

"jest": {
"verbose": true,
"preset": "ts-jest/presets/default-esm",
"testRegex": "(/__tests__/.*|(\\.|/)(test|unit-test))\\.(js?|ts?)$",
"modulePathIgnorePatterns": [
"<rootDir>/dist/",
"<rootDir>/node_modules/"
],
"extensionsToTreatAsEsm": [
".ts"
],
"moduleNameMapper": {
"^(\\.{1,2}/.*)\\.js$": "$1"
},
"transform": {
"^.+\\.(mt|t|cj|j)s$": [
"ts-jest",
{
"useESM": true
}
]
},
"globals": {
"ts-jest": {
"useESM": true
}
}
}

}
Loading

0 comments on commit a9867c8

Please sign in to comment.