Review comments

* Bumped version to 2.1.1.0 * Consistency in yaml file * Renaming for haskell convention * More verbose naming for code clarity * Switched back to iohk-nix/master
IntersectMBO · Mar 17, 2023 · b6f6b5a · b6f6b5a
1 parent 960f795
commit b6f6b5a
Show file tree

Hide file tree

Showing 7 changed files with 206 additions and 199 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -163,12 +163,15 @@ jobs:
       if: runner.os != 'Windows'
       run: cabal build all --enable-tests --extra-lib-dirs ${GITHUB_WORKSPACE}/blst-sources/blst
 
-    - name: Run tests
-      run: |
-        # The tests call out to msys2 commands. We generally do not want to mix toolchains, so
-        # we are very deliberate about only adding msys64 to the path where absolutely necessary.
-        ${{ (runner.os == 'Windows' && '$env:PATH=("C:\msys64\mingw64\bin;{0}" -f $env:PATH)') || '' }}
-        cabal test all --enable-tests --test-show-details=direct -j1 -v3 --extra-lib-dirs ${{ (runner.os == 'Windows' && '${env:GITHUB_WORKSPACE}/blst-sources/blst') || '${GITHUB_WORKSPACE}/blst-sources/blst' }}
+    - name: Run tests [WIN]
+      if: runner.os == 'Windows'
+      env:
+        MSYS2_PATH_TYPE: inherit
+        MSYSTEM: MINGW64
+      run: cabal test all --enable-tests --test-show-details=direct -j1 -v3 --extra-lib-dirs ${env:GITHUB_WORKSPACE}/blst-sources/blst
+
+  - name: Run tests [non-WIN]
+      run: cabal test all --enable-tests --test-show-details=direct -j1 -v3 --extra-lib-dirs ${GITHUB_WORKSPACE}/blst-sources/blst
 
     - uses: actions/upload-artifact@v3
       with:

diff --git a/cardano-crypto-class/CHANGELOG.md b/cardano-crypto-class/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2.1.1.0
+* Included bindings to `blst` library to enable operations over curve BLS12-381 
+
 ## 2.1.0.0
 
 * Fixed the name `encodedSignKeyDESIGNSizeExpr` -> `encodedSignKeyDSIGNSizeExpr`

diff --git a/cardano-crypto-class/cardano-crypto-class.cabal b/cardano-crypto-class/cardano-crypto-class.cabal
@@ -1,6 +1,6 @@
 cabal-version:      2.2
 name:               cardano-crypto-class
-version:            2.1.0.0
+version:            2.1.1.0
 synopsis:
   Type classes abstracting over cryptography primitives for Cardano
 

diff --git a/cardano-crypto-class/src/Cardano/Crypto/EllipticCurve/BLS12_381.hs b/cardano-crypto-class/src/Cardano/Crypto/EllipticCurve/BLS12_381.hs
@@ -4,18 +4,18 @@
 module Cardano.Crypto.EllipticCurve.BLS12_381
 (
   -- * Types
-    P
-  , P1
-  , P2
+    Point
+  , Point1
+  , Point2
   , PT
   , Curve1
   , Curve2
   , BLSTError (..)
 
   -- * BLS Class
   , BLS
-  , BLS_P
-  , BLS_Curve
+  , BLSPoint
+  , BLSCurve
 
   -- * Point / Group operations
   -- | These work on both curves, and take phantom parameters of type 'Curve1'
@@ -38,7 +38,7 @@ module Cardano.Crypto.EllipticCurve.BLS12_381
   , ptFinalVerify
 
   -- * Pairings
-  , miller_loop
+  , millerLoop
 
   -- * The period (modulo) of scalars
   , scalarPeriod