minor updates #113

Author: tshchelovek

include/nil/crypto3/zk/commitments/polynomial/kzg.hpp

@@ -43,10 +43,11 @@
 #include <nil/crypto3/algebra/multiexp/policies.hpp>
 #include <nil/crypto3/algebra/pairing/pairing_policy.hpp>
 
-using namespace nil::crypto3::math;
-
 #include <nil/crypto3/math/polynomial/polynomial.hpp>
 
+using namespace nil::crypto3;
+using namespace nil::crypto3::math;
+
 namespace nil {
     namespace crypto3 {
         namespace zk {
@@ -73,7 +74,7 @@ namespace nil {
                         scalar_value_type alpha;  //secret key
                         kzg_params_type(std::size_t _n, scalar_value_type _alpha) : n(_n), alpha(_alpha) {}
                         kzg_params_type(std::size_t _n) {
-                            alpha = scalar_value_type::random_element();
+                            alpha = algebra::random_element<typename curve_type::scalar_field_type>();
                             n = _n;
                         }
                     };
@@ -101,7 +102,7 @@ namespace nil {
 
                     static commitment_type commit(const srs_type &srs,
                                                   const polynomial<scalar_value_type> &f) {
-                        // assert(f.size() <= srs.commitment_key.size());
+                        assert(f.size() <= srs.commitment_key.size());
                         return algebra::multiexp<multiexp_method>(srs.commitment_key.begin(),
                                                 srs.commitment_key.begin() + f.size(), f.begin(), f.end(), 1);
                     }

test/commitment/kzg.cpp

@@ -97,12 +97,12 @@ BOOST_AUTO_TEST_CASE(kzg_random_test) {
     typedef typename curve_type::scalar_field_type::value_type scalar_value_type;
     typedef zk::commitments::kzg_commitment<curve_type> kzg_type;
 
-    scalar_value_type alpha = algebra::random_element<scalar_field_type>();
     scalar_value_type i = algebra::random_element<scalar_field_type>();
     std::size_t n = 298;
     const polynomial<scalar_value_type> f = {-1, 1, 2, 3, 5, -15};
 
-    auto srs = kzg_type::setup({n, alpha});
+    auto kzg_params = kzg_type::kzg_params_type(n);
+    auto srs = kzg_type::setup(kzg_params);
     auto commit = kzg_type::commit(srs, f);
     auto eval = f.evaluate(i);
     auto proof = kzg_type::proof_eval(srs, f, i, eval);
@@ -232,7 +232,6 @@ BOOST_AUTO_TEST_CASE(kzg_batched_random_test) {
     typedef typename curve_type::scalar_field_type::value_type scalar_value_type;
     typedef zk::commitments::kzg_batched_commitment<curve_type> kzg_type;
 
-    scalar_value_type alpha = algebra::random_element<scalar_field_type>();
     std::size_t n = 298;
     const std::vector<polynomial<scalar_value_type>> f0{{
         {{1, 2, 3, 4, 5, 6, 7, 8}},
@@ -259,7 +258,9 @@ BOOST_AUTO_TEST_CASE(kzg_batched_random_test) {
     }
     auto evals = kzg_type::evaluate_polynomials(polys, zs);
 
-    auto srs = kzg_type::setup({n, alpha});
+    auto kzg_params = kzg_type::kzg_params_type(n);
+    auto alpha = kzg_params.alpha;
+    auto srs = kzg_type::setup(kzg_params);
 
     std::vector<scalar_value_type> gammas;
     for (std::size_t i = 0; i < num_polys; ++i) {