Merge branch 'dev' into 2024-06-21-jdc-refactor

stratum-mining · Jul 17, 2024 · f0787a1 · f0787a1
2 parents 06a4926 + 6f80d04
commit f0787a1
Show file tree

Hide file tree

Showing 2 changed files with 161 additions and 118 deletions.
diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
@@ -1,5 +1,4 @@
-# Performs test coverage of project's libraries using cargo-tarpaulin and the message-generator,
-# and generates results using codecov.io.
+# Performs test coverage of project's libraries using cargo-tarpaulin and generates results using codecov.io.
 # The following flags are set inside `tarpaulin.toml`:
 # `features = "..."`: Includes the code with the listed features. The following features result in a
 #     tarpaulin error and are NOT included: derive, alloc, arbitrary-derive, attributes, and
@@ -47,119 +46,3 @@ jobs:
             protocols/cobertura.xml
             roles/cobertura.xml
             utils/cobertura.xml
-
-  message-generator-test:
-    needs: tarpaulin-test
-
-    name: MG Test
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: 1.75.0
-          override: true
-          components: llvm-tools-preview
-
-      - name: Log data from rustc
-        run: rustc -Vv
-
-      - name: Install cargo-llvm-cov
-        uses: taiki-e/install-action@cargo-llvm-cov
-
-      - name: Run bad-pool-config-test
-        run: sh ./test/message-generator/test/bad-pool-config-test/bad-pool-config-test.sh
-
-      - name: Run interop-jd-translator
-        run: sh ./test/message-generator/test/interop-jd-translator/interop-jd-translator.sh
-
-          #- name: Run interop-jdc-change-upstream
-          #  run: sh ./test/message-generator/test/interop-jdc-change-upstream/interop-jdc-change-upstream.sh
-
-      - name: Run interop-proxy-with-multi-ups
-        run: sh ./test/message-generator/test/interop-proxy-with-multi-ups/interop-proxy-with-multi-ups.sh
-
-      - name: Run interop-proxy-with-multi-ups-extended
-        run: sh ./test/message-generator/test/interop-proxy-with-multi-ups-extended/interop-proxy-with-multi-ups-extended.sh
-
-      - name: Run jds-do-not-fail-on-wrong-tsdatasucc
-        run: sh ./test/message-generator/test/jds-do-not-fail-on-wrong-tsdatasucc/jds-do-not-fail-on-wrong-tsdatasucc.sh
-
-      - name: Run jds-do-not-panic-if-jdc-close-connection
-        run: sh ./test/message-generator/test/jds-do-not-panic-if-jdc-close-connection/jds-do-not-panic-if-jdc-close-connection.sh
-
-      - name: Run jds-do-not-stackoverflow-when-no-token
-        run: sh ./test/message-generator/test/jds-do-not-stackoverflow-when-no-token/jds-do-not-stackoverflow-when-no-token.sh
-
-      - name: Run pool-sri-test-1-standard
-        run: sh ./test/message-generator/test/pool-sri-test-1-standard/pool-sri-test-1-standard.sh
-
-      - name: Run pool-sri-test-close-channel
-        run: sh ./test/message-generator/test/pool-sri-test-close-channel/pool-sri-test-close-channel.sh
-
-      - name: Run pool-sri-test-extended_0
-        run: sh ./test/message-generator/test/pool-sri-test-extended_0/pool-sri-test-extended_0.sh
-
-      - name: Run pool-sri-test-extended_1
-        run: sh ./test/message-generator/test/pool-sri-test-extended_1/pool-sri-test-extended_1.sh
-
-      - name: Run pool-sri-test-reject-auth
-        run: sh ./test/message-generator/test/pool-sri-test-reject-auth/pool-sri-test-reject-auth.sh
-
-      - name: Run standard-coverage
-        run: sh ./test/message-generator/test/standard-coverage-test/standard-coverage-test.sh
-
-      - name: Run sv1-test
-        run: sh ./test/message-generator/test/sv1-test/sv1-test.sh
-
-      - name: Run translation-proxy-broke-pool
-        run: sh ./test/message-generator/test/translation-proxy-broke-pool/translation-proxy-broke-pool.sh
-
-      - name: Run translation-proxy
-        run: sh ./test/message-generator/test/translation-proxy/translation-proxy.sh
-
-      - name: Run translation-proxy-old-share
-        run: sh ./test/message-generator/test/translation-proxy-old-share/translation-proxy-old-share.sh
-
-      - name: Coverage report
-        run: sh ./scripts/code-coverage-report.sh
-
-      - name: Archive MG code coverage results
-        uses: actions/upload-artifact@v4
-        with:
-          name: coverage-report
-          path: 'target/*.xml'
-
-      - name: Archive log files
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: logs
-          path: './utils/message-generator/*.log'
-
-            # codecov:
-            #   needs: message-generator-test
-
-            #   name: Codecov Upload
-            #   runs-on: ubuntu-latest
-
-            #   steps:
-
-            #     - name: Checkout repository
-            #       uses: actions/checkout@v4
-
-            #     - name: Download all workflow run artifacts
-            #       uses: actions/download-artifact@v4
-
-            #     - name: Display structure of downloaded files
-            #       run: ls -R
-
-            #     - name: Upload to codecov.io
-            #       uses: codecov/codecov-action@v3
-            #       with:
-            #         files: coverage-report/*.xml, tarpaulin-report/*.xml
-            #         fail_ci_if_error: true
-            #         token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/mg.yaml b/.github/workflows/mg.yaml
@@ -0,0 +1,160 @@
+# Runs all Message Generator tests in separate jobs
+
+name: MG Test
+
+on:
+  push:
+    branches: [ main, dev ]
+  pull_request:
+    branches: [ main, dev ]
+
+jobs:
+  bad-pool-config-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Install cargo-llvm-cov
+        run: cargo install cargo-llvm-cov
+      - name: Run bad-pool-config-test
+        run: sh ./test/message-generator/test/bad-pool-config-test/bad-pool-config-test.sh
+
+  interop-jd-translator:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Run interop-jd-translator
+        run: sh ./test/message-generator/test/interop-jd-translator/interop-jd-translator.sh
+
+  interop-proxy-with-multi-ups:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Run interop-proxy-with-multi-ups
+        run: sh ./test/message-generator/test/interop-proxy-with-multi-ups/interop-proxy-with-multi-ups.sh
+
+  interop-proxy-with-multi-ups-extended:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Run interop-proxy-with-multi-ups-extended
+        run: sh ./test/message-generator/test/interop-proxy-with-multi-ups-extended/interop-proxy-with-multi-ups-extended.sh
+
+  jds-do-not-fail-on-wrong-tsdatasucc:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Run jds-do-not-fail-on-wrong-tsdatasucc
+        run: sh ./test/message-generator/test/jds-do-not-fail-on-wrong-tsdatasucc/jds-do-not-fail-on-wrong-tsdatasucc.sh
+
+  jds-do-not-panic-if-jdc-close-connection:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Run jds-do-not-panic-if-jdc-close-connection
+        run: sh ./test/message-generator/test/jds-do-not-panic-if-jdc-close-connection/jds-do-not-panic-if-jdc-close-connection.sh
+
+  jds-do-not-stackoverflow-when-no-token:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Run jds-do-not-stackoverflow-when-no-token
+        run: sh ./test/message-generator/test/jds-do-not-stackoverflow-when-no-token/jds-do-not-stackoverflow-when-no-token.sh
+
+  pool-sri-test-1-standard:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Install cargo-llvm-cov
+        run: cargo install cargo-llvm-cov
+      - name: Run pool-sri-test-1-standard
+        run: sh ./test/message-generator/test/pool-sri-test-1-standard/pool-sri-test-1-standard.sh
+
+  pool-sri-test-close-channel:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Run pool-sri-test-close-channel
+        run: sh ./test/message-generator/test/pool-sri-test-close-channel/pool-sri-test-close-channel.sh
+
+  pool-sri-test-extended_0:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Install cargo-llvm-cov
+        run: cargo install cargo-llvm-cov
+      - name: Run pool-sri-test-extended_0
+        run: sh ./test/message-generator/test/pool-sri-test-extended_0/pool-sri-test-extended_0.sh
+
+  pool-sri-test-extended_1:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Install cargo-llvm-cov
+        run: cargo install cargo-llvm-cov
+      - name: Run pool-sri-test-extended_1
+        run: sh ./test/message-generator/test/pool-sri-test-extended_1/pool-sri-test-extended_1.sh
+
+  pool-sri-test-reject-auth:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Install cargo-llvm-cov
+        run: cargo install cargo-llvm-cov
+      - name: Run pool-sri-test-reject-auth
+        run: sh ./test/message-generator/test/pool-sri-test-reject-auth/pool-sri-test-reject-auth.sh
+
+  standard-coverage:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Install cargo-llvm-cov
+        run: cargo install cargo-llvm-cov
+      - name: Run standard-coverage
+        run: sh ./test/message-generator/test/standard-coverage-test/standard-coverage-test.sh
+
+  sv1-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Run sv1-test
+        run: sh ./test/message-generator/test/sv1-test/sv1-test.sh
+
+  translation-proxy-broke-pool:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Run translation-proxy-broke-pool
+        run: sh ./test/message-generator/test/translation-proxy-broke-pool/translation-proxy-broke-pool.sh
+
+  translation-proxy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Install cargo-llvm-cov
+        run: cargo install cargo-llvm-cov
+      - name: Run translation-proxy
+        run: sh ./test/message-generator/test/translation-proxy/translation-proxy.sh
+
+  translation-proxy-old-share:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Run translation-proxy-old-share
+        run: sh ./test/message-generator/test/translation-proxy-old-share/translation-proxy-old-share.sh