Replaced masks with bits #288

Author: vo-nil

libs/zk/include/nil/crypto3/zk/commitments/detail/polynomial/proof_of_work.hpp

@@ -56,6 +56,7 @@ namespace nil {
                         }
 
                     static inline OutType generate(transcript_type &transcript, std::size_t GrindingBits = 16) {
+                        BOOST_ASSERT_MSG(GrindingBits < 64, "Grinding parameter should be bits, not mask");
                         output_type mask = GrindingBits > 0 ? ( 1ULL << GrindingBits ) - 1 : 0;
                         output_type proof_of_work = std::rand();
                         output_type result;
@@ -74,6 +75,7 @@ namespace nil {
                     }
 
                     static inline bool verify(transcript_type &transcript, output_type proof_of_work, std::size_t GrindingBits = 16) {
+                        BOOST_ASSERT_MSG(GrindingBits < 64, "Grinding parameter should be bits, not mask");
                         transcript(int_be(proof_of_work));
                         output_type result = transcript.template int_challenge<output_type>();
                         output_type mask = GrindingBits > 0 ? ( 1ULL << GrindingBits ) - 1 : 0;
@@ -93,7 +95,7 @@ namespace nil {
                     using value_type = typename FieldType::value_type;
                     using integral_type = typename FieldType::integral_type;
 
-                    static inline value_type generate(transcript_type &transcript, std::size_t GrindingBits=16) {
+                    static inline value_type generate(transcript_type &transcript, std::size_t GrindingBits = 16) {
                         static boost::random::random_device dev;
                         static nil::crypto3::random::algebraic_engine<FieldType> random_engine(dev);
                         value_type proof_of_work = random_engine();
@@ -117,7 +119,7 @@ namespace nil {
                         return proof_of_work;
                     }
 
-                    static inline bool verify(transcript_type &transcript, value_type proof_of_work, std::size_t GrindingBits=16) {
+                    static inline bool verify(transcript_type &transcript, value_type proof_of_work, std::size_t GrindingBits = 16) {
                         transcript(proof_of_work);
                         integral_type mask =
                             (GrindingBits > 0 ?

libs/zk/test/commitment/fri.cpp

@@ -116,7 +116,7 @@ BOOST_AUTO_TEST_SUITE(fri_test_suite)
                 2, //expand_factor
                 lambda,
                 true,
-                0xFFFFF
+                20
         );
 
         BOOST_CHECK(D[1]->m == D[0]->m / 2);

libs/zk/test/commitment/lpc.cpp

@@ -210,7 +210,7 @@ BOOST_AUTO_TEST_SUITE(lpc_math_polynomial_suite);
                 2, //expand_factor
                 lambda,
                 true,
-                0xFFF
+                12
         );
 
         using lpc_scheme_type = nil::crypto3::zk::commitments::lpc_commitment_scheme<lpc_type, math::polynomial<typename FieldType::value_type>>;
@@ -510,7 +510,7 @@ BOOST_AUTO_TEST_SUITE(lpc_params_test_suite)
                 2,  //expand_factor
                 lambda,
                 true,
-                0xFF
+                8
         );
 
         using lpc_scheme_type = nil::crypto3::zk::commitments::lpc_commitment_scheme<lpc_type, math::polynomial<typename FieldType::value_type>>;