Random functions type traits usage changed #1#2

NilFoundation · Nov 7, 2020 · fc53806 · fc53806
1 parent e793f0a
commit fc53806
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 20 deletions.
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
@@ -18,6 +18,7 @@ macro(define_algebra_example name)
 endmacro()
 
 set(EXAMPLES_NAMES
+    "multiexp"
     "curves"
     "fields"
     "pairing"

diff --git a/example/multi_exp.cpp → example/multiexp.cpp b/example/multi_exp.cpp → example/multiexp.cpp
diff --git a/include/nil/crypto3/algebra/curves/detail/scalar_mul.hpp b/include/nil/crypto3/algebra/curves/detail/scalar_mul.hpp
@@ -100,12 +100,11 @@ namespace nil {
                     }*/
 
                     template<typename GroupValueType,
-                             typename FieldValueType,
-                             typename = typename std::enable_if<
-                                 ::nil::crypto3::detail::is_curve_group<typename GroupValueType::group_type>::value &&
-                                 !::nil::crypto3::detail::is_field<typename GroupValueType::group_type>::value &&
-                                 ::nil::crypto3::detail::is_fp_field<typename FieldValueType::field_type>::value>::type>
-                    GroupValueType operator*(const GroupValueType &left, const FieldValueType &right) {
+                             typename FieldValueType>
+                    typename std::enable_if<::nil::crypto3::detail::is_curve_group<typename GroupValueType::group_type>::value &&
+                                            !::nil::crypto3::detail::is_field<typename GroupValueType::group_type>::value &&
+                                            ::nil::crypto3::detail::is_fp_field<typename FieldValueType::field_type>::value, GroupValueType>::type 
+                         operator*(const GroupValueType &left, const FieldValueType &right) {
 
                         // temporary added until fixed-precision modular adaptor is ready:
                         typedef number<backends::cpp_int_backend<>> non_fixed_precision_modulus_type;
@@ -114,12 +113,11 @@ namespace nil {
                     }
 
                     template<typename GroupValueType,
-                             typename FieldValueType,
-                             typename = typename std::enable_if<
-                                 ::nil::crypto3::detail::is_curve_group<typename GroupValueType::group_type>::value &&
-                                 !::nil::crypto3::detail::is_field<typename GroupValueType::group_type>::value &&
-                                 ::nil::crypto3::detail::is_fp_field<typename FieldValueType::field_type>::value>::type>
-                    GroupValueType operator*(const FieldValueType &left, const GroupValueType &right) {
+                             typename FieldValueType>
+                    typename std::enable_if<::nil::crypto3::detail::is_curve_group<typename GroupValueType::group_type>::value &&
+                                            !::nil::crypto3::detail::is_field<typename GroupValueType::group_type>::value &&
+                                            ::nil::crypto3::detail::is_fp_field<typename FieldValueType::field_type>::value, GroupValueType>::type 
+                        operator*(const FieldValueType &left, const GroupValueType &right) {
 
                         return right * left;
                     }

diff --git a/include/nil/crypto3/algebra/random_element.hpp b/include/nil/crypto3/algebra/random_element.hpp
@@ -26,21 +26,24 @@
 #ifndef CRYPTO3_ALGEBRA_RANDOM_ELEMENT_HPP
 #define CRYPTO3_ALGEBRA_RANDOM_ELEMENT_HPP
 
+#include <nil/crypto3/detail/type_traits.hpp>
+
 namespace nil {
     namespace crypto3 {
         namespace algebra {
 
-            template<typename CurveGroupType,
-                     typename = typename std::enable_if<
-                         ::nil::crypto3::algebra::detail::is_field<CurveGroupType>::value &&
-                         !(::nil::crypto3::algebra::detail::is_field<CurveGroupType>::value)>::type>
-                > typename CurveGroupType::value_type random_element() {
+            template<typename CurveGroupType>
+            typename std::enable_if<::nil::crypto3::detail::is_curve_group<CurveGroupType>::value, 
+                                    typename CurveGroupType::value_type>::type
+                random_element() {
+
                 return CurveGroupType::value_type::one();
             };
 
-            template<typename FieldType, typename = typename std::enable_if<
-                                             ::nil::crypto3::algebra::detail::is_field<FieldType>::value>::type>
-                > typename FieldType::value_type random_element() {
+            template<typename FieldType>
+            typename std::enable_if<::nil::crypto3::detail::is_field<FieldType>::value, 
+                                    typename FieldType::value_type>::type 
+                random_element() {
                 return FieldType::value_type::one();
             };