appease felix

crypto/bn256/gnark/g1.go

@@ -44,13 +44,7 @@ func (g *G1) Unmarshal(buf []byte) (int, error) {
 	}
 
 	// Check if both coordinates are zero (point at infinity)
-	isZero := true
+	isZero := allZeroes(buf[0:64])
-	for i := 0; i < 64; i++ {
-		if buf[i] != 0 {
-			isZero = false
-			break
-		}
-	}
 	if isZero {
 		g.inner.X.SetZero()
 		g.inner.Y.SetZero()
@@ -97,3 +91,14 @@ func (p *G1) Marshal() []byte {
 
 	return output
 }
+
+func allZeroes(buf []byte) bool {
+	isZero := true
+	for i := 0; i < len(buf); i++ {
+		if buf[i] != 0 {
+			isZero = false
+			break
+		}
+	}
+	return isZero
+}

crypto/bn256/gnark/g2.go

@@ -32,13 +32,7 @@ func (g *G2) Unmarshal(buf []byte) (int, error) {
 	}
 
 	// Check if all coordinates are zero (point at infinity)
-	isZero := true
+	isZero := allZeroes(buf[0:128])
-	for i := 0; i < 128; i++ {
-		if buf[i] != 0 {
-			isZero = false
-			break
-		}
-	}
 	if isZero {
 		g.inner.X.A0.SetZero()
 		g.inner.X.A1.SetZero()

crypto/bn256/gnark/native_format_test.go

@@ -21,14 +21,10 @@ func TestNativeGnarkFormatIncompatibility(t *testing.T) {
 func TestSerRoundTrip(t *testing.T) {
 	_, _, g1Gen, g2Gen := bn254.Generators()
 
-	expectedG1 := G1{
+	expectedG1 := G1{inner: g1Gen}
-		inner: g1Gen,
-	}
 	bytesG1 := expectedG1.Marshal()
 
-	expectedG2 := G2{
+	expectedG2 := G2{inner: g2Gen}
-		inner: g2Gen,
-	}
 	bytesG2 := expectedG2.Marshal()
 
 	var gotG1 G1