From 82da491f3d808a5100283ba3917e90ed9ee62385 Mon Sep 17 00:00:00 2001 From: Anatolios Laskaris Date: Mon, 10 Jul 2023 09:40:48 +0300 Subject: [PATCH] chore: Renaming things (#316) * Renaming * Fix * Fix * Fix * Use main --- .github/e2e/docker-compose.yml | 80 +++++++++++++++++----------------- .github/workflows/e2e.yml | 8 ++-- .github/workflows/snapshot.yml | 6 +-- .github/workflows/tests.yml | 23 ++++------ README.md | 5 +-- 5 files changed, 57 insertions(+), 65 deletions(-) diff --git a/.github/e2e/docker-compose.yml b/.github/e2e/docker-compose.yml index cadc90b5..7b26e302 100644 --- a/.github/e2e/docker-compose.yml +++ b/.github/e2e/docker-compose.yml @@ -1,5 +1,5 @@ networks: - fluence: + nox: driver: bridge ipam: config: @@ -11,7 +11,7 @@ services: ports: - 8545:8545 networks: - fluence: + nox: ipfs: image: ipfs/go-ipfs @@ -23,11 +23,11 @@ services: volumes: - ./ipfs/:/container-init.d/ networks: - fluence: + nox: ipv4_address: 10.50.10.100 - fluence-1: - image: ${RUST_PEER_IMAGE} + nox-1: + image: ${NOX_IMAGE} ports: - 7771:7771 - 9991:9991 @@ -44,21 +44,21 @@ services: - -w=9991 - -x=10.50.10.10 - --external-maddrs - - /dns4/fluence-1/tcp/7771 - - /dns4/fluence-1/tcp/9991/ws + - /dns4/nox-1/tcp/7771 + - /dns4/nox-1/tcp/9991/ws - --allow-private-ips - --local - # - --bootstraps=/dns/fluence-1/tcp/7771 + # - --bootstraps=/dns/nox-1/tcp/7771 # 12D3KooWBM3SdXWqGaawQDGQ6JprtwswEg3FWGvGhmgmMez1vRbR - -k=hK62afickoeP2uZbmSkAYXxxqP8ozq16VRN7qfTP719EHC5V5tjrtW57BSjUr8GvsEXmJRbtejUWyPZ2rZMyQdq depends_on: - ipfs networks: - fluence: + nox: ipv4_address: 10.50.10.10 - fluence-2: - image: ${RUST_PEER_IMAGE} + nox-2: + image: ${NOX_IMAGE} ports: - 7772:7772 - 9992:9992 @@ -75,20 +75,20 @@ services: - -w=9992 - -x=10.50.10.20 - --external-maddrs - - /dns4/fluence-2/tcp/7772 - - /dns4/fluence-2/tcp/9992/ws + - /dns4/nox-2/tcp/7772 + - /dns4/nox-2/tcp/9992/ws - --allow-private-ips - - --bootstraps=/dns/fluence-1/tcp/7771 + - --bootstraps=/dns/nox-1/tcp/7771 # 12D3KooWQdpukY3p2DhDfUfDgphAqsGu5ZUrmQ4mcHSGrRag6gQK - -k=2WijTVdhVRzyZamWjqPx4V4iNMrajegNMwNa2PmvPSZV6RRpo5M2fsPWdQr22HVRubuJhhSw8BrWiGt6FPhFAuXy depends_on: - ipfs networks: - fluence: + nox: ipv4_address: 10.50.10.20 - fluence-3: - image: ${RUST_PEER_IMAGE} + nox-3: + image: ${NOX_IMAGE} ports: - 7773:7773 - 9993:9993 @@ -105,20 +105,20 @@ services: - -w=9993 - -x=10.50.10.30 - --external-maddrs - - /dns4/fluence-3/tcp/7773 - - /dns4/fluence-3/tcp/9993/ws + - /dns4/nox-3/tcp/7773 + - /dns4/nox-3/tcp/9993/ws - --allow-private-ips - - --bootstraps=/dns/fluence-1/tcp/7771 + - --bootstraps=/dns/nox-1/tcp/7771 # 12D3KooWRT8V5awYdEZm6aAV9HWweCEbhWd7df4wehqHZXAB7yMZ - -k=2n2wBVanBeu2GWtvKBdrYK9DJAocgG3PrTUXMharq6TTfxqTL4sLdXL9BF23n6rsnkAY5pR9vBtx2uWYDQAiZdrX depends_on: - ipfs networks: - fluence: + nox: ipv4_address: 10.50.10.30 - fluence-4: - image: ${RUST_PEER_IMAGE} + nox-4: + image: ${NOX_IMAGE} ports: - 7774:7774 - 9994:9994 @@ -135,20 +135,20 @@ services: - -w=9994 - -x=10.50.10.40 - --external-maddrs - - /dns4/fluence-4/tcp/7774 - - /dns4/fluence-4/tcp/9994/ws + - /dns4/nox-4/tcp/7774 + - /dns4/nox-4/tcp/9994/ws - --allow-private-ips - - --bootstraps=/dns/fluence-1/tcp/7771 + - --bootstraps=/dns/nox-1/tcp/7771 # 12D3KooWBzLSu9RL7wLP6oUowzCbkCj2AGBSXkHSJKuq4wwTfwof - -k=4zp8ucAikkjB8CmkufYiFBW4QCDUCbQG7yMjviX7W8bMyN5rfChQ2Pi5QCWThrCTbAm9uq5nbFbxtFcNZq3De4dX depends_on: - ipfs networks: - fluence: + nox: ipv4_address: 10.50.10.40 - fluence-5: - image: ${RUST_PEER_IMAGE} + nox-5: + image: ${NOX_IMAGE} ports: - 7775:7775 - 9995:9995 @@ -165,20 +165,20 @@ services: - -w=9995 - -x=10.50.10.50 - --external-maddrs - - /dns4/fluence-5/tcp/7775 - - /dns4/fluence-5/tcp/9995/ws + - /dns4/nox-5/tcp/7775 + - /dns4/nox-5/tcp/9995/ws - --allow-private-ips - - --bootstraps=/dns/fluence-1/tcp/7771 + - --bootstraps=/dns/nox-1/tcp/7771 # 12D3KooWBf6hFgrnXwHkBnwPGMysP3b1NJe5HGtAWPYfwmQ2MBiU - -k=3ry26rm5gkJXvdqRH4FoM3ezWq4xVVsBQF7wtKq4E4pbuaa6p1F84tNqifUS7DdfJL9hs2gcdW64Wc342vHZHMUp depends_on: - ipfs networks: - fluence: + nox: ipv4_address: 10.50.10.50 - fluence-6: - image: ${RUST_PEER_IMAGE} + nox-6: + image: ${NOX_IMAGE} ports: - 7776:7776 - 9996:9996 @@ -193,16 +193,16 @@ services: - --aqua-pool-size=2 - -t=7776 - -w=9996 - - --bootstraps=/dns/fluence-1/tcp/7771 + - --bootstraps=/dns/nox-1/tcp/7771 - -x=10.50.10.60 - --external-maddrs - - /dns4/fluence-6/tcp/7776 - - /dns4/fluence-6/tcp/9996/ws + - /dns4/nox-6/tcp/7776 + - /dns4/nox-6/tcp/9996/ws - --allow-private-ips # 12D3KooWPisGn7JhooWhggndz25WM7vQ2JmA121EV8jUDQ5xMovJ - -k=5Qh8bB1sF28uLPwr3HTvEksCeC6mAWQvebCfcgv9y6j4qKwSzNKm2tzLUg4nACUEo2KZpBw11gNCnwaAdM7o1pEn depends_on: - ipfs networks: - fluence: - ipv4_address: 10.50.10.60 + nox: + ipv4_address: 10.50.10.60 \ No newline at end of file diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 67a2af71..0fbe4f76 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -36,14 +36,13 @@ jobs: with: ref: ${{ github.ref }} - aqua-playground: + aqua: needs: - js-client - uses: fluencelabs/aqua-playground/.github/workflows/tests.yml@master + uses: fluencelabs/aqua/.github/workflows/tests.yml@main with: js-client-snapshots: "${{ needs.js-client.outputs.js-client-snapshots }}" - rust-peer-image: "fluencelabs/nox:unstable_minimal" fluence-cli: needs: @@ -51,5 +50,4 @@ jobs: uses: fluencelabs/fluence-cli/.github/workflows/tests.yml@main with: - js-client-snapshots: "${{ needs.js-client.outputs.js-client-snapshots }}" - rust-peer-image: "fluencelabs/nox:unstable_minimal" + js-client-snapshots: "${{ needs.js-client.outputs.js-client-snapshots }}" \ No newline at end of file diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index c68457cb..39a24683 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -37,10 +37,10 @@ jobs: id-token: write steps: - - name: Checkout fluence-js + - name: Checkout js-client uses: actions/checkout@v3 with: - repository: fluencelabs/fluence-js + repository: fluencelabs/js-client ref: ${{ inputs.ref }} - uses: pnpm/action-setup@v2.2.4 @@ -92,4 +92,4 @@ jobs: uses: fluencelabs/github-actions/pnpm-publish-snapshot@main with: id: ${{ steps.version.outputs.id }} - set-version: false + set-version: false \ No newline at end of file diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1c56e1f4..f451d2f4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,10 +3,10 @@ name: Run tests with worflow_call on: workflow_call: inputs: - rust-peer-image: - description: "rust-peer image tag" + nox-image: + description: "nox image tag" type: string - default: "fluencelabs/nox:unstable_ipfs" + default: "fluencelabs/nox:unstable_minimal" avm-version: description: "@fluencelabs/avm version" type: string @@ -21,13 +21,12 @@ on: default: "master" env: - RUST_PEER_IMAGE: "${{ inputs.rust-peer-image }}" + NOX_IMAGE: "${{ inputs.nox-image }}" FORCE_COLOR: true CI: true -# DEBUG: '*' jobs: - fluence-js: + js-client: name: "Run tests" runs-on: ubuntu-latest @@ -62,20 +61,16 @@ jobs: username: ${{ env.DOCKER_USERNAME }} password: ${{ env.DOCKER_PASSWORD }} - - name: Setup tmate session - if: failure() - uses: mxschmitt/action-tmate@v3 - - name: Checkout uses: actions/checkout@v3 with: repository: fluencelabs/fluence-js ref: ${{ inputs.ref }} - - name: Pull rust-peer image - run: docker pull $RUST_PEER_IMAGE + - name: Pull nox image + run: docker pull $NOX_IMAGE - - name: Run rust-peer + - name: Run nox network uses: isbang/compose-action@v1.4.1 with: compose-file: ".github/e2e/docker-compose.yml" @@ -110,4 +105,4 @@ jobs: - name: Dump rust-peer logs if: always() - uses: jwalton/gh-docker-logs@v2 + uses: jwalton/gh-docker-logs@v2 \ No newline at end of file diff --git a/README.md b/README.md index 2120a835..b8d94efc 100644 --- a/README.md +++ b/README.md @@ -82,12 +82,12 @@ If you are using TypeScript: ## Usage in an Application -Once you've added the client, you can compile [Aqua](https://github.com/fluencelabs/aqua) and run it in your application. To compile Aqua, use [Fluence CLI](https://github.com/fluencelabs/fluence-cli). +Once you've added the client, you can compile [Aqua](https://github.com/fluencelabs/aqua) and run it in your application. To compile Aqua, use [flox](https://github.com/fluencelabs/flox). 1. Install the package: ``` - npm i -D "@fluencelabs/fluence-cli" + npm i -D "@fluencelabs/flox" ``` 2. Add a directory in your project for Aqua code, e.g., `_aqua`. @@ -210,4 +210,3 @@ Any interested person is welcome to contribute to the project. Please, make sure ## License All software code is copyright (c) Fluence Labs, Inc. under the [Apache-2.0](./LICENSE) license. -