Elligator script: avoid redundant computaton

diff --git a/tests/gen/elligator.py b/tests/gen/elligator.py
index df9c394888840bdc5de6babc0e54e0c781c27c6a..17599671c1e195d60b259474be77da00d19ff2f2 100755 (executable)
--- a/tests/gen/elligator.py
+++ b/tests/gen/elligator.py
@@ -179,29 +179,22 @@ def from_edwards(point):
     return (u, v)
 
 # entire key generation chain
-def private_to_hash(scalar):
-    xy = scalarbase(scalar)
-    uv = from_edwards(xy)
-    if can_curve_to_hash(uv):
-        return curve_to_hash(uv)
-    return None
-
 def full_cycle_check(scalar):
     fe(scalar).print()
     xy = scalarbase(scalar)
     uv = from_edwards(xy)
-    h  = private_to_hash(scalar)
     uv[0].print()
     uv[1].print()
-    if h is None:
-        print('00:')    # Failure
-        print('00:')    # dummy value for the hash
-    else:
+    if can_curve_to_hash(uv):
+        h = curve_to_hash(uv)
         print('01:')    # Success
         h.print()       # actual value for the hash
         c = hash_to_curve(h)
         if c != uv:
             print('Round trip failure')
+    else:
+        print('00:')    # Failure
+        print('00:')    # dummy value for the hash
 
 private = 0
 for v in range(20):