Merge branch 'main' into refactor/makefile

.env.test

@@ -73,7 +73,7 @@ L1_CORE_CONTRACT_ADDRESS="0xE2Bb56ee936fd6433DC0F6e7e3b8365C906AA057"
 
 ##### SNOS #####
 ## This is needed right now because Madara doesn't support getProof
-RPC_FOR_SNOS=""
+RPC_FOR_SNOS="http://localhost:9545"
 
 
 ##### STARKNET SETTLEMENT #####

CHANGELOG.md

@@ -44,6 +44,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 - refactor: update json made generic to update any json file
 - refactor: makefile updated as per bootstraper changes
+- removed error return in case of JobAlreadyExists in `create_job` function
 - update_job returns the updated job item
 - made create_job atomic to avoid race conditions
 - handle jobs in tokio tasks

crates/orchestrator/src/jobs/mod.rs

@@ -165,7 +165,8 @@ pub async fn create_job(
 
     // this is technically a redundant check, we've another check inside `create_job`
     if existing_job.is_some() {
-        return Err(JobError::JobAlreadyExists { internal_id, job_type });
+        tracing::warn!("{}", JobError::JobAlreadyExists { internal_id, job_type });
+        return Ok(());
     }
 
     let job_handler = factory::get_job_handler(&job_type).await;

crates/orchestrator/src/tests/jobs/mod.rs

@@ -98,9 +98,10 @@ async fn create_job_job_exists_in_db_works() {
     let database_client = services.config.database();
     database_client.create_job(job_item.clone()).await.unwrap();
 
-    assert!(
-        create_job(JobType::ProofCreation, "0".to_string(), HashMap::new(), services.config.clone()).await.is_err()
-    );
+    assert!(create_job(JobType::ProofCreation, "0".to_string(), HashMap::new(), services.config.clone()).await.is_ok());
+    // There should be only 1 job in the db
+    let jobs_in_db = database_client.get_jobs_by_statuses(vec![JobStatus::Created], None).await.unwrap();
+    assert_eq!(jobs_in_db.len(), 1);
 
     // Waiting for 5 secs for message to be passed into the queue
     sleep(Duration::from_secs(5)).await;