refactor: remove internal directory

KYVENetwork · Sep 3, 2024 · 4f2d641 · 4f2d641
1 parent 26fd024
commit 4f2d641
Show file tree

Hide file tree

Showing 306 changed files with 775 additions and 775 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -55,7 +55,7 @@ jobs:
       - name: install
         run: make install_abci
         if: "env.GIT_DIFF != ''"
-      - run: abci/tests/test_cli/test.sh
+      - run: abci/tests/test_cli/test-2.sh
         shell: bash
         if: "env.GIT_DIFF != ''"
 
@@ -78,6 +78,6 @@ jobs:
         run: make install install_abci
         if: "env.GIT_DIFF != ''"
       - name: test_apps
-        run: test/app/test.sh
+        run: test-2/app/test-2.sh
         shell: bash
         if: "env.GIT_DIFF != ''"
diff --git a/.github/workflows/e2e-long-main.yml b/.github/workflows/e2e-long-main.yml
@@ -20,16 +20,16 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         # Run make jobs in parallel, since we can't run steps in parallel.
         run: make -j2 docker runner
 
       - name: Run testnet
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         run: ./run-multiple.sh networks/long.toml
 
   e2e-long-fail:
-    needs: e2e-long-test
+    needs: e2e-long-test-2
     if: ${{ failure() }}
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/e2e-manual-multiversion.yml b/.github/workflows/e2e-manual-multiversion.yml
@@ -1,4 +1,4 @@
-# Manually run the nightly E2E tests for a particular branch, but test with
+# Manually run the nightly E2E tests for a particular branch, but test-2 with
 # multiple versions.
 name: e2e-manual-multiversion
 on:
@@ -22,24 +22,24 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         # Run make jobs in parallel, since we can't run steps in parallel.
         run: make -j2 docker generator runner tests
 
       - name: Generate testnets
         if: matrix.group != 5
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         # When changing -g, also change the matrix groups above
         # Generate multi-version tests with double the quantity of E2E nodes
         # based on the current branch as compared to the latest version.
         run: ./build/generator -g 5 -m "latest:1,local:2" -d networks/nightly/ -p
 
       - name: Run p2p testnets (${{ matrix.group }})
         if: matrix.group != 5
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         run: ./run-multiple.sh networks/nightly/*-group${{ matrix.group }}-*.toml
 
       - name: Run p2p testnets (regression)
         if: matrix.group == 5
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         run: ./run-multiple.sh networks_regressions/*.toml
diff --git a/.github/workflows/e2e-manual.yml b/.github/workflows/e2e-manual.yml
@@ -22,22 +22,22 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         # Run make jobs in parallel, since we can't run steps in parallel.
         run: make -j2 docker generator runner tests
 
       - name: Generate testnets
         if: matrix.group != 5
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         # When changing -g, also change the matrix groups above
         run: ./build/generator -g 5 -d networks/nightly/ -p
 
       - name: Run p2p testnets (${{ matrix.group }})
         if: matrix.group != 5
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         run: ./run-multiple.sh networks/nightly/*-group${{ matrix.group }}-*.toml
 
       - name: Run p2p testnets (regression)
         if: matrix.group == 5
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         run: ./run-multiple.sh networks_regressions/*.toml
diff --git a/.github/workflows/e2e-nightly-34x.yml b/.github/workflows/e2e-nightly-34x.yml
@@ -33,24 +33,24 @@ jobs:
           echo "branch=`git branch --show-current`" >> $GITHUB_OUTPUT
 
       - name: Build
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         # Run make jobs in parallel, since we can't run steps in parallel.
         run: make -j2 docker generator runner
 
       - name: Generate testnets
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         # When changing -g, also change the matrix groups above
         run: ./build/generator -g 2 -d networks/nightly -p
 
       - name: Run testnets in group ${{ matrix.group }}
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         run: ./run-multiple.sh networks/nightly/*-group${{ matrix.group }}-*.toml
 
     outputs:
       git-branch: ${{ steps.git-info.outputs.branch }}
 
   e2e-nightly-fail:
-    needs: e2e-nightly-test
+    needs: e2e-nightly-test-2
     if: ${{ failure() }}
     runs-on: ubuntu-latest
     steps:
@@ -59,9 +59,9 @@ jobs:
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
           SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
-          BRANCH: ${{ needs.e2e-nightly-test.outputs.git-branch }}
+          BRANCH: ${{ needs.e2e-nightly-test-2.outputs.git-branch }}
           RUN_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-          COMMITS_URL: "${{ github.server_url }}/${{ github.repository }}/commits/${{ needs.e2e-nightly-test.outputs.git-branch }}"
+          COMMITS_URL: "${{ github.server_url }}/${{ github.repository }}/commits/${{ needs.e2e-nightly-test-2.outputs.git-branch }}"
         with:
           payload: |
             {

diff --git a/.github/workflows/e2e-nightly-37x.yml b/.github/workflows/e2e-nightly-37x.yml
@@ -33,24 +33,24 @@ jobs:
           echo "branch=`git branch --show-current`" >> $GITHUB_OUTPUT
 
       - name: Build
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         # Run make jobs in parallel, since we can't run steps in parallel.
         run: make -j2 docker generator runner tests
 
       - name: Generate testnets
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         # When changing -g, also change the matrix groups above
         run: ./build/generator -g 5 -d networks/nightly/ -p
 
       - name: Run ${{ matrix.p2p }} p2p testnets
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         run: ./run-multiple.sh networks/nightly/*-group${{ matrix.group }}-*.toml
 
     outputs:
       git-branch: ${{ steps.git-info.outputs.branch }}
 
   e2e-nightly-fail:
-    needs: e2e-nightly-test
+    needs: e2e-nightly-test-2
     if: ${{ failure() }}
     runs-on: ubuntu-latest
     steps:
@@ -59,9 +59,9 @@ jobs:
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
           SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
-          BRANCH: ${{ needs.e2e-nightly-test.outputs.git-branch }}
+          BRANCH: ${{ needs.e2e-nightly-test-2.outputs.git-branch }}
           RUN_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-          COMMITS_URL: "${{ github.server_url }}/${{ github.repository }}/commits/${{ needs.e2e-nightly-test.outputs.git-branch }}"
+          COMMITS_URL: "${{ github.server_url }}/${{ github.repository }}/commits/${{ needs.e2e-nightly-test-2.outputs.git-branch }}"
         with:
           payload: |
             {

diff --git a/.github/workflows/e2e-nightly-38x.yml b/.github/workflows/e2e-nightly-38x.yml
@@ -33,31 +33,31 @@ jobs:
           echo "branch=`git branch --show-current`" >> $GITHUB_OUTPUT
 
       - name: Build
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         # Run make jobs in parallel, since we can't run steps in parallel.
         run: make -j2 docker generator runner tests
 
       - name: Generate testnets
         if: matrix.group != 5
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         # When changing -g, also change the matrix groups above
         run: ./build/generator -g 5 -d networks/nightly/ -p
 
       - name: Run p2p testnets (${{ matrix.group }})
         if: matrix.group != 5
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         run: ./run-multiple.sh networks/nightly/*-group${{ matrix.group }}-*.toml
 
       - name: Run p2p testnets (regression)
         if: matrix.group == 5
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         run: ./run-multiple.sh networks_regressions/*.toml
 
     outputs:
       git-branch: ${{ steps.git-info.outputs.branch }}
 
   e2e-nightly-fail:
-    needs: e2e-nightly-test
+    needs: e2e-nightly-test-2
     if: ${{ failure() }}
     runs-on: ubuntu-latest
     steps:
@@ -66,9 +66,9 @@ jobs:
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
           SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
-          BRANCH: ${{ needs.e2e-nightly-test.outputs.git-branch }}
+          BRANCH: ${{ needs.e2e-nightly-test-2.outputs.git-branch }}
           RUN_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-          COMMITS_URL: "${{ github.server_url }}/${{ github.repository }}/commits/${{ needs.e2e-nightly-test.outputs.git-branch }}"
+          COMMITS_URL: "${{ github.server_url }}/${{ github.repository }}/commits/${{ needs.e2e-nightly-test-2.outputs.git-branch }}"
         with:
           payload: |
             {

diff --git a/.github/workflows/e2e-nightly-main.yml b/.github/workflows/e2e-nightly-main.yml
@@ -27,28 +27,28 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         # Run make jobs in parallel, since we can't run steps in parallel.
         run: make -j2 docker generator runner tests
 
       - name: Generate testnets
         if: matrix.group != 5
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         # When changing -g, also change the matrix groups above
         run: ./build/generator -g 5 -d networks/nightly/ -p
 
       - name: Run p2p testnets (${{ matrix.group }})
         if: matrix.group != 5
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         run: ./run-multiple.sh networks/nightly/*-group${{ matrix.group }}-*.toml
 
       - name: Run p2p testnets (regression)
         if: matrix.group == 5
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         run: ./run-multiple.sh networks_regressions/*.toml
 
   e2e-nightly-fail:
-    needs: e2e-nightly-test
+    needs: e2e-nightly-test-2
     if: ${{ failure() }}
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -1,5 +1,5 @@
 name: e2e
-# Runs the CI end-to-end test network on all pushes to main or release branches
+# Runs the CI end-to-end test-2 network on all pushes to main or release branches
 # and every pull request, but only if any Go files have been changed.
 on:
   workflow_dispatch:  # allow running workflow manually
@@ -26,12 +26,12 @@ jobs:
             go.sum
 
       - name: Build
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         # Run two make jobs in parallel, since we can't run steps in parallel.
         run: make -j2 docker runner tests
         if: "env.GIT_DIFF != ''"
 
       - name: Run CI testnet
-        working-directory: test/e2e
+        working-directory: test-2/e2e
         run: ./run-multiple.sh networks/ci.toml
         if: "env.GIT_DIFF != ''"
diff --git a/.github/workflows/fuzz-nightly.yml b/.github/workflows/fuzz-nightly.yml
@@ -8,7 +8,7 @@ on:
     branches:
       - v1.x
     paths:
-      - "test/fuzz/**/*.go"
+      - "test-2/fuzz/**/*.go"
 
 jobs:
   fuzz-nightly-test:
@@ -21,59 +21,59 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install go-fuzz
-        working-directory: test/fuzz
+        working-directory: test-2/fuzz
         run: go install github.com/dvyukov/go-fuzz/go-fuzz@latest github.com/dvyukov/go-fuzz/go-fuzz-build@latest
 
       - name: Fuzz mempool
-        working-directory: test/fuzz
+        working-directory: test-2/fuzz
         run: timeout -s SIGINT --preserve-status 10m make fuzz-mempool
         continue-on-error: true
 
       - name: Fuzz p2p-addrbook
-        working-directory: test/fuzz
+        working-directory: test-2/fuzz
         run: timeout -s SIGINT --preserve-status 10m make fuzz-p2p-addrbook
         continue-on-error: true
 
       - name: Fuzz p2p-pex
-        working-directory: test/fuzz
+        working-directory: test-2/fuzz
         run: timeout -s SIGINT --preserve-status 10m make fuzz-p2p-pex
         continue-on-error: true
 
       - name: Fuzz p2p-sc
-        working-directory: test/fuzz
+        working-directory: test-2/fuzz
         run: timeout -s SIGINT --preserve-status 10m make fuzz-p2p-sc
         continue-on-error: true
 
       - name: Fuzz p2p-rpc-server
-        working-directory: test/fuzz
+        working-directory: test-2/fuzz
         run: timeout -s SIGINT --preserve-status 10m make fuzz-rpc-server
         continue-on-error: true
 
       - name: Archive crashers
         uses: actions/upload-artifact@v4
         with:
           name: crashers
-          path: test/fuzz/**/crashers
+          path: test-2/fuzz/**/crashers
           retention-days: 3
 
       - name: Archive suppressions
         uses: actions/upload-artifact@v4
         with:
           name: suppressions
-          path: test/fuzz/**/suppressions
+          path: test-2/fuzz/**/suppressions
           retention-days: 3
 
       - name: Set crashers count
-        working-directory: test/fuzz
+        working-directory: test-2/fuzz
         run: echo "count=$(find . -type d -name 'crashers' | xargs -I % sh -c 'ls % | wc -l' | awk '{total += $1} END {print total}')" >> $GITHUB_OUTPUT
         id: set-crashers-count
 
     outputs:
       crashers-count: ${{ steps.set-crashers-count.outputs.count }}
 
   fuzz-nightly-fail:
-    needs: fuzz-nightly-test
-    if: ${{ needs.fuzz-nightly-test.outputs.crashers-count != 0 }}
+    needs: fuzz-nightly-test-2
+    if: ${{ needs.fuzz-nightly-test-2.outputs.crashers-count != 0 }}
     runs-on: ubuntu-latest
     steps:
       - name: Notify Slack on failure
@@ -82,7 +82,7 @@ jobs:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
           SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
           BRANCH: ${{ github.ref_name }}
-          CRASHERS: ${{ needs.fuzz-nightly-test.outputs.crashers-count }}
+          CRASHERS: ${{ needs.fuzz-nightly-test-2.outputs.crashers-count }}
           RUN_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
         with:
           payload: |

diff --git a/.github/workflows/testapp-docker.yml b/.github/workflows/testapp-docker.yml
@@ -54,7 +54,7 @@ jobs:
         uses: docker/build-push-action@v6.2.0
         with:
           context: .
-          file: ./test/e2e/docker/Dockerfile
+          file: ./test-2/e2e/docker/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.prep.outputs.tags }}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -573,7 +573,7 @@ See [README](./test/e2e/README.md) for details.
 Run:
 
 ```sh
-cd test/e2e && \
+cd test-2/e2e && \
   make && \
   ./build/runner -f networks/ci.toml
 ```