Revert last reviews (#7)

Author: irfanbozkurt

.gitignore

@@ -15,12 +15,11 @@
 *.out
 
 # Dependency directories (remove the comment below to include it)
-# vendor/
+vendor/
 
 # Go workspace file
 go.work
 go.work.sum
 
 # env file
 .env
-vendor

curve/ecgfp5/scalar_field.go

@@ -5,7 +5,6 @@ import (
 	"encoding/binary"
 	"math/big"
 	"math/rand"
-	"sync"
 	"time"
 
 	gFp5 "github.com/elliottech/poseidon_crypto/field/goldilocks_quintic_extension"
@@ -32,12 +31,11 @@ func ScalarElementFromLittleEndianBytes(data []byte) ECgFp5Scalar {
 		panic("invalid length")
 	}
 
-	var uintArr [5]uint64
+	var value ECgFp5Scalar
 	for i := 0; i < 5; i++ {
-		uintArr[i] = binary.LittleEndian.Uint64(data[i*8:])
+		value[i] = binary.LittleEndian.Uint64(data[i*8:])
 	}
-
-	return FromNonCanonicalBigInt(BigIntFromArray(uintArr))
+	return value
 }
 
 func (s ECgFp5Scalar) SplitTo4BitLimbs() [80]uint8 {
@@ -270,25 +268,20 @@ func FromGfp5(fp5 gFp5.Element) ECgFp5Scalar {
 	}))
 }
 
-// TODO: use sync.Pool for other places where redundant big.Int initializations are made.
-var bigIntPool = sync.Pool{
-	New: func() interface{} {
-		return new(big.Int)
-	},
-}
-
 func BigIntFromArray(arr [5]uint64) *big.Int {
 	result := new(big.Int)
 	for i := 4; i >= 0; i-- {
 		result.Lsh(result, 64)
-		result.Or(result, bigIntPool.Get().(*big.Int).SetUint64(arr[i]))
+		result.Or(result, new(big.Int).SetUint64(arr[i]))
 	}
 	return result
 }
 
 func FromNonCanonicalBigInt(val *big.Int) ECgFp5Scalar {
-	limbs := val.Mod(val, ORDER).Bits()
-	limbs = append(limbs, make([]big.Word, 5-len(limbs))...)
+	limbs := new(big.Int).Mod(val, ORDER).Bits()
+	if len(limbs) < 5 {
+		limbs = append(limbs, 0)
+	}
 	return ECgFp5Scalar{uint64(limbs[0]), uint64(limbs[1]), uint64(limbs[2]), uint64(limbs[3]), uint64(limbs[4])}
 }
 

field/goldilocks/goldilocks.go

@@ -121,11 +121,11 @@ func Modulus() uint64 {
 }
 
 func Zero() Element {
-	return Element{0}
+	return g.NewElement(0)
 }
 
 func One() Element {
-	return Element{4294967295}
+	return g.NewElement(1)
 }
 
 func Neg(e Element) Element {

hash/poseidon2_goldilocks/poseidon2_test.go

@@ -1,28 +1,29 @@
 package poseidon2
 
 import (
+	"fmt"
 	"testing"
 
 	g "github.com/elliottech/poseidon_crypto/field/goldilocks"
 )
 
-// func TestGetNilTreeLevels(t *testing.T) {
-// 	res := []HashOut{EmptyHashOut()}
-// 	for i := 1; i < 128; i++ {
-// 		res = append(res, HashTwoToOne(res[i-1], res[i-1]))
-// 	}
-
-// 	fmt.Println()
-// 	for i := 0; i < len(res); i++ {
-// 		fmt.Printf("Level %d: ", i)
-// 		leBytes := res[i].ToLittleEndianBytes()
-// 		for j := 0; j < len(leBytes); j++ {
-// 			fmt.Printf("%d ", leBytes[j])
-// 		}
-// 		fmt.Println()
-// 	}
-// 	fmt.Println()
-// }
+func TestGetNilTreeLevels(t *testing.T) {
+	res := []HashOut{EmptyHashOut()}
+	for i := 1; i < 128; i++ {
+		res = append(res, HashTwoToOne(res[i-1], res[i-1]))
+	}
+
+	fmt.Println()
+	for i := 0; i < len(res); i++ {
+		fmt.Printf("Level %d: ", i)
+		leBytes := res[i].ToLittleEndianBytes()
+		for j := 0; j < len(leBytes); j++ {
+			fmt.Printf("%d ", leBytes[j])
+		}
+		fmt.Println()
+	}
+	fmt.Println()
+}
 
 func TestPermute(t *testing.T) {
 	inp := [WIDTH]g.Element{

signature/schnorr/schnorr_test.go

@@ -46,49 +46,6 @@ func TestSchnorrSignAndVerify(t *testing.T) {
 	}
 }
 
-func TestSchnorrSignAndVerify2(t *testing.T) {
-	sk := curve.ECgFp5Scalar{
-		123436789012345,
-		423456789012345,
-		623456789012345,
-		323456789012345,
-		987654321098765,
-	}
-	msg := []g.Element{
-		g.FromUint64(1234567890),
-		g.FromUint64(1234567890),
-		g.FromUint64(1234567890),
-		g.FromUint64(1234567890),
-		g.FromUint64(1234567890),
-		g.FromUint64(1234567890),
-		g.FromUint64(1234567890),
-		g.FromUint64(1234567890),
-		g.FromUint64(9876543210),
-	}
-	hashedMsg := p2.HashToQuinticExtension(msg)
-
-	sig := Signature{
-		S: curve.ECgFp5Scalar{
-			967731567622134384,
-			14773957602371314426,
-			5625157264196176680,
-			4777447573816832589,
-			2786434001343470261,
-		},
-		E: curve.ECgFp5Scalar{
-			4587639336484623223,
-			3617268809678375214,
-			7648030453022535951,
-			12524273874744280663,
-			5087864368241658443,
-		},
-	}
-	pk := SchnorrPkFromSk(sk)
-	if !IsSchnorrSignatureValid(&pk, &hashedMsg, sig) {
-		t.Fatalf("Signature is invalid")
-	}
-}
-
 func TestComparativeSchnorrSignAndVerify(t *testing.T) {
 	sks := []curve.ECgFp5Scalar{
 		curve.ECgFp5Scalar{