From 01aa256970da31a2c377f6875c32b98d6df0427c Mon Sep 17 00:00:00 2001
From: Balazs Komuves <bkomuves@gmail.com>
Date: Tue, 7 Nov 2023 14:21:37 +0100
Subject: [PATCH] minor improvements

---
 poseidon2.nim                     |  4 ++--
 poseidon2/roundfun.nim            |  3 ---
 poseidon2/types.nim               | 16 ++++++++--------
 tests/poseidon2/testPoseidon2.nim |  2 --
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/poseidon2.nim b/poseidon2.nim
index 44b8e58..e8f7f77 100644
--- a/poseidon2.nim
+++ b/poseidon2.nim
@@ -36,8 +36,8 @@ func spongeWithRate1*(xs: openArray[F]) : F =
   var s1 : F = zero
   var s2 : F = zero
 
-  for i in 0..<n:
-    s0 += xs[a+i]
+  for x in xs:
+    s0 += x
     permInplace(s0,s1,s2)
 
   # padding
diff --git a/poseidon2/roundfun.nim b/poseidon2/roundfun.nim
index 8b11f16..7e9d5a0 100644
--- a/poseidon2/roundfun.nim
+++ b/poseidon2/roundfun.nim
@@ -7,9 +7,6 @@ import ./roundconst
 
 #-------------------------------------------------------------------------------
 
-const zero* : F = getZero()
-const one*  : F = getOne()
-
 const externalRoundConst : array[24, F] = arrayFromHex( externalRoundConstStr )
 const internalRoundConst : array[56, F] = arrayFromHex( internalRoundConstStr )
 
diff --git a/poseidon2/types.nim b/poseidon2/types.nim
index 093a909..8ee1f7e 100644
--- a/poseidon2/types.nim
+++ b/poseidon2/types.nim
@@ -18,19 +18,19 @@ func getZero*() : F =
   setZero(z)
   return z
 
-func getOne*() : F = 
-  var y : F
-  # y.fromUint(1'u32)       # WTF, why does this not compile ???
-  y.fromHex("0x01")
-  return y
-
-# for some reason this one does not compile... ???
-# (when actually called)
+# Remark: since `fromInt()` does not work at compile time, this doesn't either
 func toF*(a: int) : F =
   var y : F
   y.fromInt(a)
   return y
 
+#-------------------------------------------------------------------------------
+
+const zero* : F = getZero()
+const one*  : F = fromHex(F,"0x01")     # note: `fromUint()` does not work at compile time
+
+#-------------------------------------------------------------------------------
+
 func hexToF*(s : string, endian: static Endianness = bigEndian) : F =
   let bigint = B.fromHex(s, endian)
   return F.fromBig(bigint)
diff --git a/tests/poseidon2/testPoseidon2.nim b/tests/poseidon2/testPoseidon2.nim
index f28ef20..26de78f 100644
--- a/tests/poseidon2/testPoseidon2.nim
+++ b/tests/poseidon2/testPoseidon2.nim
@@ -59,7 +59,6 @@ suite "poseidon2":
       for i in 1..n:
         xs.add( toF(i) )
       let h = spongeWithRate1(xs)
-      # echo(toDecimal(h))
       check toDecimal(h) == expectedSpongeResultsRate1[n] 
 
   test "sponge with rate=2":
@@ -68,7 +67,6 @@ suite "poseidon2":
       for i in 1..n:
         xs.add( toF(i) )
       let h = spongeWithRate2(xs)
-      # echo(toDecimal(h))
       check toDecimal(h) == expectedSpongeResultsRate2[n] 
 
   test "merkle root of field elements":