[bfops/rust-smoketests-lib]: revert

Author: bfops

crates/smoketests/modules/add-remove-index-indexed/src/lib.rs

@@ -1,16 +1,10 @@
 use spacetimedb::{ReducerContext, Table};
 
 #[spacetimedb::table(accessor = t1)]
-pub struct T1 {
-    #[index(btree)]
-    id: u64,
-}
+pub struct T1 { #[index(btree)] id: u64 }
 
 #[spacetimedb::table(accessor = t2)]
-pub struct T2 {
-    #[index(btree)]
-    id: u64,
-}
+pub struct T2 { #[index(btree)] id: u64 }
 
 #[spacetimedb::reducer(init)]
 pub fn init(ctx: &ReducerContext) {

crates/smoketests/modules/add-remove-index/src/lib.rs

@@ -1,14 +1,10 @@
 use spacetimedb::{ReducerContext, Table};
 
 #[spacetimedb::table(accessor = t1)]
-pub struct T1 {
-    id: u64,
-}
+pub struct T1 { id: u64 }
 
 #[spacetimedb::table(accessor = t2)]
-pub struct T2 {
-    id: u64,
-}
+pub struct T2 { id: u64 }
 
 #[spacetimedb::reducer(init)]
 pub fn init(ctx: &ReducerContext) {

crates/smoketests/modules/call-reducer-procedure/src/lib.rs

@@ -12,7 +12,5 @@ pub fn say_hello(_ctx: &ReducerContext) {
 
 #[spacetimedb::procedure]
 pub fn return_person(_ctx: &mut ProcedureContext) -> Person {
-    return Person {
-        name: "World".to_owned(),
-    };
+   return Person { name: "World".to_owned() };
 }

crates/smoketests/modules/delete-database/src/lib.rs

@@ -1,10 +1,10 @@
-use spacetimedb::{duration, ReducerContext, Table};
+use spacetimedb::{ReducerContext, Table, duration};
 
 #[spacetimedb::table(accessor = counter, public)]
 pub struct Counter {
     #[primary_key]
     id: u64,
-    val: u64,
+    val: u64
 }
 
 #[spacetimedb::table(accessor = scheduled_counter, public, scheduled(inc, at = sched_at))]

crates/smoketests/modules/filtering/src/lib.rs

@@ -13,24 +13,16 @@ pub struct Person {
 
 #[spacetimedb::reducer]
 pub fn insert_person(ctx: &ReducerContext, id: i32, name: String, nick: String) {
-    ctx.db.person().insert(Person { id, name, nick });
+    ctx.db.person().insert(Person { id, name, nick} );
 }
 
 #[spacetimedb::reducer]
 pub fn insert_person_twice(ctx: &ReducerContext, id: i32, name: String, nick: String) {
     // We'd like to avoid an error due to a set-semantic error.
     let name2 = format!("{name}2");
-    ctx.db.person().insert(Person {
-        id,
-        name,
-        nick: nick.clone(),
-    });
-    match ctx.db.person().try_insert(Person {
-        id,
-        name: name2,
-        nick: nick.clone(),
-    }) {
-        Ok(_) => {}
+    ctx.db.person().insert(Person { id, name, nick: nick.clone()} );
+    match ctx.db.person().try_insert(Person { id, name: name2, nick: nick.clone()}) {
+        Ok(_) => {},
         Err(_) => {
             log::info!("UNIQUE CONSTRAINT VIOLATION ERROR: id = {}, nick = {}", id, nick)
         }
@@ -93,7 +85,7 @@ pub struct NonuniquePerson {
 
 #[spacetimedb::reducer]
 pub fn insert_nonunique_person(ctx: &ReducerContext, id: i32, name: String, is_human: bool) {
-    ctx.db.nonunique_person().insert(NonuniquePerson { id, name, is_human });
+    ctx.db.nonunique_person().insert(NonuniquePerson { id, name, is_human } );
 }
 
 #[spacetimedb::reducer]
@@ -166,11 +158,7 @@ struct IndexedPerson {
 
 #[spacetimedb::reducer]
 fn insert_indexed_person(ctx: &ReducerContext, id: i32, given_name: String, surname: String) {
-    ctx.db.indexed_person().insert(IndexedPerson {
-        id,
-        given_name,
-        surname,
-    });
+    ctx.db.indexed_person().insert(IndexedPerson { id, given_name, surname });
 }
 
 #[spacetimedb::reducer]
@@ -181,24 +169,14 @@ fn delete_indexed_person(ctx: &ReducerContext, id: i32) {
 #[spacetimedb::reducer]
 fn find_indexed_people(ctx: &ReducerContext, surname: String) {
     for person in ctx.db.indexed_person().surname().filter(&surname) {
-        log::info!(
-            "INDEXED FOUND: id {}: {}, {}",
-            person.id,
-            person.surname,
-            person.given_name
-        );
+        log::info!("INDEXED FOUND: id {}: {}, {}", person.id, person.surname, person.given_name);
     }
 }
 
 #[spacetimedb::reducer]
 fn find_indexed_people_read_only(ctx: &ReducerContext, surname: String) {
     let ctx = ctx.as_read_only();
     for person in ctx.db.indexed_person().surname().filter(&surname) {
-        log::info!(
-            "INDEXED FOUND: id {}: {}, {}",
-            person.id,
-            person.surname,
-            person.given_name
-        );
+        log::info!("INDEXED FOUND: id {}: {}, {}", person.id, person.surname, person.given_name);
     }
 }

crates/smoketests/modules/module-nested-op/src/lib.rs

@@ -15,18 +15,15 @@ pub struct Friends {
 
 #[spacetimedb::reducer]
 pub fn create_account(ctx: &ReducerContext, account_id: i32, name: String) {
-    ctx.db.account().insert(Account { id: account_id, name });
+    ctx.db.account().insert(Account { id: account_id, name } );
 }
 
 #[spacetimedb::reducer]
 pub fn add_friend(ctx: &ReducerContext, my_id: i32, their_id: i32) {
     // Make sure our friend exists
     for account in ctx.db.account().iter() {
         if account.id == their_id {
-            ctx.db.friends().insert(Friends {
-                friend_1: my_id,
-                friend_2: their_id,
-            });
+            ctx.db.friends().insert(Friends { friend_1: my_id, friend_2: their_id });
             return;
         }
     }

crates/smoketests/modules/new-user-flow/src/lib.rs

@@ -2,7 +2,7 @@ use spacetimedb::{log, ReducerContext, Table};
 
 #[spacetimedb::table(accessor = person)]
 pub struct Person {
-    name: String,
+    name: String
 }
 
 #[spacetimedb::reducer]

crates/smoketests/modules/pg-wire/src/lib.rs

@@ -1,5 +1,5 @@
 use spacetimedb::sats::{i256, u256};
-use spacetimedb::{ConnectionId, Identity, ReducerContext, SpacetimeType, Table, TimeDuration, Timestamp, Uuid};
+use spacetimedb::{ConnectionId, Identity, ReducerContext, SpacetimeType, Table, Timestamp, TimeDuration, Uuid};
 
 #[derive(Copy, Clone)]
 #[spacetimedb::table(accessor = t_ints, public)]
@@ -50,7 +50,7 @@ pub struct TOthers {
 
 #[spacetimedb::table(accessor = t_others_tuple, public)]
 pub struct TOthersTuple {
-    tuple: TOthers,
+    tuple: TOthers
 }
 
 #[derive(SpacetimeType, Debug, Clone, Copy)]
@@ -79,9 +79,9 @@ pub struct TEnum {
 
 #[spacetimedb::table(accessor = t_nested, public)]
 pub struct TNested {
-    en: TEnum,
-    se: TSimpleEnum,
-    ints: TInts,
+   en: TEnum,
+   se: TSimpleEnum,
+   ints: TInts,
 }
 
 #[derive(Clone)]
@@ -127,7 +127,7 @@ pub fn test(ctx: &ReducerContext) {
         f32: 594806.58906,
         f64: -3454353.345389043278459,
         str: "This is spacetimedb".to_string(),
-        bytes: vec![1, 2, 3, 4, 5, 6, 7],
+        bytes: vec!(1, 2, 3, 4, 5, 6, 7),
         identity: Identity::ONE,
         connection_id: ConnectionId::ZERO,
         timestamp: Timestamp::UNIX_EPOCH,
@@ -137,29 +137,14 @@ pub fn test(ctx: &ReducerContext) {
     ctx.db.t_others().insert(tuple.clone());
     ctx.db.t_others_tuple().insert(TOthersTuple { tuple });
 
-    ctx.db.t_simple_enum().insert(TSimpleEnum {
-        id: 1,
-        action: Action::Inactive,
-    });
-    ctx.db.t_simple_enum().insert(TSimpleEnum {
-        id: 2,
-        action: Action::Active,
-    });
+    ctx.db.t_simple_enum().insert(TSimpleEnum { id: 1, action: Action::Inactive });
+    ctx.db.t_simple_enum().insert(TSimpleEnum { id: 2, action: Action::Active });
 
-    ctx.db.t_enum().insert(TEnum {
-        id: 1,
-        color: Color::Gray(128),
-    });
+    ctx.db.t_enum().insert(TEnum { id: 1, color: Color::Gray(128) });
 
     ctx.db.t_nested().insert(TNested {
-        en: TEnum {
-            id: 1,
-            color: Color::Gray(128),
-        },
-        se: TSimpleEnum {
-            id: 2,
-            action: Action::Active,
-        },
+        en: TEnum { id: 1, color: Color::Gray(128) },
+        se: TSimpleEnum { id: 2, action: Action::Active },
         ints,
     });
 

crates/smoketests/modules/schedule-cancel/src/lib.rs

@@ -7,17 +7,14 @@ fn init(ctx: &ReducerContext) {
         scheduled_id: 0,
         scheduled_at: duration!(100ms).into(),
     });
-    ctx.db
-        .scheduled_reducer_args()
-        .scheduled_id()
-        .delete(&schedule.scheduled_id);
+    ctx.db.scheduled_reducer_args().scheduled_id().delete(&schedule.scheduled_id);
 
     let schedule = ctx.db.scheduled_reducer_args().insert(ScheduledReducerArgs {
-        num: 2,
-        scheduled_id: 0,
-        scheduled_at: duration!(1000ms).into(),
-    });
-    do_cancel(ctx, schedule.scheduled_id);
+         num: 2,
+         scheduled_id: 0,
+         scheduled_at: duration!(1000ms).into(),
+     });
+     do_cancel(ctx, schedule.scheduled_id);
 }
 
 #[spacetimedb::table(accessor = scheduled_reducer_args, public, scheduled(reducer))]

crates/smoketests/modules/schedule-subscribe/src/lib.rs

@@ -1,4 +1,4 @@
-use spacetimedb::{duration, log, ReducerContext, Table, Timestamp};
+use spacetimedb::{log, duration, ReducerContext, Table, Timestamp};
 
 #[spacetimedb::table(accessor = scheduled_table, public, scheduled(my_reducer, at = sched_at))]
 pub struct ScheduledTable {
@@ -11,27 +11,15 @@ pub struct ScheduledTable {
 
 #[spacetimedb::reducer]
 fn schedule_reducer(ctx: &ReducerContext) {
-    ctx.db.scheduled_table().insert(ScheduledTable {
-        prev: Timestamp::from_micros_since_unix_epoch(0),
-        scheduled_id: 2,
-        sched_at: Timestamp::from_micros_since_unix_epoch(0).into(),
-    });
+    ctx.db.scheduled_table().insert(ScheduledTable { prev: Timestamp::from_micros_since_unix_epoch(0), scheduled_id: 2, sched_at: Timestamp::from_micros_since_unix_epoch(0).into(), });
 }
 
 #[spacetimedb::reducer]
 fn schedule_repeated_reducer(ctx: &ReducerContext) {
-    ctx.db.scheduled_table().insert(ScheduledTable {
-        prev: Timestamp::from_micros_since_unix_epoch(0),
-        scheduled_id: 1,
-        sched_at: duration!(100ms).into(),
-    });
+    ctx.db.scheduled_table().insert(ScheduledTable { prev: Timestamp::from_micros_since_unix_epoch(0), scheduled_id: 1, sched_at: duration!(100ms).into(), });
 }
 
 #[spacetimedb::reducer]
 pub fn my_reducer(ctx: &ReducerContext, arg: ScheduledTable) {
-    log::info!(
-        "Invoked: ts={:?}, delta={:?}",
-        ctx.timestamp,
-        ctx.timestamp.duration_since(arg.prev)
-    );
+    log::info!("Invoked: ts={:?}, delta={:?}", ctx.timestamp, ctx.timestamp.duration_since(arg.prev));
 }