Addressing review comments

anoma · Nov 11, 2024 · 3b6ce2c · 3b6ce2c
1 parent a3a325b
commit 3b6ce2c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/crates/gas/src/lib.rs b/crates/gas/src/lib.rs
@@ -220,7 +220,6 @@ pub type Result<T> = std::result::Result<T, Error>;
 // This type should not implement the Copy trait to prevent charging gas more
 // than once
 #[derive(
-    Copy,
     Clone,
     Debug,
     Default,
@@ -435,7 +434,7 @@ impl GasMetering for TxGasMeter {
 
         if self.transaction_gas > self.tx_gas_limit {
             return Err(Error::TransactionGasExceededError(
-                self.tx_gas_limit.into(),
+                self.tx_gas_limit.clone().into(),
             ));
         }
 
@@ -445,15 +444,15 @@ impl GasMetering for TxGasMeter {
     /// Get the entire gas used by the transaction up until this point
     fn get_tx_consumed_gas(&self) -> Gas {
         if !self.gas_overflow {
-            self.transaction_gas
+            self.transaction_gas.clone()
         } else {
             hints::cold();
             u64::MAX.into()
         }
     }
 
     fn get_gas_limit(&self) -> Gas {
-        self.tx_gas_limit
+        self.tx_gas_limit.clone()
     }
 }
 
@@ -491,7 +490,7 @@ impl TxGasMeter {
     /// Get the amount of gas still available to the transaction
     pub fn get_available_gas(&self) -> Gas {
         self.tx_gas_limit
-            .checked_sub(self.transaction_gas)
+            .checked_sub(self.transaction_gas.clone())
             .unwrap_or_default()
     }
 }
@@ -512,12 +511,12 @@ impl GasMetering for VpGasMeter {
 
         let current_total = self
             .initial_gas
-            .checked_add(self.current_gas)
+            .checked_add(self.current_gas.clone())
             .ok_or(Error::GasOverflow)?;
 
         if current_total > self.tx_gas_limit {
             return Err(Error::TransactionGasExceededError(
-                self.tx_gas_limit.into(),
+                self.tx_gas_limit.clone().into(),
             ));
         }
 
@@ -527,15 +526,15 @@ impl GasMetering for VpGasMeter {
     /// Get the gas consumed by the tx alone before the vps were executed
     fn get_tx_consumed_gas(&self) -> Gas {
         if !self.gas_overflow {
-            self.initial_gas
+            self.initial_gas.clone()
         } else {
             hints::cold();
             u64::MAX.into()
         }
     }
 
     fn get_gas_limit(&self) -> Gas {
-        self.tx_gas_limit
+        self.tx_gas_limit.clone()
     }
 }
 
@@ -544,15 +543,15 @@ impl VpGasMeter {
     pub fn new_from_tx_meter(tx_gas_meter: &TxGasMeter) -> Self {
         Self {
             gas_overflow: false,
-            tx_gas_limit: tx_gas_meter.tx_gas_limit,
-            initial_gas: tx_gas_meter.transaction_gas,
+            tx_gas_limit: tx_gas_meter.tx_gas_limit.clone(),
+            initial_gas: tx_gas_meter.transaction_gas.clone(),
             current_gas: Gas::default(),
         }
     }
 
     /// Get the gas consumed by the VP alone
     pub fn get_vp_consumed_gas(&self) -> Gas {
-        self.current_gas
+        self.current_gas.clone()
     }
 }
 

diff --git a/crates/node/src/protocol.rs b/crates/node/src/protocol.rs
@@ -903,8 +903,8 @@ where
                         |_| {
                             Err(Error::FeeError(format!(
                                 "Masp fee payment unshielded an insufficient \
-                                 amount: Unshielded {balance} {}, required \
-                                 {fees}",
+                                 amount: Balance after unshielding: {balance} \
+                                 {}; required {fees}",
                                 wrapper.fee.token
                             )))
                         },
@@ -1352,7 +1352,7 @@ where
                     ))?;
                 gas_meter
                     .borrow()
-                    .check_vps_limit(vps_gas)
+                    .check_vps_limit(vps_gas.clone())
                     .map_err(|err| Error::GasError(err.to_string()))?;
 
                 Ok((result, vps_gas))
@@ -1384,7 +1384,7 @@ fn merge_vp_results(
         .checked_add(b_gas)
         .ok_or(Error::GasError(gas::Error::GasOverflow.to_string()))?;
     tx_gas_meter
-        .check_vps_limit(vps_gas)
+        .check_vps_limit(vps_gas.clone())
         .map_err(|err| Error::GasError(err.to_string()))?;
 
     Ok((

diff --git a/crates/tests/src/native_vp/pos.rs b/crates/tests/src/native_vp/pos.rs
@@ -882,7 +882,7 @@ pub mod testing {
             let current_epoch = tx_host_env::with(|env| {
                 // Reset the gas meter on each change, so that we never run
                 // out in this test
-                let gas_limit = env.gas_meter.borrow().tx_gas_limit;
+                let gas_limit = env.gas_meter.borrow().tx_gas_limit.clone();
                 env.gas_meter = RefCell::new(TxGasMeter::new(gas_limit));
                 env.state.in_mem().block.epoch
             });