Port smoketests to new api

Author: coolreader18

crates/bindings-macro/src/lib.rs

@@ -875,7 +875,6 @@ fn table_impl(mut args: TableArgs, mut item: MutItem<syn::DeriveInput>) -> syn::
     let field_names = fields.iter().map(|f| f.ident.unwrap()).collect::<Vec<_>>();
     let field_types = fields.iter().map(|f| f.ty).collect::<Vec<_>>();
 
-    let table_name = &sats_ty.name;
     let tabletype_impl = quote! {
         impl spacetimedb::Table for #tablehandle_ident<'_> {
             type Row = #row_type;

crates/bindings/src/lib.rs

@@ -198,17 +198,14 @@ macro_rules! __volatile_nonatomic_schedule_immediate_impl {
     ([$($cur:tt)*] [$next:tt $($rest:tt)*]) => {
         $crate::__volatile_nonatomic_schedule_immediate_impl!([$($cur)* $next] [$($rest)*])
     };
-    (@process_args $repeater:path, (_$(, $args:expr)* $(,)?)) => {
-        $crate::__volatile_nonatomic_schedule_immediate_impl!(@call $repeater, ($crate::ReducerContext::__dummy(), $($args),*))
-    };
     (@process_args $repeater:path, ($($args:expr),* $(,)?)) => {
         $crate::__volatile_nonatomic_schedule_immediate_impl!(@call $repeater, ($($args),*))
     };
     (@call $repeater:path, ($($args:expr),*)) => {
         if false {
-            let _ = $repeater($($args,)*);
+            let _ = $repeater(&$crate::ReducerContext::__dummy(), $($args,)*);
         } else {
-            $crate::rt::volatile_nonatomic_schedule_immediate::<_, _, $repeater, _>($repeater, ($($args,)*))
+            $crate::rt::volatile_nonatomic_schedule_immediate::<_, _, $repeater>($repeater, ($($args,)*))
         }
     };
 }

crates/bindings/src/rt.rs

@@ -36,9 +36,6 @@ pub fn invoke_reducer<'a, A: Args<'a>>(
 /// A trait for types representing the *execution logic* of a reducer.
 pub trait Reducer<'de, A: Args<'de>> {
     fn invoke(&self, ctx: &ReducerContext, args: A) -> ReducerResult;
-
-    type ArgsWithContext;
-    fn extract_args(args: Self::ArgsWithContext) -> A;
 }
 
 /// A trait for types that can *describe* a reducer.
@@ -192,13 +189,6 @@ macro_rules! impl_reducer {
                 let ($($T,)*) = args;
                 self(ctx, $($T),*).into_result()
             }
-
-            type ArgsWithContext = (ReducerContext, $($T,)*);
-            #[allow(non_snake_case, clippy::unused_unit)]
-            fn extract_args(args: Self::ArgsWithContext) -> ($($T,)*) {
-                let (_ctx, $($T,)*) = args;
-                ($($T,)*)
-            }
         }
 
     };
@@ -554,11 +544,10 @@ macro_rules! __make_register_reftype {
 
 #[cfg(feature = "unstable_abi")]
 #[doc(hidden)]
-pub fn volatile_nonatomic_schedule_immediate<'de, A: Args<'de>, R: Reducer<'de, A, T>, R2: ReducerInfo, T>(
+pub fn volatile_nonatomic_schedule_immediate<'de, A: Args<'de>, R: Reducer<'de, A>, R2: ReducerInfo>(
     _reducer: R,
-    args: R::ArgsWithContext,
+    args: A,
 ) {
-    let args = R::extract_args(args);
     let arg_bytes = bsatn::to_vec(&SerDeArgs(args)).unwrap();
 
     // Schedule the reducer.

crates/cli/src/subcommands/project/rust/lib._rs

@@ -1,33 +1,33 @@
-use spacetimedb::ReducerContext;
+use spacetimedb::{ReducerContext, Table};
 
-#[spacetimedb::table(name = people)]
+#[spacetimedb::table(name = person)]
 pub struct Person {
     name: String
 }
 
 #[spacetimedb::reducer(init)]
-pub fn init() {
+pub fn init(_ctx: &ReducerContext) {
     // Called when the module is initially published
 }
 
 #[spacetimedb::reducer(client_connected)]
-pub fn identity_connected(_ctx: ReducerContext) {
+pub fn identity_connected(_ctx: &ReducerContext) {
     // Called everytime a new client connects
 }
 
 #[spacetimedb::reducer(client_disconnected)]
-pub fn identity_disconnected(_ctx: ReducerContext) {
+pub fn identity_disconnected(_ctx: &ReducerContext) {
     // Called everytime a client disconnects
 }
 
 #[spacetimedb::reducer]
-pub fn add(name: String) {
-    Person::insert(Person { name });
+pub fn add(ctx: &ReducerContext, name: String) {
+    ctx.db.person().insert(Person { name });
 }
 
 #[spacetimedb::reducer]
-pub fn say_hello() {
-    for person in Person::iter() {
+pub fn say_hello(ctx: &ReducerContext) {
+    for person in ctx.db.person().iter() {
         log::info!("Hello, {}!", person.name);
     }
     log::info!("Hello, World!");

modules/rust-wasm-test/src/lib.rs

@@ -5,7 +5,6 @@ use spacetimedb::{duration, table, Address, Deserialize, Identity, ReducerContex
 
 #[spacetimedb::table(name = test_a, index(name = foo, btree(columns = [x])))]
 pub struct TestA {
-    #[index(btree)]
     pub x: u32,
     pub y: u32,
     pub z: String,

smoketests/tests/add_remove_index.py

@@ -4,40 +4,44 @@ class AddRemoveIndex(Smoketest):
     AUTOPUBLISH = False
 
     MODULE_CODE = """
+use spacetimedb::{ReducerContext, Table};
+
 #[spacetimedb::table(name = t1)]
 pub struct T1 { id: u64 }
 
 #[spacetimedb::table(name = t2)]
 pub struct T2 { id: u64 }
 
 #[spacetimedb::reducer(init)]
-pub fn init() {
+pub fn init(ctx: &ReducerContext) {
     for id in 0..1_000 {
-        T1::insert(T1 { id });
-        T2::insert(T2 { id });
+        ctx.db.t1().insert(T1 { id });
+        ctx.db.t2().insert(T2 { id });
     }
 }
 """
     MODULE_CODE_INDEXED = """
+use spacetimedb::{ReducerContext, Table};
+
 #[spacetimedb::table(name = t1)]
 pub struct T1 { #[index(btree)] id: u64 }
 
 #[spacetimedb::table(name = t2)]
 pub struct T2 { #[index(btree)] id: u64 }
 
 #[spacetimedb::reducer(init)]
-pub fn init() {
+pub fn init(ctx: &ReducerContext) {
     for id in 0..1_000 {
-        T1::insert(T1 { id });
-        T2::insert(T2 { id });
+        ctx.db.t1().insert(T1 { id });
+        ctx.db.t2().insert(T2 { id });
     }
 }
 
 #[spacetimedb::reducer]
-pub fn add() {
+pub fn add(ctx: &ReducerContext) {
     let id = 1_001;
-    T1::insert(T1 { id });
-    T2::insert(T2 { id });
+    ctx.db.t1().insert(T1 { id });
+    ctx.db.t2().insert(T2 { id });
 }
 """
 

smoketests/tests/add_table_pseudomigration.py

@@ -5,21 +5,21 @@
 
 class AddTablePseudomigration(Smoketest):
     MODULE_CODE = """
-use spacetimedb::println;
+use spacetimedb::{println, ReducerContext, Table};
 
 #[spacetimedb::table(name = person)]
 pub struct Person {
     name: String,
 }
 
 #[spacetimedb::reducer]
-pub fn add_person(name: String) {
-    Person::insert(Person { name });
+pub fn add_person(ctx: &ReducerContext, name: String) {
+    ctx.db.person().insert(Person { name });
 }
 
 #[spacetimedb::reducer]
-pub fn print_persons(prefix: String) {
-    for person in Person::iter() {
+pub fn print_persons(ctx: &ReducerContext, prefix: String) {
+    for person in ctx.db.person().iter() {
         println!("{}: {}", prefix, person.name);
     }
 }
@@ -34,13 +34,13 @@ class AddTablePseudomigration(Smoketest):
 }
  
 #[spacetimedb::reducer]
-pub fn add_book(isbn: String) {
-    Book::insert(Book { isbn });
+pub fn add_book(ctx: &ReducerContext, isbn: String) {
+    ctx.db.book().insert(Book { isbn });
 }
 
 #[spacetimedb::reducer]
-pub fn print_books(prefix: String) {
-    for book in Book::iter() {
+pub fn print_books(ctx: &ReducerContext, prefix: String) {
+    for book in ctx.db.book().iter() {
         println!("{}: {}", prefix, book.isbn);
     }
 }
@@ -87,28 +87,28 @@ def test_add_table_pseudomigration(self):
 
 class RejectTableChanges(Smoketest):
     MODULE_CODE = """
-use spacetimedb::println;
+use spacetimedb::{println, ReducerContext, Table};
 
 #[spacetimedb::table(name = person)]
 pub struct Person {
     name: String,
 }
 
 #[spacetimedb::reducer]
-pub fn add_person(name: String) {
-    Person::insert(Person { name });
+pub fn add_person(ctx: &ReducerContext, name: String) {
+    ctx.db.person().insert(Person { name });
 }
 
 #[spacetimedb::reducer]
-pub fn print_persons(prefix: String) {
-    for person in Person::iter() {
+pub fn print_persons(ctx: &ReducerContext, prefix: String) {
+    for person in ctx.db.person().iter() {
         println!("{}: {}", prefix, person.name);
     }
 }
 """
 
     MODULE_CODE_UPDATED = """
-use spacetimedb::println;
+use spacetimedb::{println, ReducerContext, Table};
 
 #[spacetimedb::table(name = person)]
 pub struct Person {
@@ -117,13 +117,13 @@ class RejectTableChanges(Smoketest):
 }
 
 #[spacetimedb::reducer]
-pub fn add_person(name: String) {
-    Person::insert(Person { name, age: 70 });
+pub fn add_person(ctx: &ReducerContext, name: String) {
+    ctx.db.person().insert(Person { name, age: 70 });
 }
 
 #[spacetimedb::reducer]
-pub fn print_persons(prefix: String) {
-    for person in Person::iter() {
+pub fn print_persons(ctx: &ReducerContext, prefix: String) {
+    for person in ctx.db.person().iter() {
         println!("{}: {}", prefix, person.name);
     }
 }

smoketests/tests/auto_inc.py

@@ -22,14 +22,14 @@ class IntTests:
 }
 
 #[spacetimedb::reducer]
-pub fn add_$KEY_TY(name: String, expected_value: $KEY_TY) {
-    let value = Person_$KEY_TY::insert(Person_$KEY_TY { key_col: 0, name });
+pub fn add_$KEY_TY(ctx: &ReducerContext, name: String, expected_value: $KEY_TY) {
+    let value = ctx.db.person_$KEY_TY().insert(Person_$KEY_TY { key_col: 0, name });
     assert_eq!(value.key_col, expected_value);
 }
 
 #[spacetimedb::reducer]
-pub fn say_hello_$KEY_TY() {
-    for person in Person_$KEY_TY::iter() {
+pub fn say_hello_$KEY_TY(ctx: &ReducerContext) {
+    for person in ctx.db.person_$KEY_TY().iter() {
         println!("Hello, {}:{}!", person.key_col, person.name);
     }
     println!("Hello, World!");
@@ -43,7 +43,7 @@ class AutoincBasic(IntTests, Smoketest):
 
     MODULE_CODE = f"""
 #![allow(non_camel_case_types)]
-use spacetimedb::println;
+use spacetimedb::{{println, ReducerContext, Table}};
 {"".join(autoinc1_template.substitute(KEY_TY=int_ty) for int_ty in ints)}
 """
 
@@ -71,21 +71,21 @@ def do_test_autoinc(self, int_ty):
 }
 
 #[spacetimedb::reducer]
-pub fn add_new_$KEY_TY(name: String) -> Result<(), Box<dyn Error>> {
-    let value = Person_$KEY_TY::insert(Person_$KEY_TY { key_col: 0, name })?;
+pub fn add_new_$KEY_TY(ctx: &ReducerContext, name: String) -> Result<(), Box<dyn Error>> {
+    let value = ctx.db.person_$KEY_TY().insert(Person_$KEY_TY { key_col: 0, name });
     println!("Assigned Value: {} -> {}", value.key_col, value.name);
     Ok(())
 }
 
 #[spacetimedb::reducer]
-pub fn update_$KEY_TY(name: String, new_id: $KEY_TY) {
-    Person_$KEY_TY::delete_by_name(&name);
-    let _value = Person_$KEY_TY::insert(Person_$KEY_TY { key_col: new_id, name });
+pub fn update_$KEY_TY(ctx: &ReducerContext, name: String, new_id: $KEY_TY) {
+    ctx.db.person_$KEY_TY().name().delete(&name);
+    let _value = ctx.db.person_$KEY_TY().insert(Person_$KEY_TY { key_col: new_id, name });
 }
 
 #[spacetimedb::reducer]
-pub fn say_hello_$KEY_TY() {
-    for person in Person_$KEY_TY::iter() {
+pub fn say_hello_$KEY_TY(ctx: &ReducerContext) {
+    for person in ctx.db.person_$KEY_TY().iter() {
         println!("Hello, {}:{}!", person.key_col, person.name);
     }
     println!("Hello, World!");
@@ -99,7 +99,7 @@ class AutoincUnique(IntTests, Smoketest):
     MODULE_CODE = f"""
 #![allow(non_camel_case_types)]
 use std::error::Error;
-use spacetimedb::println;
+use spacetimedb::{{println, ReducerContext, Table}};
 {"".join(autoinc2_template.substitute(KEY_TY=int_ty) for int_ty in ints)}
 """
 

smoketests/tests/connect_disconnect_from_cli.py

@@ -6,19 +6,19 @@ class ConnDisconnFromCli(Smoketest):
 use spacetimedb::{println, ReducerContext};
 
 #[spacetimedb::reducer(client_connected)]
-pub fn connected(_ctx: ReducerContext) {
+pub fn connected(_ctx: &ReducerContext) {
     println!("_connect called");
     panic!("Panic on connect");
 }
 
 #[spacetimedb::reducer(client_disconnected)]
-pub fn disconnected(_ctx: ReducerContext) {
+pub fn disconnected(_ctx: &ReducerContext) {
     println!("disconnect called");
     panic!("Panic on disconnect");
 }
 
 #[spacetimedb::reducer]
-pub fn say_hello() {
+pub fn say_hello(ctx: &ReducerContext) {
     println!("Hello, World!");
 }
 """

smoketests/tests/describe.py

@@ -2,21 +2,21 @@
 
 class ModuleDescription(Smoketest):
     MODULE_CODE = """
-use spacetimedb::println;
+use spacetimedb::{println, ReducerContext, Table};
 
 #[spacetimedb::table(name = person)]
 pub struct Person {
     name: String,
 }
 
 #[spacetimedb::reducer]
-pub fn add(name: String) {
-    Person::insert(Person { name });
+pub fn add(ctx: &ReducerContext, name: String) {
+    ctx.db.person().insert(Person { name });
 }
 
 #[spacetimedb::reducer]
-pub fn say_hello() {
-    for person in Person::iter() {
+pub fn say_hello(ctx: &ReducerContext) {
+    for person in ctx.db.person().iter() {
         println!("Hello, {}!", person.name);
     }
     println!("Hello, World!");