Add libsodium on Github Actiions

Finschia · Oct 11, 2021 · 2884118 · 2884118
1 parent d93b500
commit 2884118
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 12 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Create a file with all the pkgs
-        run: go list ./... > pkgs.txt
+        run: go list -tag libsodium ./... > pkgs.txt
       - name: Split pkgs into 4 files
         run: split -d -n l/4 pkgs.txt pkgs.txt.part.
       # cache multiple
@@ -30,22 +30,32 @@ jobs:
           name: "${{ github.sha }}-03"
           path: ./pkgs.txt.part.03
 
+  build-libsodium:
+    runs-on: ubuntu-latest
+    needs: split-test-files
+    steps:
+      - run: make libsodium
+
   build-linux:
     name: Build
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
+        libsodium: ["0", "1"]
         include:
           - goarch: "amd64"
             gcc: "gcc"
             package: ""
+            host: ""
           - goarch: "arm64"
             gcc: "aarch64-linux-gnu-gcc"
             package: "g++-aarch64-linux-gnu"
+            host: "aarch64-linux-gnu"
           - goarch: "arm"
             gcc: "arm-linux-gnueabi-gcc"
             package: "g++-arm-linux-gnueabi"
+            host: "arm-linux-gnueabi"
     timeout-minutes: 5
     steps:
       - run: sudo apt update && sudo apt install -y ${{ matrix.package }} qemu-user-binfmt
@@ -61,15 +71,16 @@ jobs:
             go.mod
             go.sum
       - name: install
-        run: GOOS=linux GOARCH=${{ matrix.goarch }} CC=${{ matrix.gcc }} make build
+        run: GOOS=linux GOARCH=${{ matrix.goarch }} CC=${{ matrix.gcc }} TARGET_HOST=${{ matrix.host }} LIBSODIUM=${{ matrix.libsodium }} make build
         if: "env.GIT_DIFF != ''"
 
   tests:
     runs-on: ubuntu-latest
-    needs: split-test-files
+    needs: build-libsodium
     strategy:
       fail-fast: false
       matrix:
+        vrf: ["r2ishiguro", "libsodium"]
         part: ["00", "01", "02", "03"]
     steps:
       - uses: actions/setup-go@v2
@@ -88,7 +99,7 @@ jobs:
         if: env.GIT_DIFF
       - name: test & coverage report creation
         run: |
-          cat pkgs.txt.part.${{ matrix.part }} | xargs go test -mod=readonly -timeout 10m -race -coverprofile=${{ matrix.part }}profile.out -covermode=atomic
+          cat pkgs.txt.part.${{ matrix.part }} | xargs go test -mod=readonly -timeout 10m -race -coverprofile=${{ matrix.part }}profile.out -covermode=atomic -tag=${{ matrix.vrf }}
         if: env.GIT_DIFF
       - uses: actions/upload-artifact@v2
         with:

diff --git a/Makefile b/Makefile
@@ -150,6 +150,9 @@ install_abci:
 VRF_ROOT = $(SRCPATH)/crypto/vrf/internal/vrf
 LIBSODIUM_ROOT = $(VRF_ROOT)/libsodium
 LIBSODIUM_OS = $(VRF_ROOT)/sodium/$(TARGET_OS)_$(TARGET_ARCH)
+ifneq ($(TARGET_HOST), "")
+LIBSODIUM_HOST = "--host=$(TARGET_HOST)"
+endif
 
 libsodium:
 	@if [ ! -f $(LIBSODIUM_OS)/lib/libsodium.a ]; then \
@@ -158,7 +161,7 @@ libsodium:
 		git submodule update --init --recursive && \
 		cd $(LIBSODIUM_ROOT) && \
 		./autogen.sh && \
-		./configure --disable-shared --prefix="$(LIBSODIUM_OS)" &&	\
+		./configure --disable-shared --prefix="$(LIBSODIUM_OS)" $(LIBSODIUM_HOST) &&	\
 		$(MAKE) && \
 		$(MAKE) install; \
 	fi

diff --git a/crypto/vrf/keygen_test.go b/crypto/vrf/keygen_test.go
@@ -32,7 +32,9 @@ func keyGen_coniks_ed25519(secret [SEEDBYTES]byte) (ed25519.PrivateKey, ed25519.
 }
 
 func keyGen_libsodium_ed25519(secret [SEEDBYTES]byte) (ed25519.PrivateKey, ed25519.PublicKey) {
-	pubKey, privKey := libsodium.KeyPairFromSeed(&secret)
+	var seed [libsodium.SEEDBYTES]byte
+	copy(seed[:], secret[:])
+	pubKey, privKey := libsodium.KeyPairFromSeed(&seed)
 	privateKey := make([]byte, libsodium.SECRETKEYBYTES)
 	copy(privateKey, privKey[:])
 	publicKey := make([]byte, libsodium.PUBLICKEYBYTES)

diff --git a/crypto/vrf/vrf_libsodium_test.go b/crypto/vrf/vrf_libsodium_test.go
@@ -14,7 +14,7 @@ import (
 )
 
 func TestKeyPairCompatibilityLibsodium(t *testing.T) {
-	secret := [SEEDBYTES]byte{}
+	secret := [libsodium.SEEDBYTES]byte{}
 	publicKey, privateKey := libsodium.KeyPairFromSeed(&secret)
 
 	privateKey2 := ed25519.PrivateKey(make([]byte, 64))
@@ -28,7 +28,7 @@ func TestKeyPairCompatibilityLibsodium(t *testing.T) {
 }
 
 func TestProveAndVerify_LibsodiumByCryptoED25519(t *testing.T) {
-	secret := [SEEDBYTES]byte{}
+	secret := [libsodium.SEEDBYTES]byte{}
 	privateKey := ed25519.NewKeyFromSeed(secret[:])
 	publicKey := privateKey.Public().(ed25519.PublicKey)
 
@@ -41,7 +41,7 @@ func TestProveAndVerify_LibsodiumByCryptoED25519(t *testing.T) {
 }
 
 func TestProveAndVerify_LibsodiumByConiksED25519(t *testing.T) {
-	secret := [SEEDBYTES]byte{}
+	secret := [libsodium.SEEDBYTES]byte{}
 	privateKey, _ := coniks.GenerateKey(bytes.NewReader(secret[:]))
 	publicKey, _ := privateKey.Public()
 
@@ -55,7 +55,7 @@ func TestProveAndVerify_LibsodiumByConiksED25519(t *testing.T) {
 }
 
 func TestProveAndVerify_LibsodiumByLibsodiumED25519(t *testing.T) {
-	secret := [SEEDBYTES]byte{}
+	secret := [libsodium.SEEDBYTES]byte{}
 	publicKey, privateKey := libsodium.KeyPairFromSeed(&secret)
 
 	verified, err := proveAndVerify(t, privateKey[:], publicKey[:])
@@ -67,7 +67,7 @@ func TestProveAndVerify_LibsodiumByLibsodiumED25519(t *testing.T) {
 }
 
 func TestProveAndVerifyCompatibilityLibsodium(t *testing.T) {
-	secret := [SEEDBYTES]byte{}
+	secret := [libsodium.SEEDBYTES]byte{}
 	message := []byte("hello, world")
 	privateKey := ed25519.NewKeyFromSeed(secret[:])
 	publicKey := privateKey.Public().(ed25519.PublicKey)

diff --git a/crypto/vrf/vrf_r2ishiguro.go b/crypto/vrf/vrf_r2ishiguro.go
@@ -1,4 +1,3 @@
-// default: r2ishiguro
 // +build !libsodium,!coniks
 
 package vrf