From b0d4372d5eb4e67dfd9a256aac9f65d8e598ede5 Mon Sep 17 00:00:00 2001 From: Teng Zhang Date: Sun, 18 Aug 2024 14:52:17 -0700 Subject: [PATCH] fix --- .../src/execution.rs | 26 +++++++++---------- aptos-move/aptos-gas-meter/src/algebra.rs | 8 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/aptos-move/aptos-e2e-comparison-testing/src/execution.rs b/aptos-move/aptos-e2e-comparison-testing/src/execution.rs index c1ec89309fadae..e224156d41ae2b 100644 --- a/aptos-move/aptos-e2e-comparison-testing/src/execution.rs +++ b/aptos-move/aptos-e2e-comparison-testing/src/execution.rs @@ -15,7 +15,7 @@ use aptos_types::{ contract_event::ContractEvent, on_chain_config::{FeatureFlag, Features, OnChainConfig}, state_store::state_key::{inner::StateKeyInner, StateKey}, - transaction::{Transaction, Transaction::UserTransaction, TransactionStatus, Version}, + transaction::{Transaction, TransactionStatus, Version}, vm_status::VMStatus, write_set::{WriteSet, TOTAL_SUPPLY_STATE_KEY}, }; @@ -400,12 +400,12 @@ impl Execution { // We use executor only to get access to block executor and avoid some of // the initializations, but ignore its internal state, i.e., FakeDataStore. let executor = FakeExecutor::no_genesis(); - let mut txns = vec![txn.clone()]; - for txn in &mut txns { - if let UserTransaction(_signed_transaction) = txn { - // signed_transaction.set_max_gmount(min(100_000, signed_transaction.max_gas_amount() * 2)); - } - } + let txns = vec![txn.clone()]; + // for txn in &mut txns { + // if let UserTransaction(_signed_transaction) = txn { + // signed_transaction.set_max_gmount(min(100_000, signed_transaction.max_gas_amount() * 2)); + // } + // } if let Some(debugger) = debugger_opt { let data_view = DataStateView::new(debugger, version, state); executor @@ -419,12 +419,12 @@ impl Execution { .execute_transaction_block_with_state_view(txns, &state, false) .map(|mut res| { let res_i = res.pop().unwrap(); - println!( - "v2 flag:{} gas used:{}, status:{:?}", - v2_flag, - res_i.gas_used(), - res_i.status() - ); + // println!( + // "v2 flag:{} gas used:{}, status:{:?}", + // v2_flag, + // res_i.gas_used(), + // res_i.status() + // ); (res_i.clone().into(), res_i.status().clone()) }); res diff --git a/aptos-move/aptos-gas-meter/src/algebra.rs b/aptos-move/aptos-gas-meter/src/algebra.rs index 94969ed13ebffe..c40894cc19016e 100644 --- a/aptos-move/aptos-gas-meter/src/algebra.rs +++ b/aptos-move/aptos-gas-meter/src/algebra.rs @@ -177,10 +177,10 @@ impl GasAlgebra for StandardGasAlgebra { self.execution_gas_used += amount; } if self.feature_version >= 7 && self.execution_gas_used > self.max_execution_gas { - println!( - "self.execution_gas_used:{}, self.max_execution_gas:{}", - self.execution_gas_used, self.max_execution_gas - ); + // println!( + // "self.execution_gas_used:{}, self.max_execution_gas:{}", + // self.execution_gas_used, self.max_execution_gas + // ); Err(PartialVMError::new(StatusCode::EXECUTION_LIMIT_REACHED)) } else { Ok(())