From cfc3fe1b4e9d9d2ea5dce261a561cdc875f533a0 Mon Sep 17 00:00:00 2001 From: Zeke Foppa Date: Tue, 5 May 2026 10:28:13 -0700 Subject: [PATCH] [bfops/cargo-test-all]: fix --- .../src/module_bindings/mod.rs | 2 +- .../read_my_schema_procedure.rs | 17 +++++--- .../procedure-client/src/test_handlers.rs | 41 ++++++++++--------- 3 files changed, 34 insertions(+), 26 deletions(-) diff --git a/sdks/rust/tests/procedure-client/src/module_bindings/mod.rs b/sdks/rust/tests/procedure-client/src/module_bindings/mod.rs index 18eef1b12..d4a5a2da0 100644 --- a/sdks/rust/tests/procedure-client/src/module_bindings/mod.rs +++ b/sdks/rust/tests/procedure-client/src/module_bindings/mod.rs @@ -1,7 +1,7 @@ // THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE // WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. -// This was generated using spacetimedb cli version 2.0.5 (commit ca7484e072f9514fb2f890f26600a5d096f59431). +// This was generated using spacetimedb cli version 2.2.0 (commit bb7a75c2c48d0c4e7939852838c7a3da9de96300). #![allow(unused, clippy::all)] use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; diff --git a/sdks/rust/tests/procedure-client/src/module_bindings/read_my_schema_procedure.rs b/sdks/rust/tests/procedure-client/src/module_bindings/read_my_schema_procedure.rs index eaab6c762..d5b638734 100644 --- a/sdks/rust/tests/procedure-client/src/module_bindings/read_my_schema_procedure.rs +++ b/sdks/rust/tests/procedure-client/src/module_bindings/read_my_schema_procedure.rs @@ -6,7 +6,9 @@ use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; #[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] #[sats(crate = __lib)] -struct ReadMySchemaArgs {} +struct ReadMySchemaArgs { + pub server_url: String, +} impl __sdk::InModule for ReadMySchemaArgs { type Module = super::RemoteModule; @@ -17,12 +19,13 @@ impl __sdk::InModule for ReadMySchemaArgs { /// /// Implemented for [`super::RemoteProcedures`]. pub trait read_my_schema { - fn read_my_schema(&self) { - self.read_my_schema_then(|_, _| {}); + fn read_my_schema(&self, server_url: String) { + self.read_my_schema_then(server_url, |_, _| {}); } fn read_my_schema_then( &self, + server_url: String, __callback: impl FnOnce(&super::ProcedureEventContext, Result) + Send + 'static, ); @@ -31,10 +34,14 @@ pub trait read_my_schema { impl read_my_schema for super::RemoteProcedures { fn read_my_schema_then( &self, + server_url: String, __callback: impl FnOnce(&super::ProcedureEventContext, Result) + Send + 'static, ) { - self.imp - .invoke_procedure_with_callback::<_, String>("read_my_schema", ReadMySchemaArgs {}, __callback); + self.imp.invoke_procedure_with_callback::<_, String>( + "read_my_schema", + ReadMySchemaArgs { server_url }, + __callback, + ); } } diff --git a/sdks/rust/tests/procedure-client/src/test_handlers.rs b/sdks/rust/tests/procedure-client/src/test_handlers.rs index d3f75c069..3820b9c07 100644 --- a/sdks/rust/tests/procedure-client/src/test_handlers.rs +++ b/sdks/rust/tests/procedure-client/src/test_handlers.rs @@ -257,26 +257,27 @@ async fn exec_procedure_http_ok(db_name: &str) { let test_counter = test_counter.clone(); move |ctx| { let result = test_counter.add_test("invoke_http"); - ctx.procedures.read_my_schema_then(move |_ctx, res| { - result( - // It's a try block! - #[allow(clippy::redundant_closure_call)] - (|| { - anyhow::ensure!(res.is_ok(), "Expected Ok result but got {res:?}"); - let module_def: RawModuleDefV9 = spacetimedb_lib::de::serde::deserialize_from( - &mut serde_json::Deserializer::from_str(&res.unwrap()), - )?; - anyhow::ensure!(module_def.misc_exports.iter().any(|misc_export| { - if let RawMiscModuleExportV9::Procedure(procedure_def) = misc_export { - &*procedure_def.name == "read_my_schema" - } else { - false - } - })); - Ok(()) - })(), - ) - }) + ctx.procedures + .read_my_schema_then(LOCALHOST.to_owned(), move |_ctx, res| { + result( + // It's a try block! + #[allow(clippy::redundant_closure_call)] + (|| { + anyhow::ensure!(res.is_ok(), "Expected Ok result but got {res:?}"); + let module_def: RawModuleDefV9 = spacetimedb_lib::de::serde::deserialize_from( + &mut serde_json::Deserializer::from_str(&res.unwrap()), + )?; + anyhow::ensure!(module_def.misc_exports.iter().any(|misc_export| { + if let RawMiscModuleExportV9::Procedure(procedure_def) = misc_export { + &*procedure_def.name == "read_my_schema" + } else { + false + } + })); + Ok(()) + })(), + ) + }) } }) .await;