From 9dabf733dd19e6c5e218e1080337bff8c5586e46 Mon Sep 17 00:00:00 2001 From: Federica Date: Thu, 31 Aug 2023 10:52:57 -0300 Subject: [PATCH 1/5] Fix increment_syscall_counter --- src/state/mod.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/state/mod.rs b/src/state/mod.rs index 3920165a8..4dca6a0d3 100644 --- a/src/state/mod.rs +++ b/src/state/mod.rs @@ -89,10 +89,9 @@ impl ExecutionResourcesManager { } } - pub fn increment_syscall_counter(&mut self, syscall_name: &str, amount: u64) -> Option<()> { - self.syscall_counter - .get_mut(syscall_name) - .map(|val| *val += amount) + pub fn increment_syscall_counter(&mut self, syscall_name: &str, amount: u64) { + *self.syscall_counter + .entry(syscall_name.to_string()).or_default() += amount } pub fn get_syscall_counter(&self, syscall_name: &str) -> Option { @@ -295,8 +294,7 @@ mod test { ); execution_resources_manager - .increment_syscall_counter("syscall1", 1) - .unwrap(); + .increment_syscall_counter("syscall1", 1); assert_eq!( execution_resources_manager.get_syscall_counter("syscall1"), From 8e8b33eb560fc07b8df2288e588dc2b690faa2eb Mon Sep 17 00:00:00 2001 From: Federica Date: Thu, 31 Aug 2023 11:08:15 -0300 Subject: [PATCH 2/5] Add test + fix test --- src/lib.rs | 2 +- src/state/mod.rs | 13 +++++++++++++ src/transaction/l1_handler.rs | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 1b9a441e6..b8773231d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -392,7 +392,7 @@ mod test { block_context.starknet_os_config.gas_price = 1; let estimated_fee = estimate_message_fee(&l1_handler, state, &block_context).unwrap(); - assert_eq!(estimated_fee, (19708, 19695)); + assert_eq!(estimated_fee, (19709, 19695)); } #[test] diff --git a/src/state/mod.rs b/src/state/mod.rs index 4dca6a0d3..1f0601e21 100644 --- a/src/state/mod.rs +++ b/src/state/mod.rs @@ -306,6 +306,19 @@ mod test { ); } + #[test] + fn execution_resources_manager_should_add_syscall_if_not_present() { + let mut execution_resources_manager = super::ExecutionResourcesManager::default(); + + execution_resources_manager + .increment_syscall_counter("syscall1", 1); + + assert_eq!( + execution_resources_manager.get_syscall_counter("syscall1"), + Some(1) + ); + } + #[test] fn state_diff_to_cached_state_should_return_correct_cached_state() { let mut state_reader = InMemoryStateReader::default(); diff --git a/src/transaction/l1_handler.rs b/src/transaction/l1_handler.rs index 4f84c910d..4f051651e 100644 --- a/src/transaction/l1_handler.rs +++ b/src/transaction/l1_handler.rs @@ -336,7 +336,7 @@ mod test { fee_transfer_info: None, actual_fee: 0, actual_resources: HashMap::from([ - ("n_steps".to_string(), 1229), + ("n_steps".to_string(), 1319), ("pedersen_builtin".to_string(), 13), ("range_check_builtin".to_string(), 23), ("l1_gas_usage".to_string(), 19695), From 39de45ffba974a92ea8bcc43c57a7d8302948a5b Mon Sep 17 00:00:00 2001 From: Federica Date: Thu, 31 Aug 2023 11:13:59 -0300 Subject: [PATCH 3/5] Fix test --- tests/deploy_account.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/deploy_account.rs b/tests/deploy_account.rs index 6da3256af..70af6ea6d 100644 --- a/tests/deploy_account.rs +++ b/tests/deploy_account.rs @@ -171,11 +171,11 @@ fn internal_deploy_account_cairo1() { let n_steps; #[cfg(not(feature = "cairo_1_tests"))] { - n_steps = 3873; + n_steps = 3948; } #[cfg(feature = "cairo_1_tests")] { - n_steps = 3877; + n_steps = 3952; } assert_eq!( From 1b355714bb241bd45c73f3fc511e891b0300cb50 Mon Sep 17 00:00:00 2001 From: Federica Date: Thu, 31 Aug 2023 11:23:29 -0300 Subject: [PATCH 4/5] Fix tests --- src/state/mod.rs | 6 ++---- tests/internals.rs | 10 +++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/state/mod.rs b/src/state/mod.rs index 1f0601e21..9bf0c8adb 100644 --- a/src/state/mod.rs +++ b/src/state/mod.rs @@ -293,8 +293,7 @@ mod test { Default::default(), ); - execution_resources_manager - .increment_syscall_counter("syscall1", 1); + execution_resources_manager.increment_syscall_counter("syscall1", 1); assert_eq!( execution_resources_manager.get_syscall_counter("syscall1"), @@ -310,8 +309,7 @@ mod test { fn execution_resources_manager_should_add_syscall_if_not_present() { let mut execution_resources_manager = super::ExecutionResourcesManager::default(); - execution_resources_manager - .increment_syscall_counter("syscall1", 1); + execution_resources_manager.increment_syscall_counter("syscall1", 1); assert_eq!( execution_resources_manager.get_syscall_counter("syscall1"), diff --git a/tests/internals.rs b/tests/internals.rs index 94f845e36..be4f6d163 100644 --- a/tests/internals.rs +++ b/tests/internals.rs @@ -1224,10 +1224,10 @@ fn expected_fib_validate_call_info_2() -> CallInfo { fn expected_transaction_execution_info(block_context: &BlockContext) -> TransactionExecutionInfo { let resources = HashMap::from([ - ("n_steps".to_string(), 3445), + ("n_steps".to_string(), 4135), ("pedersen_builtin".to_string(), 16), ("l1_gas_usage".to_string(), 2448), - ("range_check_builtin".to_string(), 82), + ("range_check_builtin".to_string(), 101), ]); let fee = calculate_tx_fee(&resources, *GAS_PRICE, block_context).unwrap(); TransactionExecutionInfo::new( @@ -1247,17 +1247,17 @@ fn expected_fib_transaction_execution_info( let n_steps; #[cfg(not(feature = "cairo_1_tests"))] { - n_steps = 3541; + n_steps = 4231; } #[cfg(feature = "cairo_1_tests")] { - n_steps = 3544; + n_steps = 4234; } let resources = HashMap::from([ ("n_steps".to_string(), n_steps), ("l1_gas_usage".to_string(), 7344), ("pedersen_builtin".to_string(), 16), - ("range_check_builtin".to_string(), 85), + ("range_check_builtin".to_string(), 104), ]); let fee = calculate_tx_fee(&resources, *GAS_PRICE, block_context).unwrap(); TransactionExecutionInfo::new( From 9c7b18842df1722cb4e20ee8ef526b36a0f6f1e3 Mon Sep 17 00:00:00 2001 From: Federica Date: Thu, 31 Aug 2023 11:29:15 -0300 Subject: [PATCH 5/5] fmt --- src/state/mod.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/state/mod.rs b/src/state/mod.rs index 9bf0c8adb..adec31448 100644 --- a/src/state/mod.rs +++ b/src/state/mod.rs @@ -90,8 +90,10 @@ impl ExecutionResourcesManager { } pub fn increment_syscall_counter(&mut self, syscall_name: &str, amount: u64) { - *self.syscall_counter - .entry(syscall_name.to_string()).or_default() += amount + *self + .syscall_counter + .entry(syscall_name.to_string()) + .or_default() += amount } pub fn get_syscall_counter(&self, syscall_name: &str) -> Option {