Rename gas.reduce to gas.computeFee

AztecProtocol · Apr 24, 2024 · c10a66c · c10a66c
1 parent 0d4acef
commit c10a66c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/public_kernel_teardown.nr b/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/public_kernel_teardown.nr
@@ -39,7 +39,7 @@ impl PublicKernelTeardownCircuitPrivateInputs {
         // TODO(palla/gas): Load gas fees from a PublicConstantData struct that's currently missing
         let block_gas_fees = GasFees::default();
         let inclusion_fee = self.previous_kernel.public_inputs.constants.tx_context.gas_settings.inclusion_fee;
-        let computed_transaction_fee = total_gas_used.reduce(block_gas_fees) + inclusion_fee;
+        let computed_transaction_fee = total_gas_used.compute_fee(block_gas_fees) + inclusion_fee;
 
         // dep::types::debug_log::debug_log_format(
         //     "Validating tx fee: total_gas_used.da={0} total_gas_used.l1={1} total_gas_used.l2={2} block_fee_per_gas.da={3} block_fee_per_gas.l1={4} block_fee_per_gas.l2={5} inclusion_fee={6} computed={7} actual={8}",

diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/gas.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/gas.nr
@@ -31,7 +31,7 @@ impl Gas {
         )
     }
 
-    pub fn reduce(self, fees: GasFees) -> Field {
+    pub fn compute_fee(self, fees: GasFees) -> Field {
         (self.da_gas as Field) * fees.fee_per_da_gas
             + (self.l1_gas as Field) * fees.fee_per_l1_gas
             + (self.l2_gas as Field) * fees.fee_per_l2_gas

diff --git a/yarn-project/circuits.js/src/structs/gas.ts b/yarn-project/circuits.js/src/structs/gas.ts
@@ -68,7 +68,7 @@ export class Gas {
     return new Gas(Math.ceil(this.daGas * scalar), Math.ceil(this.l1Gas * scalar), Math.ceil(this.l2Gas * scalar));
   }
 
-  reduce(gasFees: GasFees) {
+  computeFee(gasFees: GasFees) {
     return GasDimensions.reduce(
       (acc, dimension) => acc.add(gasFees.get(dimension).mul(new Fr(this.get(dimension)))),
       Fr.ZERO,

diff --git a/yarn-project/simulator/src/public/teardown_phase_manager.ts b/yarn-project/simulator/src/public/teardown_phase_manager.ts
@@ -73,7 +73,7 @@ export class TeardownPhaseManager extends AbstractPhaseManager {
     const gasFees = this.globalVariables.gasFees;
     // No need to add teardown limits since they are already included in end.gasUsed
     const gasUsed = previousPublicKernelOutput.end.gasUsed.add(previousPublicKernelOutput.endNonRevertibleData.gasUsed);
-    const txFee = gasSettings.inclusionFee.add(gasUsed.reduce(gasFees));
+    const txFee = gasSettings.inclusionFee.add(gasUsed.computeFee(gasFees));
     this.log.debug(`Computed tx fee`, { txFee, gasUsed: inspect(gasUsed), gasFees: inspect(gasFees) });
     return txFee;
   }