For now revert the changes to the test services to run once the integration tests

Author: slinkydeveloper

test-services/src/proxy.rs

@@ -46,7 +46,7 @@ pub(crate) trait Proxy {
     #[name = "call"]
     async fn call(req: Json<ProxyRequest>) -> HandlerResult<Json<Vec<u8>>>;
     #[name = "oneWayCall"]
-    async fn one_way_call(req: Json<ProxyRequest>) -> HandlerResult<String>;
+    async fn one_way_call(req: Json<ProxyRequest>) -> HandlerResult<()>;
     #[name = "manyCalls"]
     async fn many_calls(req: Json<Vec<ManyCallRequest>>) -> HandlerResult<()>;
 }
@@ -70,19 +70,16 @@ impl Proxy for ProxyImpl {
         &self,
         ctx: Context<'_>,
         Json(req): Json<ProxyRequest>,
-    ) -> HandlerResult<String> {
+    ) -> HandlerResult<()> {
         let request = ctx.request::<_, ()>(req.to_target(), req.message);
 
-        let invocation_id = if let Some(delay_millis) = req.delay_millis {
-            request
-                .send_after(Duration::from_millis(delay_millis))
-                .invocation_id()
-                .await?
+        if let Some(delay_millis) = req.delay_millis {
+            request.send_with_delay(Duration::from_millis(delay_millis));
         } else {
-            request.send().invocation_id().await?
-        };
+            request.send();
+        }
 
-        Ok(invocation_id)
+        Ok(())
     }
 
     async fn many_calls(
@@ -97,7 +94,7 @@ impl Proxy for ProxyImpl {
                 ctx.request::<_, Vec<u8>>(req.proxy_request.to_target(), req.proxy_request.message);
             if req.one_way_call {
                 if let Some(delay_millis) = req.proxy_request.delay_millis {
-                    restate_req.send_after(Duration::from_millis(delay_millis));
+                    restate_req.send_with_delay(Duration::from_millis(delay_millis));
                 } else {
                     restate_req.send();
                 }

test-services/src/test_utils_service.rs

@@ -62,8 +62,6 @@ pub(crate) trait TestUtilsService {
     async fn count_executed_side_effects(increments: u32) -> HandlerResult<u32>;
     #[name = "getEnvVariable"]
     async fn get_env_variable(env: String) -> HandlerResult<String>;
-    #[name = "cancelInvocation"]
-    async fn cancel_invocation(invocation_id: String) -> Result<(), TerminalError>;
     #[name = "interpretCommands"]
     async fn interpret_commands(req: Json<InterpretRequest>) -> HandlerResult<()>;
 }
@@ -157,15 +155,6 @@ impl TestUtilsService for TestUtilsServiceImpl {
         Ok(std::env::var(env).ok().unwrap_or_default())
     }
 
-    async fn cancel_invocation(
-        &self,
-        ctx: Context<'_>,
-        invocation_id: String,
-    ) -> Result<(), TerminalError> {
-        ctx.invocation_handle(invocation_id).cancel().await?;
-        Ok(())
-    }
-
     async fn interpret_commands(
         &self,
         context: Context<'_>,