Fixes whitelisted gas for tests

anoma · Mar 28, 2023 · 07a5b63 · 07a5b63
1 parent 77ae72c
commit 07a5b63
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 29 deletions.
diff --git a/apps/src/lib/node/ledger/shell/process_proposal.rs b/apps/src/lib/node/ledger/shell/process_proposal.rs
@@ -244,27 +244,14 @@ where
                                     let tx_hash = Hash::sha256(tx.code)
                                         .to_string()
                                         .to_ascii_lowercase();
-                                    let tx_gas = match gas_table
-                                        .get(tx_hash.as_str())
-                                    {
-                                        Some(gas) => gas.to_owned(),
-                                        #[cfg(any(test, feature = "testing"))]
-                                        None => 1_000,
-                                        #[cfg(not(any(
-                                            test,
-                                            feature = "testing"
-                                        )))]
-                                        None => {
-                                            return TxResult {
-                                                // Tx is not whitelisted
-                                                code:
-                                                    ErrorCodes::DecryptedTxGasLimit
-                                                        .into(),
-                                                info: "Tx is not whitelisted"
-                                                    .to_string(),
-                                            };
-                                        }
-                                    };
+                                    let tx_gas =
+                                        match gas_table.get(tx_hash.as_str()) {
+                                            Some(gas) => gas.to_owned(),
+                                            #[cfg(test)]
+                                            None => 1_000,
+                                            #[cfg(not(test))]
+                                            None => 0, // VPs will rejected the non-whitelisted tx
+                                        };
                                     let inner_tx_gas_limit = temp_wl_storage
                                         .storage
                                         .tx_queue

diff --git a/shared/src/ledger/protocol/mod.rs b/shared/src/ledger/protocol/mod.rs
@@ -67,8 +67,6 @@ pub enum Error {
     ),
     #[error("Access to an internal address {0} is forbidden")]
     AccessForbidden(InternalAddress),
-    #[error("The gas cost for the tx/vp {0} was not found in storage")]
-    MissingGasCost(String),
 }
 
 /// Result of applying a transaction
@@ -168,10 +166,10 @@ where
     let tx_hash = Hash::sha256(&tx.code).to_string().to_ascii_lowercase();
     let tx_gas_required = match gas_table.get(tx_hash.as_str()) {
         Some(gas) => gas.to_owned(),
-        #[cfg(any(test, feature = "testing"))]
+        #[cfg(test)]
         None => 1_000,
-        #[cfg(not(any(test, feature = "testing")))]
-        None => return Err(Error::MissingGasCost(tx_hash)),
+        #[cfg(not(test))]
+        None => 0, // VPs will reject the non-whitelisted tx
     };
     tx_gas_meter.add(tx_gas_required).map_err(Error::GasError)?;
 
@@ -501,10 +499,10 @@ fn add_precomputed_gas(
 ) -> Result<()> {
     let vp_gas_required = match gas_table.get(vp) {
         Some(gas) => gas.to_owned(),
-        #[cfg(any(test, feature = "testing"))]
+        #[cfg(test)]
         None => 1_000,
-        #[cfg(not(any(test, feature = "testing")))]
-        None => return Err(Error::MissingGasCost(vp.to_owned())),
+        #[cfg(not(test))]
+        None => 0,
     };
 
     gas_meter.add(vp_gas_required).map_err(Error::GasError)