Fix redundant conversion

Consensys · Apr 25, 2023 · 4aac8e5 · 4aac8e5
1 parent 81372de
commit 4aac8e5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/...le/alu/ext/calculator/UtilCalculator.java → ...linea/zktracer/module/UtilCalculator.java b/...le/alu/ext/calculator/UtilCalculator.java → ...linea/zktracer/module/UtilCalculator.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package net.consensys.linea.zktracer.module.alu.ext.calculator;
+package net.consensys.linea.zktracer.module;
 
 import java.math.BigInteger;
 
@@ -46,8 +46,7 @@ public static BigInteger calculateProduct(Bytes32 arg1, Bytes32 arg2) {
    * @return The quotient of the given BigInteger and arg3 as a BigInteger.
    */
   public static BigInteger calculateQuotient(BigInteger prod, Bytes32 arg3) {
-    byte[] prodBytes = prod.toByteArray(); // Convert the product to a byte array.
-    return new BigInteger(1, prodBytes).divide(arg3.toUnsignedBigInteger());
+    return prod.divide(arg3.toUnsignedBigInteger());
   }
 
   /**

diff --git a/...net/consensys/linea/zktracer/module/alu/ext/calculator/addmod/AddModBytesQCalculator.java b/...net/consensys/linea/zktracer/module/alu/ext/calculator/addmod/AddModBytesQCalculator.java
@@ -21,8 +21,8 @@
 
 import net.consensys.linea.zktracer.bytestheta.BaseTheta;
 import net.consensys.linea.zktracer.bytestheta.BytesArray;
+import net.consensys.linea.zktracer.module.UtilCalculator;
 import net.consensys.linea.zktracer.module.alu.ext.BigIntegerConverter;
-import net.consensys.linea.zktracer.module.alu.ext.calculator.UtilCalculator;
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.units.bigints.UInt256;
 

diff --git a/...net/consensys/linea/zktracer/module/alu/ext/calculator/mulmod/MulModBytesQCalculator.java b/...net/consensys/linea/zktracer/module/alu/ext/calculator/mulmod/MulModBytesQCalculator.java
@@ -16,22 +16,20 @@
 
 import static net.consensys.linea.zktracer.module.Util.isUInt256;
 import static net.consensys.linea.zktracer.module.Util.uInt64ToBytes;
-import static net.consensys.linea.zktracer.module.alu.ext.calculator.UtilCalculator.calculateProduct;
-import static net.consensys.linea.zktracer.module.alu.ext.calculator.UtilCalculator.calculateQuotient;
-import static net.consensys.linea.zktracer.module.alu.ext.calculator.UtilCalculator.convertToBaseTheta;
 
 import java.math.BigInteger;
 
 import net.consensys.linea.zktracer.bytestheta.BaseTheta;
 import net.consensys.linea.zktracer.bytestheta.BytesArray;
+import net.consensys.linea.zktracer.module.UtilCalculator;
 import net.consensys.linea.zktracer.module.alu.ext.BigIntegerConverter;
 import org.apache.tuweni.bytes.Bytes32;
 
 public class MulModBytesQCalculator {
   /**
    * Computes the quotient of the product of arg1 and arg2 divided by arg3, all of Bytes32 type, and
-   * returns the result as a BytesArray.
-   * (arg1 * arg2 ) / arg3
+   * returns the result as a BytesArray. (arg1 * arg2 ) / arg3
+   *
    * @param arg1 The first Bytes32 argument.
    * @param arg2 The second Bytes32 argument.
    * @param arg3 The third Bytes32 argument.
@@ -40,11 +38,11 @@ public class MulModBytesQCalculator {
   public static BytesArray computeQs(Bytes32 arg1, Bytes32 arg2, Bytes32 arg3) {
     byte[][] qBytes = new byte[8][8];
 
-    BigInteger prod = calculateProduct(arg1, arg2);
+    BigInteger prod = UtilCalculator.calculateProduct(arg1, arg2);
 
     if (isUInt256(prod)) {
-      BigInteger quotBigInteger = calculateQuotient(prod, arg3);
-      BaseTheta quotBaseTheta = convertToBaseTheta(quotBigInteger);
+      BigInteger quotBigInteger = UtilCalculator.calculateQuotient(prod, arg3);
+      BaseTheta quotBaseTheta = UtilCalculator.convertToBaseTheta(quotBigInteger);
 
       for (int i = 0; i < 4; i++) {
         // Copy the BaseTheta byte arrays into the result byte array.