Skip to content

Commit

Permalink
Merge branch 'main' into dartPackage
Browse files Browse the repository at this point in the history
  • Loading branch information
chopan123 committed Nov 11, 2024
2 parents 709ef7c + 7eefd81 commit ea83b97
Show file tree
Hide file tree
Showing 77 changed files with 3,291 additions and 1,167 deletions.
57 changes: 57 additions & 0 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: Run dapp tests

on:
pull_request:
workflow_dispatch:
permissions:
contents: write
pull-requests: write
issues: read
packages: none

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- uses: actions/cache@v3
with:
path: |
node_modules
key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
- name: Set up Node.js
uses: actions/[email protected]
with:
node-version: '20.18.0'

- name: Install dependencies
run: yarn install

- name: Build app
run: yarn build --filter dapp

run-tests:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/[email protected]
- uses: actions/cache@v3
with:
path: |
node_modules
key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
- name: Set up Node.js
uses: actions/[email protected]
with:
node-version: '20.18.0'

- name: Run jest tests in dapp directory
run: |
cd apps/dapp
yarn test
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ To deploy the factory contract run:
```sh
bash run.sh
cd apps/contracts
yarn deploy-factory
yarn deploy-factory <network>
```
### Publish addresses
Once you have deployed an instance of the factory contract. You can publish the addresses to be used by anyone on the network.
Expand Down
8 changes: 8 additions & 0 deletions apps/contracts/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/contracts/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[workspace]
members = ["strategies/*", "defindex", "factory"]
members = ["strategies/*", "vault", "factory"]
exclude = [
"strategies/external_wasms",
]
Expand Down
2 changes: 1 addition & 1 deletion apps/contracts/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SUBDIRS = strategies defindex factory
SUBDIRS = strategies vault factory

default: build

Expand Down
2 changes: 0 additions & 2 deletions apps/contracts/defindex/src/constants.rs

This file was deleted.

82 changes: 0 additions & 82 deletions apps/contracts/defindex/src/fee.rs

This file was deleted.

43 changes: 0 additions & 43 deletions apps/contracts/defindex/src/investment.rs

This file was deleted.

123 changes: 0 additions & 123 deletions apps/contracts/defindex/src/test/deposit.rs

This file was deleted.

Loading

0 comments on commit ea83b97

Please sign in to comment.