mempool_test_utils: remove test_resource_bounds_mapping

Author: ArniStarkware

crates/apollo_integration_tests/tests/test_custom_cairo1_txs.rs

@@ -5,7 +5,6 @@ use blockifier_test_utils::cairo_versions::{CairoVersion, RunnableCairo1};
 use blockifier_test_utils::calldata::create_calldata;
 use blockifier_test_utils::contracts::FeatureContract;
 use mempool_test_utils::starknet_api_test_utils::{
-    test_resource_bounds_mapping,
     AccountTransactionGenerator,
     MultiAccountTransactionGenerator,
 };
@@ -14,6 +13,7 @@ use starknet_api::abi::abi_utils::selector_from_name;
 use starknet_api::core::{calculate_contract_address, CompiledClassHash};
 use starknet_api::rpc_transaction::RpcTransaction;
 use starknet_api::test_utils::invoke::rpc_invoke_tx;
+use starknet_api::test_utils::resource_bounds_for_testing;
 use starknet_api::transaction::fields::{ContractAddressSalt, Tip};
 use starknet_api::transaction::TransactionVersion;
 use starknet_api::{calldata, felt};
@@ -230,7 +230,7 @@ fn generate_test_get_execution_info_without_block_info_invoke_tx(
     let fn_name = "test_get_execution_info_without_block_info";
     let test_contract = FeatureContract::TestContract(CairoVersion::Cairo1(RunnableCairo1::Casm));
 
-    let resources_bounds_values = test_resource_bounds_mapping();
+    let resources_bounds_values = resource_bounds_for_testing();
     let calldata = vec![
         TransactionVersion::THREE.0,                    // version
         *account_tx_generator.sender_address().0.key(), // account address

crates/mempool_test_utils/src/starknet_api_test_utils.rs

@@ -11,10 +11,8 @@ use blockifier_test_utils::contracts::FeatureContract;
 use papyrus_base_layer::ethereum_base_layer_contract::L1ToL2MessageArgs;
 use papyrus_base_layer::test_utils::DEFAULT_ANVIL_L1_ACCOUNT_ADDRESS;
 use starknet_api::abi::abi_utils::selector_from_name;
-use starknet_api::block::GasPrice;
 use starknet_api::core::{ClassHash, CompiledClassHash, ContractAddress, Nonce};
 use starknet_api::executable_transaction::{AccountTransaction, DeclareTransaction};
-use starknet_api::execution_resources::GasAmount;
 use starknet_api::hash::StarkHash;
 use starknet_api::rpc_transaction::RpcTransaction;
 use starknet_api::state::SierraContractClass;
@@ -26,22 +24,17 @@ use starknet_api::test_utils::invoke::{
     InvokeTxArgs,
 };
 use starknet_api::test_utils::{
+    resource_bounds_for_testing,
     NonceManager,
     TEST_ERC20_CONTRACT_ADDRESS2,
-    VALID_L1_DATA_GAS_MAX_AMOUNT,
-    VALID_L1_DATA_GAS_MAX_PRICE_PER_UNIT,
-    VALID_L1_GAS_MAX_AMOUNT,
-    VALID_L1_GAS_MAX_PRICE_PER_UNIT,
     VALID_L2_GAS_MAX_AMOUNT,
     VALID_L2_GAS_MAX_PRICE_PER_UNIT,
 };
 use starknet_api::transaction::constants::TRANSFER_ENTRY_POINT_NAME;
 use starknet_api::transaction::fields::{
-    AllResourceBounds,
     Calldata,
     ContractAddressSalt,
     Fee,
-    ResourceBounds,
     Tip,
     TransactionSignature,
     ValidResourceBounds,
@@ -66,26 +59,8 @@ pub const TIP_FOR_TESTING: Tip = Tip(1);
 
 // Utils.
 
-// TODO(Noam): Merge this into test_valid_resource_bounds
-pub fn test_resource_bounds_mapping() -> AllResourceBounds {
-    AllResourceBounds {
-        l1_gas: ResourceBounds {
-            max_amount: GasAmount(VALID_L1_GAS_MAX_AMOUNT),
-            max_price_per_unit: GasPrice(VALID_L1_GAS_MAX_PRICE_PER_UNIT),
-        },
-        l2_gas: ResourceBounds {
-            max_amount: GasAmount(VALID_L2_GAS_MAX_AMOUNT),
-            max_price_per_unit: GasPrice(VALID_L2_GAS_MAX_PRICE_PER_UNIT),
-        },
-        l1_data_gas: ResourceBounds {
-            max_amount: GasAmount(VALID_L1_DATA_GAS_MAX_AMOUNT),
-            max_price_per_unit: GasPrice(VALID_L1_DATA_GAS_MAX_PRICE_PER_UNIT),
-        },
-    }
-}
-
 pub fn test_valid_resource_bounds() -> ValidResourceBounds {
-    ValidResourceBounds::AllResources(test_resource_bounds_mapping())
+    ValidResourceBounds::AllResources(resource_bounds_for_testing())
 }
 
 /// Get the contract class used for testing.