Merge pull request #2 from sausaging/test-async

fixes in ping endpoint

src/config.rs

@@ -68,7 +68,7 @@ pub async fn process_verification_queue(
     _sp1_hashmap: Arc<Mutex<HashMap<String, Sp1Proof>>>,
     _risc0_hashmap: Arc<Mutex<HashMap<String, Risc0Proof>>>,
     _miden_hashmap: Arc<Mutex<HashMap<String, MidenProof>>>,
-    current_port: Arc<Mutex<u16>>,
+    current_port: Arc<Mutex<u32>>,
 ) {
     loop {
         let mut queue = queue.lock().await;

src/models.rs

@@ -67,8 +67,8 @@ pub struct Proof {
 #[derive(Serialize)]
 pub struct Ping {
     pub success: bool,
-    pub instantiated_port: u16,
-    pub uninstantiated_port: u16,
+    pub rust_port: String,
+    pub uinit_port: String,
 }
 
 #[derive(Serialize, Debug)]

src/routes.rs

@@ -15,9 +15,9 @@ async fn hello() -> impl Responder {
 
 #[get("/ping")]
 async fn ping(
-    current_port: web::Data<Arc<Mutex<u16>>>,
+    current_port: web::Data<Arc<Mutex<u32>>>,
     instantiated_ports: web::Data<Arc<Mutex<Vec<u16>>>>,
-    uninstantiated_ports: web::Data<Arc<Mutex<Vec<u16>>>>,
+    uninstantiated_ports: web::Data<Arc<Mutex<Vec<u32>>>>,
 ) -> impl Responder {
     // will instantiate a new port here on every ping call and return the port number
     let mut instantiated_ports = instantiated_ports.lock().await;
@@ -28,8 +28,8 @@ async fn ping(
     *current_port = uninstantiated_port;
     HttpResponse::Ok().json(Ping {
         success: true,
-        instantiated_port,
-        uninstantiated_port: *current_port,
+        rust_port: instantiated_port.to_string(),
+        uinit_port: current_port.to_string(),
     })
 }
 

src/storage.rs

@@ -15,7 +15,7 @@ lazy_static! {
         Arc::new(Mutex::new(VecDeque::new()));
     pub static ref INSTANTIATED_PORTS: Arc<Mutex<Vec<u16>>> =
         Arc::new(Mutex::new(Vec::from(vec![8081, 8082, 8083, 8084, 8085])));
-    pub static ref UNINSTANTIATED_PORTS: Arc<Mutex<Vec<u16>>> =
+    pub static ref UNINSTANTIATED_PORTS: Arc<Mutex<Vec<u32>>> =
         Arc::new(Mutex::new(Vec::from(vec![8086, 8087, 8088, 8089, 8090])));
-    pub static ref CURRENT_PORT: Arc<Mutex<u16>> = Arc::new(Mutex::new(0));
+    pub static ref CURRENT_PORT: Arc<Mutex<u32>> = Arc::new(Mutex::new(0));
 }