Increases gas limits in unit tests

anoma · Mar 18, 2024 · e225cb5 · e225cb5
1 parent 571dba2
commit e225cb5
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 26 deletions.
diff --git a/crates/apps/src/lib/node/ledger/shell/finalize_block.rs b/crates/apps/src/lib/node/ledger/shell/finalize_block.rs
@@ -800,7 +800,8 @@ mod test_finalize_block {
         FinalizeBlock, ProcessedTx,
     };
 
-    const GAS_LIMIT_MULTIPLIER: u64 = 100_000_000;
+    const GAS_LIMIT: u64 = 10_000_000_000;
+    const WRAPPER_GAS_LIMIT: u64 = 20_000;
 
     /// Make a wrapper tx and a processed tx from the wrapped tx that can be
     /// added to `FinalizeBlock` request.
@@ -816,7 +817,7 @@ mod test_finalize_block {
                 },
                 keypair.ref_to(),
                 Epoch(0),
-                GAS_LIMIT_MULTIPLIER.into(),
+                WRAPPER_GAS_LIMIT.into(),
                 None,
             ))));
         wrapper_tx.header.chain_id = shell.chain_id.clone();
@@ -857,7 +858,7 @@ mod test_finalize_block {
                 },
                 keypair.ref_to(),
                 Epoch(0),
-                GAS_LIMIT_MULTIPLIER.into(),
+                WRAPPER_GAS_LIMIT.into(),
                 None,
             ))));
         outer_tx.header.chain_id = shell.chain_id.clone();
@@ -973,7 +974,7 @@ mod test_finalize_block {
                 },
                 keypair.ref_to(),
                 Epoch(0),
-                GAS_LIMIT_MULTIPLIER.into(),
+                WRAPPER_GAS_LIMIT.into(),
                 None,
             ))));
         outer_tx.header.chain_id = shell.chain_id.clone();
@@ -1027,7 +1028,7 @@ mod test_finalize_block {
             },
             keypair.ref_to(),
             Epoch(0),
-            GAS_LIMIT_MULTIPLIER.into(),
+            WRAPPER_GAS_LIMIT.into(),
             None,
         ))));
         let processed_tx = ProcessedTx {
@@ -2758,7 +2759,7 @@ mod test_finalize_block {
                 },
                 keypair.ref_to(),
                 Epoch(0),
-                GAS_LIMIT_MULTIPLIER.into(),
+                WRAPPER_GAS_LIMIT.into(),
                 None,
             ))));
         wrapper.header.chain_id = shell.chain_id.clone();
@@ -2775,7 +2776,7 @@ mod test_finalize_block {
             },
             keypair_2.ref_to(),
             Epoch(0),
-            GAS_LIMIT_MULTIPLIER.into(),
+            WRAPPER_GAS_LIMIT.into(),
             None,
         ))));
         new_wrapper.add_section(Section::Signature(Signature::new(
@@ -2816,8 +2817,8 @@ mod test_finalize_block {
             })
         }
 
-        shell.enqueue_tx(wrapper.clone(), GAS_LIMIT_MULTIPLIER.into());
-        shell.enqueue_tx(new_wrapper.clone(), GAS_LIMIT_MULTIPLIER.into());
+        shell.enqueue_tx(wrapper.clone(), GAS_LIMIT.into());
+        shell.enqueue_tx(new_wrapper.clone(), GAS_LIMIT.into());
         // merkle tree root before finalize_block
         let root_pre = shell.shell.state.in_mem().block.tree.root();
 
@@ -2884,7 +2885,7 @@ mod test_finalize_block {
                 },
                 keypair.ref_to(),
                 Epoch(0),
-                GAS_LIMIT_MULTIPLIER.into(),
+                WRAPPER_GAS_LIMIT.into(),
                 None,
             ))));
         unsigned_wrapper.header.chain_id = shell.chain_id.clone();
@@ -2965,16 +2966,10 @@ mod test_finalize_block {
         }
 
         shell.enqueue_tx(out_of_gas_wrapper.clone(), Gas::default());
-        shell.enqueue_tx(
-            undecryptable_wrapper.clone(),
-            GAS_LIMIT_MULTIPLIER.into(),
-        );
+        shell.enqueue_tx(undecryptable_wrapper.clone(), GAS_LIMIT.into());
         shell.enqueue_tx(unsigned_wrapper.clone(), u64::MAX.into()); // Prevent out of gas which would still make the test pass
-        shell.enqueue_tx(
-            wrong_commitment_wrapper.clone(),
-            GAS_LIMIT_MULTIPLIER.into(),
-        );
-        shell.enqueue_tx(failing_wrapper.clone(), GAS_LIMIT_MULTIPLIER.into());
+        shell.enqueue_tx(wrong_commitment_wrapper.clone(), GAS_LIMIT.into());
+        shell.enqueue_tx(failing_wrapper.clone(), GAS_LIMIT.into());
         // merkle tree root before finalize_block
         let root_pre = shell.shell.state.in_mem().block.tree.root();
 
@@ -3138,7 +3133,7 @@ mod test_finalize_block {
                 },
                 keypair.ref_to(),
                 Epoch(0),
-                GAS_LIMIT_MULTIPLIER.into(),
+                WRAPPER_GAS_LIMIT.into(),
                 None,
             ))));
         wrapper.header.chain_id = shell.chain_id.clone();

diff --git a/crates/namada/src/ledger/native_vp/ibc/mod.rs b/crates/namada/src/ledger/native_vp/ibc/mod.rs
@@ -411,7 +411,7 @@ mod tests {
 
     const ADDRESS: Address = Address::Internal(InternalAddress::Ibc);
     const COMMITMENT_PREFIX: &[u8] = b"ibc";
-    const TX_GAS_LIMIT: u64 = 1_000_000;
+    const TX_GAS_LIMIT: u64 = 10_000_000_000;
 
     fn get_client_id() -> ClientId {
         let id = format!("{}-0", MOCK_CLIENT_TYPE);

diff --git a/crates/namada/src/vm/wasm/run.rs b/crates/namada/src/vm/wasm/run.rs
@@ -834,7 +834,7 @@ mod tests {
     use crate::vm::host_env::TxRuntimeError;
     use crate::vm::wasm;
 
-    const TX_GAS_LIMIT: u64 = 10_000_000_000;
+    const TX_GAS_LIMIT: u64 = 10_000_000_000_000;
     const OUT_OF_GAS_LIMIT: u64 = 10_000;
 
     /// Test that we sanitize accesses to invalid addresses in wasm memory.

diff --git a/crates/tests/src/vm_host_env/ibc.rs b/crates/tests/src/vm_host_env/ibc.rs
@@ -147,7 +147,7 @@ pub fn validate_ibc_vp_from_tx<'a>(
         wasm::compilation_cache::common::testing::cache();
 
     let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
-        &TxGasMeter::new_from_sub_limit(1_000_000.into()),
+        &TxGasMeter::new_from_sub_limit(10_000_000_000.into()),
     ));
     let sentinel = RefCell::new(VpSentinel::default());
     let ctx = Ctx::new(
@@ -187,7 +187,7 @@ pub fn validate_multitoken_vp_from_tx<'a>(
         wasm::compilation_cache::common::testing::cache();
 
     let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
-        &TxGasMeter::new_from_sub_limit(1_000_000.into()),
+        &TxGasMeter::new_from_sub_limit(10_000_000_000.into()),
     ));
     let sentinel = RefCell::new(VpSentinel::default());
     let ctx = Ctx::new(

diff --git a/crates/tests/src/vm_host_env/tx.rs b/crates/tests/src/vm_host_env/tx.rs
@@ -72,7 +72,7 @@ impl Default for TestTxEnv {
             state,
             iterators: PrefixIterators::default(),
             gas_meter: RefCell::new(TxGasMeter::new_from_sub_limit(
-                100_000_000.into(),
+                100_000_000_000.into(),
             )),
             sentinel: RefCell::new(TxSentinel::default()),
             tx_index: TxIndex::default(),

diff --git a/crates/tests/src/vm_host_env/vp.rs b/crates/tests/src/vm_host_env/vp.rs
@@ -73,7 +73,7 @@ impl Default for TestVpEnv {
             state,
             iterators: PrefixIterators::default(),
             gas_meter: RefCell::new(VpGasMeter::new_from_tx_meter(
-                &TxGasMeter::new_from_sub_limit(10_000_000_000.into()),
+                &TxGasMeter::new_from_sub_limit(1_000_000_000_000.into()),
             )),
             sentinel: RefCell::new(VpSentinel::default()),
             tx,