Merge pull request #148 from skalenetwork/enhancement/fix-tools-test

add tools to nightly tests
skalenetwork · Jul 21, 2021 · dcda5e9 · dcda5e9
2 parents 2c70212 + 0373116
commit dcda5e9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -78,7 +78,7 @@ jobs:
     #     ./test.sh
     #     cd ..
 
-    # - name: Run tools tests
-    #   run: |
-    #     ./scripts/run_tools_test.sh
+    - name: Run tools tests
+      run: |
+        ./scripts/run_tools_test.sh
         
diff --git a/scripts/run_tools_test.sh b/scripts/run_tools_test.sh
@@ -23,14 +23,16 @@ calculate_hash() {
 }
 
 run_tools_test_with_individual_keys() {
-    individual_dkg_keys=""
+    individual_dkg_keys="./dkg_glue --t 11 --n 16"
     for i in {0..15}
     do
-        individual_dkg_keys="$individual_dkg_keys --input data_for_$i-th_participant.json"
+        individual_dkg_keys=""$individual_dkg_keys" --input data_for_"$i"-th_participant.json"
         ./dkg_keygen --t 11 --n 16 --j "$i"
     done
     echo "Generated individual dkg keys"
-    ./dkg_glue --t 11 --n 16 "$individual_dkg_keys"
+    echo "$individual_dkg_keys"
+    echo "./dkg_glue --t 11 --n 16 "$individual_dkg_keys""
+    $individual_dkg_keys
     echo "Generated individual bls keys"
 
     calculate_hash
@@ -47,13 +49,13 @@ run_tools_test_with_individual_keys() {
     done
     echo "Completed individual signatures and verified them"
 
-    individual_signatures=""
+    individual_signatures="./bls_glue --t 11 --n 16 "
     for i in {0..10}
     do
         SIGNATURE="signature"$i".json"
         individual_signatures="$individual_signatures --input $SIGNATURE"
     done
-    ./bls_glue --t 11 --n 16 "$individual_signatures" --output "$SIGNATURE_FILE"
+    $individual_signatures --output "$SIGNATURE_FILE"
     echo "Generated common bls signature"
 
     ./verify_bls --t 11 --n 16 --input "$SIGNATURE_FILE"

diff --git a/tools/bls_glue.cpp b/tools/bls_glue.cpp
@@ -14,7 +14,7 @@
   GNU Affero General Public License for more details.
 
   You should have received a copy of the GNU Affero General Public License
-  along with libBLS.  If not, see <https://www.gnu.org/licenses/>.
+  along with libBLS. If not, see <https://www.gnu.org/licenses/>.
 
   @file bls_glue.cpp
   @author Oleh Nikolaiev

diff --git a/tools/dkg_glue.cpp b/tools/dkg_glue.cpp
@@ -14,7 +14,7 @@
   GNU Affero General Public License for more details.
 
   You should have received a copy of the GNU Affero General Public License
-  along with libBLS.  If not, see <https://www.gnu.org/licenses/>.
+  along with libBLS. If not, see <https://www.gnu.org/licenses/>.
 
   @file dkg_glue.cpp
   @author Oleh Nikolaiev
@@ -52,7 +52,6 @@ void GenerateSecretKeys( const size_t t, const size_t n, const std::vector< std:
 
         size_t idx = stoi( data["idx"].get< std::string >() );
 
-
         secret_key_contribution[idx].resize( n );
         for ( size_t i = 0; i < n; ++i ) {
             secret_key_contribution[idx][i] = libff::alt_bn128_Fr(