Skip to content

Commit 8653df0

Browse files
critesjoshcritesjosh
authored
Merge pull request #29 from defi-wonderland/dev
test: adding test CI workflow
2 parents a9230b4 + 41fc27a commit 8653df0

File tree

5 files changed

+142
-98
lines changed

5 files changed

+142
-98
lines changed

‎.github/workflows/tests.yaml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
on:
2+
push:
3+
branches:
4+
- main
5+
pull_request:
6+
branches:
7+
- main
8+
- dev
9+
10+
jobs:
11+
setup-and-run:
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- name: Checkout repository
16+
uses: actions/checkout@v3
17+
18+
- name: Set up Docker
19+
uses: docker/setup-buildx-action@v2
20+
21+
- name: Install Aztec CLI
22+
run: |
23+
curl -s https://install.aztec.network > tmp.sh
24+
bash tmp.sh <<< yes "yes"
25+
26+
- name: Update path
27+
run: echo "/home/runner/.aztec/bin" >> $GITHUB_PATH
28+
29+
- name: Set Aztec version and start sandbox
30+
run: |
31+
VERSION=0.69.1 aztec-up
32+
aztec start --sandbox &
33+
34+
- name: Install project dependencies
35+
run: yarn
36+
37+
- name: Compile, generate code, and run tests
38+
run: script -e -c "${AZTEC_NARGO:-aztec-nargo} compile"
39+
40+
- name: Codegen
41+
run: script -e -c "aztec codegen target --outdir src/artifacts"
42+
43+
- name: Run tests
44+
run: script -e -c "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --runInBand --config jest.integration.config.json && aztec test"
45+

‎Nargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ authors = [ "" ]
55
compiler_version = ">=0.18.0"
66

77
[dependencies]
8-
aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "aztec-packages-v0.69.0", directory = "noir-projects/aztec-nr/aztec" }
8+
aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "aztec-packages-v0.69.1", directory = "noir-projects/aztec-nr/aztec" }

‎codegenCache.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
{
2-
"easy_private_voting_contract-EasyPrivateVoting.json": "4662c1c3f60516d75a615dd7f04c52b2c8536e641e8ad3d3f25a052a48d7ed40"
2+
"easy_private_voting_contract-EasyPrivateVoting.json": {
3+
"contractName": "EasyPrivateVoting",
4+
"hash": "e3d673e495baee1ae2e9880c8b24461819cce93ae968a4d72a4d76fae36b8f16"
5+
}
36
}

‎package.json‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@
1313
"compile": "${AZTEC_NARGO:-aztec-nargo} compile",
1414
"deploy": "node --loader ts-node/esm scripts/deploy.ts",
1515
"get-block": "node --loader ts-node/esm scripts/getBlock.ts",
16-
"test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --runInBand --config jest.integration.config.json && aztec test",
16+
"test": "yarn test:js && yarn test:nr",
17+
"test:js": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --runInBand --config jest.integration.config.json",
18+
"test:nr": "aztec test",
1719
"update": "aztec update --contract . && ./.github/scripts/update_contract.sh $(grep -oP 'tag\\s*=\\s*\"\\K[^\"]+' \"Nargo.toml\" | head -1) && yarn"
1820
},
1921
"dependencies": {
20-
"@aztec/accounts": "0.69.0",
21-
"@aztec/aztec.js": "0.69.0",
22-
"@aztec/noir-contracts.js": "0.69.0",
22+
"@aztec/accounts": "0.69.1",
23+
"@aztec/aztec.js": "0.69.1",
24+
"@aztec/noir-contracts.js": "0.69.1",
2325
"@types/node": "^22.5.1"
2426
},
2527
"devDependencies": {

‎yarn.lock‎

Lines changed: 86 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -15,40 +15,40 @@
1515
"@jridgewell/gen-mapping" "^0.3.5"
1616
"@jridgewell/trace-mapping" "^0.3.24"
1717

18-
"@aztec/[email protected].0":
19-
version "0.69.0"
20-
resolved "https://registry.yarnpkg.com/@aztec/accounts/-/accounts-0.69.0.tgz#980bd1f5fd45320bdcf12f37b98651b07d7507bd"
21-
integrity sha512-IfCpYD+PMx/CT7duxZfa6cNTQIsRR9HmEnNTrP4TMhRYfc5NUehS8HTjox2mdPqubS+K+mMolH35oJO2qlXKug==
22-
dependencies:
23-
"@aztec/aztec.js" "0.69.0"
24-
"@aztec/circuit-types" "0.69.0"
25-
"@aztec/circuits.js" "0.69.0"
26-
"@aztec/entrypoints" "0.69.0"
27-
"@aztec/ethereum" "0.69.0"
28-
"@aztec/foundation" "0.69.0"
29-
"@aztec/types" "0.69.0"
18+
"@aztec/[email protected].1":
19+
version "0.69.1"
20+
resolved "https://registry.yarnpkg.com/@aztec/accounts/-/accounts-0.69.1.tgz#9a0ca99a514bfc04d75f20503882b934ad20d12f"
21+
integrity sha512-eszCnQn0Bz1+dESZmdtrDOC3EJVKA93kvfj8tjyNX3Uo/qQXvKFdYsT2nhkAvU56f5Ni+Ux96sP6FFaQv9SA3w==
22+
dependencies:
23+
"@aztec/aztec.js" "0.69.1"
24+
"@aztec/circuit-types" "0.69.1"
25+
"@aztec/circuits.js" "0.69.1"
26+
"@aztec/entrypoints" "0.69.1"
27+
"@aztec/ethereum" "0.69.1"
28+
"@aztec/foundation" "0.69.1"
29+
"@aztec/types" "0.69.1"
3030
tslib "^2.4.0"
3131

32-
"@aztec/[email protected].0":
33-
version "0.69.0"
34-
resolved "https://registry.yarnpkg.com/@aztec/aztec.js/-/aztec.js-0.69.0.tgz#220d862412843ee2dca2075895a3e3507b72f69c"
35-
integrity sha512-VlBG5XN0quyg5xklhdCePKTDHxnoAa1v7jpP67mT3ONu39pMvo/D2d0EtNp7VUpEm3WYDamOpRfp1HoOLJYbFQ==
36-
dependencies:
37-
"@aztec/circuit-types" "0.69.0"
38-
"@aztec/circuits.js" "0.69.0"
39-
"@aztec/ethereum" "0.69.0"
40-
"@aztec/foundation" "0.69.0"
41-
"@aztec/l1-artifacts" "0.69.0"
42-
"@aztec/protocol-contracts" "0.69.0"
43-
"@aztec/types" "0.69.0"
32+
"@aztec/[email protected].1":
33+
version "0.69.1"
34+
resolved "https://registry.yarnpkg.com/@aztec/aztec.js/-/aztec.js-0.69.1.tgz#7cde50d5c2ad9116908c7e2d6215b8ef0cba92fa"
35+
integrity sha512-t0GVQvkrkadleKK+Xwj+KEB2U0+YvCKhB9/WTwlGcA3Fk/zWWBGhrnl/ish/LCCShScUHGYGH2+EtywLixSzTA==
36+
dependencies:
37+
"@aztec/circuit-types" "0.69.1"
38+
"@aztec/circuits.js" "0.69.1"
39+
"@aztec/ethereum" "0.69.1"
40+
"@aztec/foundation" "0.69.1"
41+
"@aztec/l1-artifacts" "0.69.1"
42+
"@aztec/protocol-contracts" "0.69.1"
43+
"@aztec/types" "0.69.1"
4444
axios "^1.7.2"
4545
tslib "^2.4.0"
4646
viem "^2.7.15"
4747

48-
"@aztec/[email protected].0":
49-
version "0.69.0"
50-
resolved "https://registry.yarnpkg.com/@aztec/bb.js/-/bb.js-0.69.0.tgz#d9ea6a57393712f3271bc200a29d4dcf2b88f470"
51-
integrity sha512-UoyIzI67Ry/tMn0nBgx+umFMnpA4oYYKQXvfZvO+dNE9LBS/1cwja/SpRpVzG0xn8agZ+HS+WmOQ8050UYaUZg==
48+
"@aztec/[email protected].1":
49+
version "0.69.1"
50+
resolved "https://registry.yarnpkg.com/@aztec/bb.js/-/bb.js-0.69.1.tgz#6616fb70ab1c681b87e5e0fb768deb07bef45213"
51+
integrity sha512-arz++pPCDwJVKWeiI4RfxrLA6w+TQVL/MTononayv3Jm2j5vtXC0va3/nrQQukaJT0DUaKWLK7UuIFTSuOIKOA==
5252
dependencies:
5353
comlink "^4.4.1"
5454
commander "^12.1.0"
@@ -57,67 +57,66 @@
5757
pako "^2.1.0"
5858
tslib "^2.4.0"
5959

60-
"@aztec/[email protected].0":
61-
version "0.69.0"
62-
resolved "https://registry.yarnpkg.com/@aztec/circuit-types/-/circuit-types-0.69.0.tgz#15fa2692bcf3eea5f412f2d6613a950ef78bb0d5"
63-
integrity sha512-zhWnUwaxGGoygr7XPhcaCY9Xu5ix4RxOwysqIcuXFqPx1vfd1w37gCP+loK4+IywebXYrBL5/nLUsFslk+iYyQ==
60+
"@aztec/[email protected].1":
61+
version "0.69.1"
62+
resolved "https://registry.yarnpkg.com/@aztec/circuit-types/-/circuit-types-0.69.1.tgz#b4b1ed12522be351a44fc69bdd8c8688a574f56e"
63+
integrity sha512-wluhI+pj0SRJZiGTAEZvy5J7fpvEiagQDFd3rtGH7Lm0KJmh2nDa33o7mIMHL0JbLmdMm1KBWiCefJLMvYXdjQ==
6464
dependencies:
65-
"@aztec/circuits.js" "0.69.0"
66-
"@aztec/ethereum" "0.69.0"
67-
"@aztec/foundation" "0.69.0"
68-
"@aztec/types" "0.69.0"
65+
"@aztec/circuits.js" "0.69.1"
66+
"@aztec/ethereum" "0.69.1"
67+
"@aztec/foundation" "0.69.1"
68+
"@aztec/types" "0.69.1"
6969
browserify-cipher "^1.0.1"
7070
lodash.clonedeep "^4.5.0"
7171
lodash.isequal "^4.5.0"
7272
lodash.times "^4.3.2"
7373
tslib "^2.5.0"
7474
zod "^3.23.8"
7575

76-
"@aztec/[email protected].0":
77-
version "0.69.0"
78-
resolved "https://registry.yarnpkg.com/@aztec/circuits.js/-/circuits.js-0.69.0.tgz#5da795aa9e879f8e721d8db5c96b1a7cb51e4359"
79-
integrity sha512-vW9WcxJ1OBGXx9jLGT7K6QRvJC8ucP0dzFcLoS9cdAuljnRDYm5d7E9oQtWTnnmmN7sGXq0pQmwvjJ668h8khQ==
76+
"@aztec/[email protected].1":
77+
version "0.69.1"
78+
resolved "https://registry.yarnpkg.com/@aztec/circuits.js/-/circuits.js-0.69.1.tgz#6423d922cfd62a9aa07e51d2e8f0dc4725218ebe"
79+
integrity sha512-Vri/laVbsGG0O4vX2ObAyeZPrLFXbRMjvXwmuutv1VSbo2uaE3NFgpNqhXPECoYJluyKIvXvIB5cAatf5B5tfA==
8080
dependencies:
81-
"@aztec/bb.js" "0.69.0"
82-
"@aztec/ethereum" "0.69.0"
83-
"@aztec/foundation" "0.69.0"
84-
"@aztec/types" "0.69.0"
81+
"@aztec/bb.js" "0.69.1"
82+
"@aztec/ethereum" "0.69.1"
83+
"@aztec/foundation" "0.69.1"
84+
"@aztec/types" "0.69.1"
8585
eslint "^8.35.0"
8686
tslib "^2.4.0"
8787
zod "^3.23.8"
8888

89-
"@aztec/[email protected].0":
90-
version "0.69.0"
91-
resolved "https://registry.yarnpkg.com/@aztec/entrypoints/-/entrypoints-0.69.0.tgz#44b8d9cbffc2637669fa3ef2152df6c364900138"
92-
integrity sha512-tJM1EdwGhHfC6ki7JmuGM2D2ThaxITjCYfQMOoSojWn5m+lMJl4K7EqnLFIjkPrOHpXuqqWN+fCH5bLgqieuPw==
89+
"@aztec/[email protected].1":
90+
version "0.69.1"
91+
resolved "https://registry.yarnpkg.com/@aztec/entrypoints/-/entrypoints-0.69.1.tgz#634af620d6921923e5c78cb492df781c2cacaf5b"
92+
integrity sha512-1PXvaF0JuAfVhO2ORgstDyjbLcIJeziPo0aRXvbHOsAupZew2u7ALr7Mxh/7q5W0jLm2/egW7McCjFoDzBu/CQ==
9393
dependencies:
94-
"@aztec/aztec.js" "0.69.0"
95-
"@aztec/circuit-types" "0.69.0"
96-
"@aztec/circuits.js" "0.69.0"
97-
"@aztec/foundation" "0.69.0"
98-
"@aztec/protocol-contracts" "0.69.0"
94+
"@aztec/aztec.js" "0.69.1"
95+
"@aztec/circuit-types" "0.69.1"
96+
"@aztec/circuits.js" "0.69.1"
97+
"@aztec/foundation" "0.69.1"
98+
"@aztec/protocol-contracts" "0.69.1"
9999
tslib "^2.4.0"
100100

101-
"@aztec/[email protected].0":
102-
version "0.69.0"
103-
resolved "https://registry.yarnpkg.com/@aztec/ethereum/-/ethereum-0.69.0.tgz#91e77807cb50bbe44d7544993f3ff7e5d678012f"
104-
integrity sha512-8ExUBijWsc8pKtEa0odztcqFMT9dnMkMORNIdJ1K/e6EuX0+wG2GsLf3QV2WVw1t5pgCQpm5hEejUbZnIcn8DQ==
101+
"@aztec/[email protected].1":
102+
version "0.69.1"
103+
resolved "https://registry.yarnpkg.com/@aztec/ethereum/-/ethereum-0.69.1.tgz#dbbd26335c0da7b3d4c1c5ab891d94d8250de218"
104+
integrity sha512-FAsHtEf+Zl+4OyW8eXZ8hVFb1lffTySeavuzs/568xEqY8a/d1+FFbzDEwuzc7GVweawmIBRmHwY1cxANUDo4A==
105105
dependencies:
106-
"@aztec/foundation" "0.69.0"
107-
"@aztec/l1-artifacts" "0.69.0"
106+
"@aztec/foundation" "0.69.1"
107+
"@aztec/l1-artifacts" "0.69.1"
108108
"@viem/anvil" "^0.0.10"
109109
dotenv "^16.0.3"
110-
get-port "^7.1.0"
111110
tslib "^2.4.0"
112111
viem "^2.7.15"
113112
zod "^3.23.8"
114113

115-
"@aztec/[email protected].0":
116-
version "0.69.0"
117-
resolved "https://registry.yarnpkg.com/@aztec/foundation/-/foundation-0.69.0.tgz#19e88e4b9f0cbf36e1afd93d8c7e75e73ee0e2e6"
118-
integrity sha512-60NeM9S5MR+5OUX0+mp8AwxfBVRH9ubuWgf7BlTIdQ0Nf7ss/6r9/QkjJUAsRgtHpr2rxzIy6t+dSA6BFnE6vA==
114+
"@aztec/[email protected].1":
115+
version "0.69.1"
116+
resolved "https://registry.yarnpkg.com/@aztec/foundation/-/foundation-0.69.1.tgz#ecb4ceef3947881ff6915536d28a6f150dc533a9"
117+
integrity sha512-+AWTZaNrefIXiBWcmnEf521iDSRB72CsXKj1ubUEE62B6/ba5I2ddT4m5DtGnb7YHrEGg/ESXnEqSVv7jrllmA==
119118
dependencies:
120-
"@aztec/bb.js" "0.69.0"
119+
"@aztec/bb.js" "0.69.1"
121120
"@koa/cors" "^5.0.0"
122121
"@noble/curves" "^1.2.0"
123122
bn.js "^5.2.1"
@@ -142,40 +141,40 @@
142141
sha3 "^2.1.4"
143142
zod "^3.23.8"
144143

145-
"@aztec/[email protected].0":
146-
version "0.69.0"
147-
resolved "https://registry.yarnpkg.com/@aztec/l1-artifacts/-/l1-artifacts-0.69.0.tgz#661935d60dc0c6cf338d517f38fec1fab0ce258c"
148-
integrity sha512-We8uxlAoG/TcB27wI8FaW2rzTi33Xxtee2gi8xiQ8w8zWpuFdyIFZIqsHmGRpqv4Q3h4no9T0/Mmy1Z3VRANGw==
144+
"@aztec/[email protected].1":
145+
version "0.69.1"
146+
resolved "https://registry.yarnpkg.com/@aztec/l1-artifacts/-/l1-artifacts-0.69.1.tgz#a10b1505931609b65a53306f6973fa588d120ded"
147+
integrity sha512-DQZGPCBrz9+wZfN2MpbA9kDXxZQou36lNqE1OtZXKI556jrECJn8EwURO4eayALMvTMVTKBdOihwUWPIwi0pvA==
149148
dependencies:
150149
tslib "^2.4.0"
151150

152-
"@aztec/[email protected].0":
153-
version "0.69.0"
154-
resolved "https://registry.yarnpkg.com/@aztec/noir-contracts.js/-/noir-contracts.js-0.69.0.tgz#6123c06f4f34095db231845db8f90865fad4ad0d"
155-
integrity sha512-72/8IAGQXv85m0MmwNLJ+dfTIYbc8AoTl90uMOhzwdXEKPSELy30OZZc1ngLxLgZL6OrXOVkYfuVWYWWbLpDuQ==
151+
"@aztec/[email protected].1":
152+
version "0.69.1"
153+
resolved "https://registry.yarnpkg.com/@aztec/noir-contracts.js/-/noir-contracts.js-0.69.1.tgz#dcfd880ef16d05b4c9080dc848bd6d6c80337568"
154+
integrity sha512-c6DbsnmHKymV7Ru8qdy139UgZ0jhF6Muw0/FPJOZIBVFjW78wDedTK8/dQRdCiWWXAcrYvpUK4N85OzbLoVV0Q==
156155
dependencies:
157-
"@aztec/aztec.js" "0.69.0"
156+
"@aztec/aztec.js" "0.69.1"
158157
tslib "^2.4.0"
159158

160-
"@aztec/[email protected].0":
161-
version "0.69.0"
162-
resolved "https://registry.yarnpkg.com/@aztec/protocol-contracts/-/protocol-contracts-0.69.0.tgz#2676efb1b836ec8692673fff1833a5f7115a3da0"
163-
integrity sha512-iCE9p9trz1op0nlTIyLtaUKtkxDMtvmQJJgGpGdMzSe4Uyz9NXb45110lK9cZ9s75BYMr0sa2xw/lla4GEkZqg==
159+
"@aztec/[email protected].1":
160+
version "0.69.1"
161+
resolved "https://registry.yarnpkg.com/@aztec/protocol-contracts/-/protocol-contracts-0.69.1.tgz#7c1d0e88ea287e03da8c63547814730a11d9b384"
162+
integrity sha512-zkusi+IlMb6F67A+DIfZxU/Gyqvtix5bPYlZ15yEyqGDZorO0rN6Ucp2f1jHS5kl32sXy15xaWxvUFYxu/bSAw==
164163
dependencies:
165-
"@aztec/circuits.js" "0.69.0"
166-
"@aztec/foundation" "0.69.0"
167-
"@aztec/types" "0.69.0"
164+
"@aztec/circuits.js" "0.69.1"
165+
"@aztec/foundation" "0.69.1"
166+
"@aztec/types" "0.69.1"
168167
lodash.chunk "^4.2.0"
169168
lodash.omit "^4.5.0"
170169
tslib "^2.4.0"
171170

172-
"@aztec/[email protected].0":
173-
version "0.69.0"
174-
resolved "https://registry.yarnpkg.com/@aztec/types/-/types-0.69.0.tgz#b4960d14769dc84e64fcbb7ac9755eafe151aa86"
175-
integrity sha512-xweBKDHcLAC2iUGrXkh7DBtxBOp8+oI7mb3U3jZjhVdEcOUHFCm4lAUJGmjrGc8J1aQoCkoyQJTIF+W4Wokp8w==
171+
"@aztec/[email protected].1":
172+
version "0.69.1"
173+
resolved "https://registry.yarnpkg.com/@aztec/types/-/types-0.69.1.tgz#8b84f20ff97dfe79edd5199ec21dbe4faf4a46d5"
174+
integrity sha512-kFY1ttKvPSImhxHfw1TuaVKgkAG3resxAelfBOOcMOVQCmvfsxqwvWgUGk2D7VncJKu6CvgSuo1F3eGHw42nrw==
176175
dependencies:
177-
"@aztec/ethereum" "0.69.0"
178-
"@aztec/foundation" "0.69.0"
176+
"@aztec/ethereum" "0.69.1"
177+
"@aztec/foundation" "0.69.1"
179178

180179
"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.24.7":
181180
version "7.24.7"
@@ -2119,11 +2118,6 @@ get-port@^6.1.2:
21192118
resolved "https://registry.yarnpkg.com/get-port/-/get-port-6.1.2.tgz#c1228abb67ba0e17fb346da33b15187833b9c08a"
21202119
integrity sha512-BrGGraKm2uPqurfGVj/z97/zv8dPleC6x9JBNRTrDNtCkkRF4rPwrQXFgL7+I+q8QSdU4ntLQX2D7KIxSy8nGw==
21212120

2122-
get-port@^7.1.0:
2123-
version "7.1.0"
2124-
resolved "https://registry.yarnpkg.com/get-port/-/get-port-7.1.0.tgz#d5a500ebfc7aa705294ec2b83cc38c5d0e364fec"
2125-
integrity sha512-QB9NKEeDg3xxVwCCwJQ9+xycaz6pBB6iQ76wiWMl1927n0Kir6alPiP+yuiICLLU4jpMe08dXfpebuQppFA2zw==
2126-
21272121
get-stream@^6.0.0, get-stream@^6.0.1:
21282122
version "6.0.1"
21292123
resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"

0 commit comments

Comments
 (0)