cleanups

Signed-off-by: aaadir <adir@il.ibm.com>

Author: aaadir

driver/common/curve.go

@@ -106,14 +106,14 @@ func (p *CurveBase) ModAddMul(a1 []driver.Zr, b1 []driver.Zr, modulo driver.Zr)
 	return sum
 }
 
+func (p *CurveBase) ModAddMul2(a1 driver.Zr, c1 driver.Zr, b1 driver.Zr, c2 driver.Zr, m driver.Zr) driver.Zr {
+	return p.ModAdd(p.ModMul(a1, c1, m), p.ModMul(b1, c2, m), m)
+}
+
 func (p *CurveBase) AddPairsOfProducts(left []driver.Zr, right []driver.Zr, leftgen []driver.G1, rightgen []driver.G1) driver.G1 {
 	sum := leftgen[0].Mul2(left[0], rightgen[0], right[0])
 	for i := 1; i < len(left); i++ {
 		sum.Add(leftgen[i].Mul2(left[i], rightgen[i], right[i]))
 	}
 	return sum
 }
-
-func (p *CurveBase) ModAddMul2(a1 driver.Zr, c1 driver.Zr, b1 driver.Zr, c2 driver.Zr, m driver.Zr) driver.Zr {
-	return p.ModAdd(p.ModMul(a1, c1, m), p.ModMul(b1, c2, m), m)
-}

driver/gurvy/bls12381/bls12-381.go

@@ -597,11 +597,6 @@ func (c *Curve) ModAddMul(a1, b1 []driver.Zr, m driver.Zr) driver.Zr {
 }
 
 func (p *Curve) AddPairsOfProducts(left []driver.Zr, right []driver.Zr, leftgen []driver.G1, rightgen []driver.G1) driver.G1 {
-	// sum := leftgen[0].Mul2(left[0], rightgen[0], right[0])
-	// for i := 1; i < len(left); i++ {
-	// 	sum.Add(leftgen[i].Mul2(left[i], rightgen[i], right[i]))
-	// }
-	// return sum
 	tmpJac := G1Jacs.Get()
 	defer G1Jacs.Put(tmpJac)
 	sum := &G1{}

math.go

@@ -185,10 +185,6 @@ func NewZr(zr driver.Zr, curveID CurveID) *Zr {
 	return &Zr{zr: zr, curveID: curveID}
 }
 
-func (z *Zr) Get() driver.Zr {
-	return z.zr
-}
-
 func (z *Zr) CurveID() CurveID {
 	return z.curveID
 }