chore: fix conflicts

Signed-off-by: Dori Medini <[email protected]>

Author: dorimedini-starkware

crates/apollo_mempool/src/mempool_test.rs

@@ -1307,7 +1307,7 @@ fn metrics_correctness() {
         pending_queue_size: 1,
         get_txs_size: 1,
         delayed_declares_size: 1,
-        total_size_in_bytes: 1696,
+        total_size_in_bytes: 1648,
         evictions_count: 1,
         transaction_time_spent_until_batched: HistogramValue {
             sum: 2.0,

crates/starknet_os_flow_tests/src/tests.rs

@@ -2940,10 +2940,12 @@ async fn test_initial_empty_block() {
         nonce_manager: NonceManager::default(),
         execution_contracts: OsExecutionContracts::default(),
     };
-    let test_manager = TestManager::new_with_initial_state_data(empty_initial_state_data);
+    let test_manager = TestManager::new_with_initial_state_data(
+        empty_initial_state_data,
+        TestManagerConfig::default(),
+    );
 
-    let test_output =
-        test_manager.execute_test_with_default_block_contexts(&TestParameters::default()).await;
+    let test_output = test_manager.execute_flow_test().await;
 
     test_output.perform_default_validations();
     test_output.assert_storage_diff_eq(