Skip to content

Commit 2f4f98e

Browse files
cesarenaldicesarenaldi
committed
chore: moves more files and adjust scripts and workflows
1 parent f013f8f commit 2f4f98e

File tree

14 files changed

+61
-143
lines changed

14 files changed

+61
-143
lines changed

‎.github/workflows/on-demand.yml‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
1-
name: Run Aave SDK V3 Tests
1+
name: Run Aave V3 Spec
22

33
on:
44
repository_dispatch:
55
types: [on-demand-test]
66
workflow_dispatch:
77

8+
env:
9+
ENVIRONMENT: staging
10+
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
11+
ETHEREUM_TENDERLY_FORK_ID: ${{ vars.ETHEREUM_TENDERLY_FORK_ID }}
12+
ETHEREUM_TENDERLY_PUBLIC_RPC: ${{ secrets.ETHEREUM_TENDERLY_PUBLIC_RPC }}
13+
ETHEREUM_TENDERLY_ADMIN_RPC: ${{ secrets.ETHEREUM_TENDERLY_ADMIN_RPC }}
14+
ETHEREUM_TENDERLY_BLOCKEXPLORER: ${{ secrets.ETHEREUM_TENDERLY_BLOCKEXPLORER }}
15+
API_X_E2E_TESTS_HEADER: ${{ secrets.API_X_E2E_TESTS_HEADER }}
16+
817
concurrency:
918
group: ${{ github.workflow }}-tests-on-demand
1019
cancel-in-progress: true
@@ -13,21 +22,6 @@ jobs:
1322
run-tests:
1423
name: All Tests
1524
runs-on: ubuntu-latest
16-
env:
17-
ENVIRONMENT: staging
18-
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
19-
ETHEREUM_TENDERLY_FORK_ID: ${{ vars.ETHEREUM_TENDERLY_FORK_ID }}
20-
ETHEREUM_TENDERLY_PUBLIC_RPC: ${{ secrets.ETHEREUM_TENDERLY_PUBLIC_RPC }}
21-
ETHEREUM_TENDERLY_ADMIN_RPC: ${{ secrets.ETHEREUM_TENDERLY_ADMIN_RPC }}
22-
ETHEREUM_TENDERLY_BLOCKEXPLORER: ${{ secrets.ETHEREUM_TENDERLY_BLOCKEXPLORER }}
23-
API_X_E2E_TESTS_HEADER: ${{ secrets.API_X_E2E_TESTS_HEADER }}
24-
# TODO: remove the following once tests are separate into unit and e2e tests
25-
PRIVY_TEST_APP_ID: ${{ vars.PRIVY_TEST_APP_ID }}
26-
PRIVY_TEST_APP_SECRET: ${{ secrets.PRIVY_TEST_APP_SECRET }}
27-
PRIVY_TEST_WALLET_ID: ${{ vars.PRIVY_TEST_WALLET_ID }}
28-
PRIVY_TEST_WALLET_ADDRESS: ${{ vars.PRIVY_TEST_WALLET_ADDRESS }}
29-
THIRDWEB_TEST_SECRET_KEY: ${{ secrets.THIRDWEB_TEST_SECRET_KEY }}
30-
THIRDWEB_TEST_WALLET_ADDRESS: ${{ vars.THIRDWEB_TEST_WALLET_ADDRESS }}
3125

3226
steps:
3327
- uses: actions/checkout@v4
@@ -40,7 +34,7 @@ jobs:
4034
run: pnpm build
4135

4236
- name: Run tests
43-
run: pnpm test:client
37+
run: pnpm spec
4438

4539
- name: Publish results
4640
if: always()

‎.github/workflows/verify.yml‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,25 @@
11
name: 'Verify'
22
on:
33
workflow_call:
4+
inputs:
5+
run-acceptance:
6+
type: boolean
7+
required: false
8+
default: false
9+
10+
env:
11+
ENVIRONMENT: staging
12+
PRIVY_TEST_APP_ID: ${{ vars.PRIVY_TEST_APP_ID }}
13+
PRIVY_TEST_APP_SECRET: ${{ secrets.PRIVY_TEST_APP_SECRET }}
14+
PRIVY_TEST_WALLET_ID: ${{ vars.PRIVY_TEST_WALLET_ID }}
15+
PRIVY_TEST_WALLET_ADDRESS: ${{ vars.PRIVY_TEST_WALLET_ADDRESS }}
16+
ETHEREUM_TENDERLY_FORK_ID: ${{ vars.ETHEREUM_TENDERLY_FORK_ID }}
17+
ETHEREUM_TENDERLY_PUBLIC_RPC: ${{ secrets.ETHEREUM_TENDERLY_PUBLIC_RPC }}
18+
ETHEREUM_TENDERLY_ADMIN_RPC: ${{ secrets.ETHEREUM_TENDERLY_ADMIN_RPC }}
19+
ETHEREUM_TENDERLY_BLOCKEXPLORER: ${{ secrets.ETHEREUM_TENDERLY_BLOCKEXPLORER }}
20+
API_X_E2E_TESTS_HEADER: ${{ secrets.API_X_E2E_TESTS_HEADER }}
21+
THIRDWEB_TEST_SECRET_KEY: ${{ secrets.THIRDWEB_TEST_SECRET_KEY }}
22+
THIRDWEB_TEST_WALLET_ADDRESS: ${{ vars.THIRDWEB_TEST_WALLET_ADDRESS }}
423

524
jobs:
625
lint:
@@ -23,19 +42,6 @@ jobs:
2342
needs: lint
2443
runs-on: ubuntu-latest
2544
continue-on-error: true
26-
env:
27-
ENVIRONMENT: staging
28-
PRIVY_TEST_APP_ID: ${{ vars.PRIVY_TEST_APP_ID }}
29-
PRIVY_TEST_APP_SECRET: ${{ secrets.PRIVY_TEST_APP_SECRET }}
30-
PRIVY_TEST_WALLET_ID: ${{ vars.PRIVY_TEST_WALLET_ID }}
31-
PRIVY_TEST_WALLET_ADDRESS: ${{ vars.PRIVY_TEST_WALLET_ADDRESS }}
32-
ETHEREUM_TENDERLY_FORK_ID: ${{ vars.ETHEREUM_TENDERLY_FORK_ID }}
33-
ETHEREUM_TENDERLY_PUBLIC_RPC: ${{ secrets.ETHEREUM_TENDERLY_PUBLIC_RPC }}
34-
ETHEREUM_TENDERLY_ADMIN_RPC: ${{ secrets.ETHEREUM_TENDERLY_ADMIN_RPC }}
35-
ETHEREUM_TENDERLY_BLOCKEXPLORER: ${{ secrets.ETHEREUM_TENDERLY_BLOCKEXPLORER }}
36-
API_X_E2E_TESTS_HEADER: ${{ secrets.API_X_E2E_TESTS_HEADER }}
37-
THIRDWEB_TEST_SECRET_KEY: ${{ secrets.THIRDWEB_TEST_SECRET_KEY }}
38-
THIRDWEB_TEST_WALLET_ADDRESS: ${{ vars.THIRDWEB_TEST_WALLET_ADDRESS }}
3945

4046
steps:
4147
- uses: actions/checkout@v4
@@ -50,3 +56,11 @@ jobs:
5056
- name: Run Tests
5157
shell: bash
5258
run: pnpm test
59+
60+
- name: Run Acceptance Tests
61+
if: ${{ inputs.run-acceptance }}
62+
shell: bash
63+
run: pnpm spec
64+
65+
66+

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ Update the `.env` file with the correct values.
6464

6565
Run the tests:
6666

67-
- `pnpm test:client`: Run the tests for the `@aave/client` package.
67+
- `pnpm test`: Run unit and integration tests `@aave/client` and `@aave/react` packages.
68+
- `pnpm spec`: Run the acceptance tests for the `@aave/spec` package.
6869

6970
Lint the code:
7071

‎package.json‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,26 @@
2020
"new:package": "NODE_OPTIONS='--import tsx' plop --plopfile=plopfile.ts",
2121
"prepublish": "pnpm run build",
2222
"publish:results": "tsx scripts/publishResults.ts",
23+
"spec": "vitest --project spec",
24+
"spec:borrow": "vitest --project spec packages/spec/markets/borrow.spec.ts",
25+
"spec:chains": "vitest --project spec packages/spec/misc/chains.spec.ts",
26+
"spec:collateral": "vitest --project spec packages/spec/markets/collateralToggle.spec.ts",
27+
"spec:emode": "vitest --project spec packages/spec/markets/eMode.spec.ts",
28+
"spec:healthFactor": "vitest --project spec packages/spec/markets/healthFactor.spec.ts",
29+
"spec:history": "vitest --project spec packages/spec/markets/history.spec.ts",
30+
"spec:markets": "vitest --project spec packages/spec/markets/markets.spec.ts",
31+
"spec:incentives": "vitest --project spec packages/spec/markets/incentives.spec.ts",
32+
"spec:positions": "vitest --project spec packages/spec/markets/positions.spec.ts",
33+
"spec:repay": "vitest --project spec packages/spec/markets/repay.spec.ts",
34+
"spec:reserve": "vitest --project spec packages/spec/markets/reserve.spec.ts",
35+
"spec:supply": "vitest --project spec packages/spec/markets/supply.spec.ts",
36+
"spec:vaults": "vitest --project spec packages/spec/vaults/vaults.spec.ts",
37+
"spec:withdraw": "vitest --project spec packages/spec/markets/withdraw.spec.ts",
38+
"test": "pnpm test:client && pnpm test:react",
2339
"test:client": "vitest --project client",
24-
"test:client:local": "ENVIRONMENT=local vitest --project client",
25-
"test:privy": "vitest --project client packages/client/src/privy.test.ts",
26-
"test:thirdweb": "vitest --project client packages/client/src/thirdweb.test.ts",
27-
"test:healthFactorPreview": "vitest --project client packages/client/src/actions/healthFactorPreview.test.ts",
28-
"test:react": "vitest --project react",
29-
"test:spec": "vitest --project spec",
30-
"test:spec:borrow": "vitest --project spec packages/spec/markets/borrow.spec.ts",
31-
"test:spec:chains": "vitest --project spec packages/spec/chains.spec.ts",
32-
"test:spec:collateral": "vitest --project spec packages/spec/markets/collateralToggle.spec.ts",
33-
"test:spec:emode": "vitest --project spec packages/spec/markets/eMode.spec.ts",
34-
"test:spec:history": "vitest --project spec packages/spec/markets/history.spec.ts",
35-
"test:spec:markets": "vitest --project spec packages/spec/markets/markets.spec.ts",
36-
"test:spec:positions": "vitest --project spec packages/spec/markets/positions.spec.ts",
37-
"test:spec:repay": "vitest --project spec packages/spec/markets/repay.spec.ts",
38-
"test:spec:reserve": "vitest --project spec packages/spec/markets/reserve.spec.ts",
39-
"test:spec:supply": "vitest --project spec packages/spec/markets/supply.spec.ts",
40-
"test:spec:vaults": "vitest --project spec packages/spec/vaults.spec.ts",
41-
"test:spec:withdraw": "vitest --project spec packages/spec/markets/withdraw.spec.ts",
42-
"test:cache": "vitest --project client packages/client/src/actions/cache.test.ts",
43-
"test": "vitest"
40+
"test:client:privy": "vitest --project client packages/client/src/privy.test.ts",
41+
"test:client:thirdweb": "vitest --project client packages/client/src/thirdweb.test.ts",
42+
"test:react": "vitest --project react"
4443
},
4544
"license": "MIT",
4645
"devDependencies": {

‎packages/client/src/actions/cache.test.ts‎

Lines changed: 0 additions & 89 deletions
This file was deleted.

‎packages/client/src/actions/__snapshots__/chains.test.ts.snap‎ renamed to ‎packages/spec/markets/__snapshots__/chains.test.ts.snap‎

File renamed without changes.

‎packages/client/src/actions/__snapshots__/markets.test.ts.snap‎ renamed to ‎packages/spec/markets/__snapshots__/markets.test.ts.snap‎

File renamed without changes.

‎packages/client/src/actions/__snapshots__/reserve.test.ts.snap‎ renamed to ‎packages/spec/markets/__snapshots__/reserve.test.ts.snap‎

File renamed without changes.

‎packages/client/src/actions/healthFactorPreview.test.ts‎ renamed to ‎packages/spec/markets/healthFactor.spec.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { assertOk, evmAddress } from '@aave/client';
2+
import { healthFactorPreview, userMarketState } from '@aave/client/actions';
23
import {
34
client,
45
createNewWallet,
@@ -7,8 +8,6 @@ import {
78
ETHEREUM_USDC_ADDRESS,
89
} from '@aave/client/test-utils';
910
import { describe, expect, it } from 'vitest';
10-
import { userMarketState } from './markets';
11-
import { healthFactorPreview } from './misc';
1211

1312
describe('Given the Aave client', () => {
1413
describe('And a user without supply/borrow positions', () => {

‎packages/client/src/actions/merits.test.ts‎ renamed to ‎packages/spec/markets/incentives.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { assertOk, evmAddress } from '@aave/client';
2+
import { meritClaimRewards } from '@aave/client/actions';
23
import { client, createNewWallet } from '@aave/client/test-utils';
34
import { chainId } from '@aave/types';
45
import { describe, expect, it } from 'vitest';
5-
import { meritClaimRewards } from './incentives';
66

77
describe('Given a chain supporting Merit rewards', () => {
88
const wallet = createNewWallet();

0 commit comments

Comments
 (0)