resolve conflicts and fixes

Author: dafnamatsry

Cargo.lock

@@ -55,14 +55,10 @@ apollo_starknet_client.workspace = true
 apollo_state_sync_types = { workspace = true, features = ["testing"] }
 apollo_storage = { workspace = true, features = ["testing"] }
 apollo_test_utils.workspace = true
-<<<<<<< HEAD
 apollo_time = { workspace = true, features = ["testing", "tokio"] }
-||||||| 511a6f78a
-=======
 assert_matches.workspace = true
 blockifier = { workspace = true, features = ["testing"] }
 blockifier_test_utils = { workspace = true }
->>>>>>> origin/constaking
 cairo-lang-casm.workspace = true
 cairo-lang-utils.workspace = true
 cairo-vm.workspace = true

crates/apollo_consensus_orchestrator/Cargo.toml

@@ -54,12 +54,8 @@ const ERC20_CONTRACT_BASE: u32 = 8 * CLASS_HASH_BASE;
 const CAIRO_STEPS_TEST_CONTRACT_BASE: u32 = 9 * CLASS_HASH_BASE;
 const SIERRA_EXECUTION_INFO_V1_CONTRACT_BASE: u32 = 10 * CLASS_HASH_BASE;
 const META_TX_CONTRACT_BASE: u32 = 11 * CLASS_HASH_BASE;
-<<<<<<< HEAD
 const EMPTY_ACCOUNT_BASE: u32 = 12 * CLASS_HASH_BASE;
-||||||| 511a6f78a
-=======
 const MOCK_STAKING_CONTRACT_BASE: u32 = 12 * CLASS_HASH_BASE;
->>>>>>> origin/constaking
 
 // Contract names.
 const ACCOUNT_LONG_VALIDATE_NAME: &str = "account_with_long_validate";
@@ -123,17 +119,11 @@ impl FeatureContract {
                 CairoVersion::Cairo1(RunnableCairo1::Casm)
             }
             Self::SierraExecutionInfoV1Contract(runnable_version)
-<<<<<<< HEAD
-            | Self::MetaTx(runnable_version)
-            | Self::EmptyAccount(runnable_version) => CairoVersion::Cairo1(*runnable_version),
-||||||| 511a6f78a
-            | Self::MetaTx(runnable_version) => CairoVersion::Cairo1(*runnable_version),
-=======
             | Self::MetaTx(runnable_version)
+            | Self::EmptyAccount(runnable_version)
             | Self::MockStakingContract(runnable_version) => {
                 CairoVersion::Cairo1(*runnable_version)
             }
->>>>>>> origin/constaking
         }
     }
 
@@ -145,26 +135,13 @@ impl FeatureContract {
             | Self::FaultyAccount(v)
             | Self::TestContract(v)
             | Self::ERC20(v) => *v = version,
-<<<<<<< HEAD
-            Self::SierraExecutionInfoV1Contract(rv) | Self::MetaTx(rv) | Self::EmptyAccount(rv) => {
-                match version {
-                    CairoVersion::Cairo0 => panic!("{self:?} must be Cairo1"),
-                    CairoVersion::Cairo1(runnable) => *rv = runnable,
-                }
-            }
-||||||| 511a6f78a
-            Self::SierraExecutionInfoV1Contract(rv) | Self::MetaTx(rv) => match version {
-                CairoVersion::Cairo0 => panic!("{self:?} must be Cairo1"),
-                CairoVersion::Cairo1(runnable) => *rv = runnable,
-            },
-=======
             Self::SierraExecutionInfoV1Contract(rv)
             | Self::MetaTx(rv)
+            | Self::EmptyAccount(rv)
             | Self::MockStakingContract(rv) => match version {
                 CairoVersion::Cairo0 => panic!("{self:?} must be Cairo1"),
                 CairoVersion::Cairo1(runnable) => *rv = runnable,
             },
->>>>>>> origin/constaking
             Self::SecurityTests | Self::CairoStepsTestContract | Self::LegacyTestContract => {
                 panic!("{self:?} contract has no configurable version.")
             }
@@ -372,15 +349,9 @@ impl FeatureContract {
                     | FeatureContract::LegacyTestContract
                     | FeatureContract::CairoStepsTestContract
                     | FeatureContract::SierraExecutionInfoV1Contract(_)
-<<<<<<< HEAD
                     | FeatureContract::EmptyAccount(_)
-                    | FeatureContract::MetaTx(_) => None,
-||||||| 511a6f78a
-                    | FeatureContract::MetaTx(_) => None,
-=======
                     | FeatureContract::MetaTx(_)
                     | FeatureContract::MockStakingContract(_) => None,
->>>>>>> origin/constaking
                     FeatureContract::ERC20(_) => unreachable!(),
                 };
                 cairo0_compile(self.get_source_path(), extra_arg, false)
@@ -419,15 +390,10 @@ impl FeatureContract {
                 self.iter_versions(&versions)
             }
 
-<<<<<<< HEAD
-            Self::SierraExecutionInfoV1Contract(_) | Self::MetaTx(_) | Self::EmptyAccount(_) => {
-||||||| 511a6f78a
-            Self::SierraExecutionInfoV1Contract(_) | Self::MetaTx(_) => {
-=======
             Self::SierraExecutionInfoV1Contract(_)
             | Self::MetaTx(_)
+            | Self::EmptyAccount(_)
             | Self::MockStakingContract(_) => {
->>>>>>> origin/constaking
                 #[cfg(not(feature = "cairo_native"))]
                 {
                     vec![*self]