Update pyodide to 0.17 and fix js adapter (#308)

* Upgrade pyodide to 0.17 * change version numbers * update base docker image for pyodide * update redis * rename pythong worker * remove todos * some linting * format js * update workflows * update workflows * update workflows * fix rubocop source * update test dependencies * fix integration test for python wrapper * prettier on server js * remove git check * add exception for git * update digest gem * add safe git dir * restorey types definition * fix build * changelog * update prettier * update prettier * incremement test timeout * incremement test timeout * remove unnecessary import --------- Co-authored-by: Txus Bach <[email protected]>
decidim · Oct 10, 2023 · 00c72db · 00c72db
1 parent 2a312c1
commit 00c72db
Show file tree

Hide file tree

Showing 107 changed files with 37,241 additions and 28,656 deletions.
diff --git a/.code-workspace b/.code-workspace
@@ -8,6 +8,10 @@
             "name": "Bulletin Board Gem",
             "path": "bulletin_board/ruby-client"
         },
+        {
+            "name": "Bulletin Board JS Client",
+            "path": "bulletin_board/js-client"
+        },
         {
             "name": "Documentation",
             "path": "docs"
@@ -20,13 +24,30 @@
             "name": "Dummy JS Adapter",
             "path": "voting_schemes/dummy/js-adapter"
         },
+        {
+            "name": "ElectionGuard Wrapper",
+            "path": "voting_schemes/electionguard/python-wrapper"
+        },
         {
             "name": "ElectionGuard JS Adapter",
             "path": "voting_schemes/electionguard/js-adapter"
         },
         {
-            "name": "ElectionGuard Wrapper",
-            "path": "voting_schemes/electionguard/python-wrapper"
+            "name": "ElectionGuard Ruby Adapter",
+            "path": "voting_schemes/electionguard/ruby-adapter"
+        },
+        {
+            "name": "ElectionGuard Python2JS",
+            "path": "voting_schemes/electionguard/python-to-js"
+        },
+        {
+            "name": "ElectionGuard Pyodide Base Packages",
+            "path": "voting_schemes/electionguard/pyodide-base-packages"
+        },
+        {
+            "name": "ElectionGuard Pyodide Verifier",
+            "path": "voting_schemes/electionguard/verifier"
         }
-    ]
+    ],
+    "settings": {}
 }
diff --git a/.github/workflows/js-client-workflow.yml b/.github/workflows/js-client-workflow.yml
@@ -28,7 +28,7 @@ jobs:
         if: "github.ref != 'refs/heads/develop'"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - uses: actions/setup-node@v2-beta
@@ -62,7 +62,7 @@ jobs:
         if: "github.ref != 'refs/heads/develop'"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - uses: actions/setup-node@v2-beta

diff --git a/.github/workflows/ruby-client-workflow.yml b/.github/workflows/ruby-client-workflow.yml
@@ -27,7 +27,7 @@ jobs:
         if: "github.ref != 'refs/heads/develop'"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - uses: ruby/setup-ruby@master
@@ -61,7 +61,7 @@ jobs:
         if: "github.ref != 'refs/heads/develop'"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - uses: ruby/setup-ruby@master

diff --git a/.github/workflows/server-workflow.yml b/.github/workflows/server-workflow.yml
@@ -22,7 +22,7 @@ jobs:
     container:
       image: decidim/ruby-node-python-electionguard:ruby-3.1.1-node-16-python-3.8.11-electionguard-1.2.3
     steps:
-      - uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - name: Copy local electionguard
@@ -62,7 +62,7 @@ jobs:
     outputs:
       cache-hit: ${{ steps.save-output.outputs.cache-hit }}
     steps:
-      - uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - name: Cache python to js
@@ -86,9 +86,9 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ needs.check_python_to_js_cache.outputs.cache-hit != 'true' }}
     container:
-      image: decidim/pyodide-electionguard:pyodide-0.16.1-electionguard-1.2.3
+      image: decidim/pyodide-electionguard:pyodide-0.17.0-electionguard-1.2.3
     steps:
-      - uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - name: Cache python to js
@@ -150,9 +150,11 @@ jobs:
       DATABASE_PASSWORD: postgres
       DATABASE_HOST: postgres
     steps:
-      - uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
+      - name: Fix safe directory for git
+        run: git config --global --add safe.directory /__w/decidim-bulletin-board/decidim-bulletin-board
       - name: Cache python to js
         uses: actions/cache@v3
         env:
@@ -216,7 +218,6 @@ jobs:
         run: |
           cd bulletin_board/server
           npm run format
-          git diff --exit-code --ignore-submodules
       - name: Create database
         env:
           RAILS_ENV: test
@@ -272,9 +273,11 @@ jobs:
       REDIS_HOST: redis
       REDIS_PORT: 6379
     steps:
-      - uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
+      - name: Fix safe directory for git
+        run: git config --global --add safe.directory /__w/decidim-bulletin-board/decidim-bulletin-board
       - name: Cache python to js
         uses: actions/cache@v3
         env:

diff --git a/.github/workflows/verifier-workflow.yml b/.github/workflows/verifier-workflow.yml
@@ -29,7 +29,7 @@ jobs:
         if: "github.ref != 'refs/heads/develop'"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - uses: actions/setup-node@v2-beta
@@ -63,7 +63,7 @@ jobs:
         if: "github.ref != 'refs/heads/develop'"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - uses: actions/setup-node@v2-beta

diff --git a/.github/workflows/voting-scheme-dummy-js-adapter-workflow.yml b/.github/workflows/voting-scheme-dummy-js-adapter-workflow.yml
@@ -29,7 +29,7 @@ jobs:
         if: "github.ref != 'refs/heads/develop'"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - uses: actions/setup-node@v2-beta
@@ -63,7 +63,7 @@ jobs:
         if: "github.ref != 'refs/heads/develop'"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - uses: actions/setup-node@v2-beta

diff --git a/.github/workflows/voting-scheme-dummy-ruby-adapter-workflow.yml b/.github/workflows/voting-scheme-dummy-ruby-adapter-workflow.yml
@@ -27,7 +27,7 @@ jobs:
         if: "github.ref != 'refs/heads/develop'"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - uses: ruby/setup-ruby@master
@@ -61,7 +61,7 @@ jobs:
         if: "github.ref != 'refs/heads/develop'"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - uses: ruby/setup-ruby@master

diff --git a/.github/workflows/voting-scheme-electionguard-js-adapter-workflow.yml b/.github/workflows/voting-scheme-electionguard-js-adapter-workflow.yml
@@ -29,7 +29,7 @@ jobs:
         if: "github.ref != 'refs/heads/develop'"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - uses: actions/setup-node@v2-beta
@@ -63,7 +63,7 @@ jobs:
         if: "github.ref != 'refs/heads/develop'"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - uses: actions/setup-node@v2-beta

diff --git a/.github/workflows/voting-scheme-electionguard-python-wrapper-workflow.yml b/.github/workflows/voting-scheme-electionguard-python-wrapper-workflow.yml
@@ -29,7 +29,7 @@ jobs:
         if: "github.ref != 'refs/heads/develop'"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
           submodules: true

diff --git a/.github/workflows/voting-scheme-electionguard-ruby-adapter-workflow.yml b/.github/workflows/voting-scheme-electionguard-ruby-adapter-workflow.yml
@@ -27,7 +27,7 @@ jobs:
         if: "github.ref != 'refs/heads/develop'"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - uses: ruby/setup-ruby@master
@@ -61,7 +61,7 @@ jobs:
         if: "github.ref != 'refs/heads/develop'"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - uses: ruby/setup-ruby@master

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,8 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- Fixes for the pyodide upgrade
+- Libraries updates
+
 ## [0.24.1] - 2022-11-11
 
+- Pyodide has been upgraded to v0.17.0
+
 ## Fixed
 
 - Fixed issue with bulletin board Ruby client OpenSSL 3.0 compatibility

diff --git a/Dockerfile b/Dockerfile
@@ -17,7 +17,7 @@ ADD voting_schemes/electionguard/python-wrapper /code/voting_schemes/electiongua
 RUN cd /code && make build_electionguard_python_wrapper
 
 # This stage builds the pyodide packages for the previous python packages
-FROM decidim/pyodide-electionguard:pyodide-0.16.1-electionguard-1.2.3 as python-to-js-builder
+FROM decidim/pyodide-electionguard:pyodide-0.17.0-electionguard-1.2.3 as python-to-js-builder
 LABEL author="[email protected]"
 
 ENV PYODIDE_PACKAGES "electionguard,bulletin_board-electionguard"

diff --git a/Dockerfile.release b/Dockerfile.release
@@ -17,7 +17,7 @@ ADD voting_schemes/electionguard/python-wrapper /code/voting_schemes/electiongua
 RUN cd /code && make build_electionguard_python_wrapper
 
 # This stage builds the pyodide packages for the previous python packages
-FROM decidim/pyodide-electionguard:pyodide-0.16.1-electionguard-1.2.3 as python-to-js-builder
+FROM decidim/pyodide-electionguard:pyodide-0.17.0-electionguard-1.2.3 as python-to-js-builder
 LABEL author="[email protected]"
 
 ENV PYODIDE_PACKAGES "electionguard,bulletin_board-electionguard"

diff --git a/Dockerfile.worker b/Dockerfile.worker
@@ -17,7 +17,7 @@ ADD voting_schemes/electionguard/python-wrapper /code/voting_schemes/electiongua
 RUN cd /code && make build_electionguard_python_wrapper
 
 # This stage builds the pyodide packages for the previous python packages
-FROM decidim/pyodide-electionguard:pyodide-0.16.1-electionguard-1.2.3 as python-to-js-builder
+FROM decidim/pyodide-electionguard:pyodide-0.17.0-electionguard-1.2.3 as python-to-js-builder
 LABEL author="[email protected]"
 
 ENV PYODIDE_PACKAGES "electionguard,bulletin_board-electionguard"

diff --git a/bulletin_board/js-client/package-lock.json b/bulletin_board/js-client/package-lock.json
diff --git a/bulletin_board/js-client/package.json b/bulletin_board/js-client/package.json
@@ -45,7 +45,7 @@
     "jest": "^26.6.3",
     "jest-fetch-mock": "^3.0.3",
     "jest-transform-graphql": "^2.1.0",
-    "prettier": "2.1.2",
+    "prettier": "3.0.3",
     "webpack-dev-server": "^3.11.2"
   }
 }
diff --git a/bulletin_board/js-client/src/client/__mocks__/graphql-client.js b/bulletin_board/js-client/src/client/__mocks__/graphql-client.js
@@ -63,20 +63,20 @@ export class GraphQLClient {
       logEntriesByElection[electionUniqueId].data.election.logEntries.find(
         (logEntry) => {
           return logEntry.contentHash === contentHash;
-        }
-      )
+        },
+      ),
     );
   }
 
   getElectionLogEntries({ electionUniqueId }) {
     return Promise.resolve(
-      logEntriesByElection[electionUniqueId].data.election.logEntries
+      logEntriesByElection[electionUniqueId].data.election.logEntries,
     );
   }
 
   getPendingMessageByMessageId({ messageId }) {
     return Promise.resolve(
-      pendingMessageByMessageId[messageId].data.pendingMessage
+      pendingMessageByMessageId[messageId].data.pendingMessage,
     );
   }
 

diff --git a/bulletin_board/js-client/src/client/client.test.js b/bulletin_board/js-client/src/client/client.test.js
@@ -19,7 +19,7 @@ describe("Client", () => {
 
   it("initialise the api client with the given params", () => {
     expect(client.apiClient.apiEndpointUrl).toEqual(
-      defaultParams.apiEndpointUrl
+      defaultParams.apiEndpointUrl,
     );
     expect(client.apiClient.wsEndpointUrl).toEqual(defaultParams.wsEndpointUrl);
   });
@@ -49,9 +49,8 @@ describe("Client", () => {
 
   describe("waitForPendingMessageToBeProcessed", () => {
     it("returns the pending message for the given messageId", async () => {
-      const pendingMessage = await client.waitForPendingMessageToBeProcessed(
-        "dummy.1"
-      );
+      const pendingMessage =
+        await client.waitForPendingMessageToBeProcessed("dummy.1");
       expect(pendingMessage).toEqual({
         status: "accepted",
       });