Merge pull request #166 from nucypher/chores

Assorted chores

.github/workflows/workspace.yml

@@ -148,7 +148,7 @@ jobs:
         target:
           - wasm32-unknown-unknown
         python:
-          - "3.10"
+          - "3.12"
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -176,7 +176,7 @@ jobs:
         working-directory: ferveo-python
 
       - name: Install pip dependencies
-        run: pip install pytest mypy
+        run: pip install pytest mypy ruff
 
       - name: Run pytest
         run: pytest
@@ -186,6 +186,10 @@ jobs:
         run: python -m mypy.stubtest ferveo
         working-directory: ferveo-python
 
+      - name: Run ruff
+        run: ruff check ferveo
+        working-directory: ferveo-python
+
   codecov:
     runs-on: ubuntu-latest
     needs: [ test ]
@@ -209,6 +213,21 @@ jobs:
           files: lcov.info
           fail_ci_if_error: true
 
+  compile-benchmarks:
+    # Temporarily replaces "benchmark" job. TODO: Remove this job once the "benchmark" job is fixed.
+    runs-on: ubuntu-latest
+    needs: [ test ]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          target: x86_64-unknown-linux-gnu
+          override: true
+      - name: Compile benchmarks
+        run: cargo bench --no-run --no-default-features
+
   benchmark:
 
     # TODO: This job is failing with error:

Cargo.toml

@@ -4,9 +4,9 @@ members = [
     "ferveo",
     "ferveo-common",
     "ferveo-python",
+    "ferveo-tdec",
     "ferveo-wasm",
     "subproductdomain",
-    "tpke",
 ]
 
 [profile.bench]

Pipfile

@@ -8,4 +8,4 @@ name = "pypi"
 [dev-packages]
 
 [requires]
-python_version = "3.10"
+python_version = "3.12"

ferveo-common/src/keypair.rs

@@ -61,15 +61,7 @@ impl<E: Pairing> PublicKey<E> {
 
 impl<E: Pairing> PartialOrd for PublicKey<E> {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        if self.encryption_key.x() == other.encryption_key.x() {
-            return self
-                .encryption_key
-                .y()
-                .partial_cmp(&other.encryption_key.y());
-        }
-        self.encryption_key
-            .x()
-            .partial_cmp(&other.encryption_key.x())
+        Some(self.cmp(other))
     }
 }
 
@@ -102,7 +94,7 @@ pub struct Keypair<E: Pairing> {
 
 impl<E: Pairing> PartialOrd for Keypair<E> {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        self.decryption_key.partial_cmp(&other.decryption_key)
+        Some(self.cmp(other))
     }
 }
 

ferveo-python/Pipfile

@@ -8,4 +8,4 @@ name = "pypi"
 [dev-packages]
 
 [requires]
-python_version = "3.10"
+python_version = "3.12"