From 8d2a870db5243d7bca7845024071d6fa0e13e43b Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Fri, 14 Jul 2023 15:01:00 +0300 Subject: [PATCH] scenario step default gas limit 5,000,000 --- .../adder/interact/src/adder_interact.rs | 2 -- .../adder_mandos_constructed_raw_test.rs | 1 - ...dder_mandos_constructed_with_calls_test.rs | 1 - .../crowdfunding_esdt_mandos_rust_test.rs | 1 - .../multisig/tests/multisig_rust_test_v2.rs | 5 ----- .../tests/rust_mandos_v2_test.rs | 1 - .../src/scenario/model/step/step_sc_deploy.rs | 19 +------------------ .../src/scenario/model/transaction/tx_call.rs | 19 ++++++++++++++++++- .../scenario/model/transaction/tx_deploy.rs | 18 ++++++++++++++++-- 9 files changed, 35 insertions(+), 32 deletions(-) diff --git a/contracts/examples/adder/interact/src/adder_interact.rs b/contracts/examples/adder/interact/src/adder_interact.rs index f7a4830df4..d77824133c 100644 --- a/contracts/examples/adder/interact/src/adder_interact.rs +++ b/contracts/examples/adder/interact/src/adder_interact.rs @@ -104,7 +104,6 @@ impl AdderInteract { .call(self.state.default_adder().init(BigUint::from(0u64))) .from(&self.wallet_address) .code(&self.adder_code) - .gas_limit("5,000,000") .expect(TxExpect::ok()), |new_address, tr| { tr.result @@ -178,7 +177,6 @@ impl AdderInteract { ScCallStep::new() .call(self.state.adder().add(value)) .from(&self.wallet_address) - .gas_limit("5,000,000") .expect(TxExpect::ok()), |tr| { tr.result.unwrap_or_else(|err| { diff --git a/contracts/examples/adder/tests/adder_mandos_constructed_raw_test.rs b/contracts/examples/adder/tests/adder_mandos_constructed_raw_test.rs index 760de37788..169a8fd0ae 100644 --- a/contracts/examples/adder/tests/adder_mandos_constructed_raw_test.rs +++ b/contracts/examples/adder/tests/adder_mandos_constructed_raw_test.rs @@ -26,7 +26,6 @@ fn adder_mandos_constructed_raw() { .from("address:owner") .code(adder_code) .argument("5") - .gas_limit("5,000,000") .expect(TxExpect::ok().no_result()), ) .sc_query_step( diff --git a/contracts/examples/adder/tests/adder_mandos_constructed_with_calls_test.rs b/contracts/examples/adder/tests/adder_mandos_constructed_with_calls_test.rs index 38b5453af8..d214aeb994 100644 --- a/contracts/examples/adder/tests/adder_mandos_constructed_with_calls_test.rs +++ b/contracts/examples/adder/tests/adder_mandos_constructed_with_calls_test.rs @@ -31,7 +31,6 @@ fn adder_scenario_constructed_raw() { .from(owner_address) .code(adder_code) .call(adder_contract.init(5u32)) - .gas_limit("5,000,000") .expect(TxExpect::ok().no_result()), |new_address, _: TypedResponse<()>| { assert_eq!(new_address, adder_contract.to_address()); diff --git a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_mandos_rust_test.rs b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_mandos_rust_test.rs index 0017c792af..6c800a8159 100644 --- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_mandos_rust_test.rs +++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_mandos_rust_test.rs @@ -42,7 +42,6 @@ fn crowdfunding_scenario_rust_test() { deadline, EgldOrEsdtTokenIdentifier::esdt(cf_token_id_value), )) - .gas_limit("5,000,000") .expect(TxExpect::ok().no_result()), ); diff --git a/contracts/examples/multisig/tests/multisig_rust_test_v2.rs b/contracts/examples/multisig/tests/multisig_rust_test_v2.rs index 6deeb1e2db..ae0bc3b93a 100644 --- a/contracts/examples/multisig/tests/multisig_rust_test_v2.rs +++ b/contracts/examples/multisig/tests/multisig_rust_test_v2.rs @@ -139,7 +139,6 @@ impl MultisigTestState { .from(self.owner.clone()) .code(self.world.code_expression(MULTISIG_PATH_EXPR)) .call(self.multisig.init(2u32, board)) - .gas_limit("5,000,000") .expect(TxExpect::ok().no_result()), ); @@ -158,7 +157,6 @@ impl MultisigTestState { .from(self.owner.clone()) .code(self.world.code_expression(ADDER_PATH_EXPR)) .call(self.adder.init(0u64)) - .gas_limit("5,000,000") .expect(TxExpect::ok().no_result()), ); @@ -185,7 +183,6 @@ impl MultisigTestState { ScCallStep::new() .from(caller) .call(self.multisig.perform_action_endpoint(action_id)) - .gas_limit("5,000,000") .expect(TxExpect::ok()), ); output.into_option() @@ -224,7 +221,6 @@ impl MultisigTestState { CodeMetadata::DEFAULT, adder_init_args, )) - .gas_limit("5,000,000") .expect(TxExpect::ok()), ) } @@ -245,7 +241,6 @@ impl MultisigTestState { adder_call.endpoint_name, adder_call.arg_buffer.into_multi_value_encoded(), )) - .gas_limit("5,000,000") .expect(TxExpect::ok()), ) } diff --git a/contracts/feature-tests/rust-testing-framework-tester/tests/rust_mandos_v2_test.rs b/contracts/feature-tests/rust-testing-framework-tester/tests/rust_mandos_v2_test.rs index 26cb4e9590..34ad0b0861 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/tests/rust_mandos_v2_test.rs +++ b/contracts/feature-tests/rust-testing-framework-tester/tests/rust_mandos_v2_test.rs @@ -36,7 +36,6 @@ fn tester_deploy_test() { .from(owner_address) .code(code) .call(adder_contract.init()) - .gas_limit("5,000,000") .expect(TxExpect::ok()), |address, tr: TypedResponse| { assert_eq!(address, adder_contract.to_address()); diff --git a/framework/scenario/src/scenario/model/step/step_sc_deploy.rs b/framework/scenario/src/scenario/model/step/step_sc_deploy.rs index bf5d12af1c..f4144b9005 100644 --- a/framework/scenario/src/scenario/model/step/step_sc_deploy.rs +++ b/framework/scenario/src/scenario/model/step/step_sc_deploy.rs @@ -14,7 +14,7 @@ use crate::multiversx_sc::types::{CodeMetadata, ContractDeploy}; use super::{convert_call_args, TypedScDeploy}; -#[derive(Debug, Clone)] +#[derive(Debug, Default, Clone)] pub struct ScDeployStep { pub id: String, pub tx_id: Option, @@ -25,23 +25,6 @@ pub struct ScDeployStep { pub response: Option, } -impl Default for ScDeployStep { - fn default() -> Self { - Self { - id: Default::default(), - tx_id: Default::default(), - explicit_tx_hash: Default::default(), - comment: Default::default(), - tx: Box::new(TxDeploy { - code_metadata: CodeMetadata::all(), - ..Default::default() - }), - expect: Default::default(), - response: Default::default(), - } - } -} - impl ScDeployStep { pub fn new() -> Self { Self::default() diff --git a/framework/scenario/src/scenario/model/transaction/tx_call.rs b/framework/scenario/src/scenario/model/transaction/tx_call.rs index fa2aa09c1a..7e91110860 100644 --- a/framework/scenario/src/scenario/model/transaction/tx_call.rs +++ b/framework/scenario/src/scenario/model/transaction/tx_call.rs @@ -10,7 +10,9 @@ use crate::{ use super::{tx_interpret_util::interpret_egld_value, TxESDT}; -#[derive(Debug, Default, Clone)] +pub const DEFAULT_GAS_EXPR: &str = "5,000,000"; + +#[derive(Debug, Clone)] pub struct TxCall { pub from: AddressValue, pub to: AddressValue, @@ -22,6 +24,21 @@ pub struct TxCall { pub gas_price: U64Value, } +impl Default for TxCall { + fn default() -> Self { + Self { + from: Default::default(), + to: Default::default(), + egld_value: Default::default(), + esdt_value: Default::default(), + function: Default::default(), + arguments: Default::default(), + gas_limit: U64Value::from(DEFAULT_GAS_EXPR), + gas_price: Default::default(), + } + } +} + impl InterpretableFrom for TxCall { fn interpret_from(from: TxCallRaw, context: &InterpreterContext) -> Self { TxCall { diff --git a/framework/scenario/src/scenario/model/transaction/tx_deploy.rs b/framework/scenario/src/scenario/model/transaction/tx_deploy.rs index 50c700f710..02396e99d1 100644 --- a/framework/scenario/src/scenario/model/transaction/tx_deploy.rs +++ b/framework/scenario/src/scenario/model/transaction/tx_deploy.rs @@ -7,9 +7,9 @@ use crate::{ }, }; -use super::tx_interpret_util::interpret_egld_value; +use super::{tx_interpret_util::interpret_egld_value, DEFAULT_GAS_EXPR}; -#[derive(Debug, Default, Clone)] +#[derive(Debug, Clone)] pub struct TxDeploy { pub from: AddressValue, pub egld_value: BigUintValue, @@ -20,6 +20,20 @@ pub struct TxDeploy { pub gas_price: U64Value, } +impl Default for TxDeploy { + fn default() -> Self { + Self { + from: Default::default(), + egld_value: Default::default(), + code_metadata: CodeMetadata::all(), + contract_code: Default::default(), + arguments: Default::default(), + gas_limit: U64Value::from(DEFAULT_GAS_EXPR), + gas_price: Default::default(), + } + } +} + impl InterpretableFrom for TxDeploy { fn interpret_from(from: TxDeployRaw, context: &InterpreterContext) -> Self { TxDeploy {