Skip to content

Commit

Permalink
refactor: reorganize project
Browse files Browse the repository at this point in the history
Signed-off-by: Nurzhan Sakén <nurzhan.sakenov@gmail.com>
  • Loading branch information
nxsaken committed Jul 18, 2024
1 parent 537e595 commit 3ef8ca9
Show file tree
Hide file tree
Showing 673 changed files with 1,039 additions and 1,480 deletions.
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ updates:

- package-ecosystem: "pip"
target-branch: "main"
directory: "/client_cli/pytests/"
directory: "/bins/iroha_cli/pytests/"
schedule:
interval: "daily"
commit-message:
Expand All @@ -39,7 +39,7 @@ updates:

- package-ecosystem: "cargo"
target-branch: "main"
directory: "/default_executor/"
directory: "/samples"
schedule:
interval: "daily"
commit-message:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/iroha2-dev-code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
LLVM_PROFILE_FILE: "iroha-%p-%m.profraw"
- name: Generate lcov report
if: always()
run: grcov . --binary-path ./target/debug/ -s . -t lcov --branch --ignore-not-existing --ignore "/client_cli" --ignore "**/main.rs" -o lcov.info
run: grcov . --binary-path ./target/debug/ -s . -t lcov --branch --ignore-not-existing --ignore "/bins/iroha_cli" --ignore "**/main.rs" -o lcov.info
- name: Upload lcov report artifact
if: always()
uses: actions/upload-artifact@v4
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/iroha2-dev-pr-static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- '**.json'
- '**.toml'
- '.github/workflows/iroha2-dev-pr-static.yml'
- 'client_cli/pytests/**/*.py'
- 'bins/iroha_cli/pytests/**/*.py'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -25,13 +25,9 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: Swatinem/rust-cache@v2
- name: Default executor format
- name: Format executors and smart contracts
run: |
cd ./default_executor
mold --run cargo fmt --all -- --check
- name: Integration tests smart contracts format
run: |
cd ./client/tests/integration/smartcontracts
cd ./samples
mold --run cargo fmt --all -- --check
python_static_analysis:
Expand All @@ -41,7 +37,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Install dependencies using Poetry for client_cli/pytests
working-directory: client_cli/pytests
working-directory: bins/iroha_cli/pytests
run: |
poetry lock --no-update
poetry install
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/iroha2-dev-pr-wasm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ on:
pull_request:
branches: [main]
paths:
- 'data_model/**.rs'
- 'data_model/**.yml'
- 'data_model/**.json'
- 'data_model/**.toml'
- 'libs/iroha_data_model/**.rs'
- 'libs/iroha_data_model/**.yml'
- 'libs/iroha_data_model/**.json'
- 'libs/iroha_data_model/**.toml'

- 'smart_contract/**.rs'
- 'smart_contract/**.yml'
- 'smart_contract/**.json'
- 'smart_contract/**.toml'
- 'libs/iroha_smart_contract/**.rs'
- 'libs/iroha_smart_contract/**.yml'
- 'libs/iroha_smart_contract/**.json'
- 'libs/iroha_smart_contract/**.toml'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/iroha2-dev-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:
- uses: Swatinem/rust-cache@v2
- name: Build binaries
run: |
cargo build -p iroha_client_cli -p kagami -p irohad
cargo build -p iroha_cli -p kagami -p irohad
- name: Setup test Iroha 2 environment on the bare metal
run: |
pip3 install -r scripts/requirements.txt --no-input --break-system-packages
Expand All @@ -114,23 +114,23 @@ jobs:
run: |
chmod +x ${{ env.CLIENT_CLI_DIR }}
- name: Install torii api dependencies using Poetry
working-directory: torii/pytests
working-directory: libs/iroha_torii/pytests
run: |
poetry install
- name: Run torii api tests
working-directory: torii/pytests
working-directory: libs/iroha_torii/pytests
run: |
poetry run pytest
- name: Install client cli dependencies using Poetry
working-directory: client_cli/pytests
working-directory: bins/iroha_cli/pytests
run: |
poetry install
- name: Run client cli tests
working-directory: client_cli/pytests
working-directory: bins/iroha_cli/pytests
env:
# prepared by `test_env.py`
CLIENT_CLI_BINARY: ../../test/iroha
CLIENT_CLI_CONFIG: ../../test/client.toml
CLIENT_CLI_BINARY: ../../../test/iroha
CLIENT_CLI_CONFIG: ../../../test/client.toml
run: |
poetry run pytest
- name: Cleanup test environment
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,5 @@ result
/iroha-java/
/lcov.info
**/test-smartcontracts/

test_docker
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team [here](./CONTRIBUTING.md/?#contact-developers). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team [here](./CONTRIBUTING.md/#contacts). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

Expand Down
Loading

0 comments on commit 3ef8ca9

Please sign in to comment.