Tidy up old code from the benchmark (#4616)

# Description of Changes

Fixes the `reducers.onTransfer is not a function` error - that was old
code left from the 1.x sdk. Also, regenerate the module_bindings and
make sure the rust and typescript modules are identical in that respect.

# Expected complexity level and risk

1

# Testing

- [x] Verified that `spacetime generate --lang typescript --module-path
spacetimedb --out-dir module_bindings` and `spacetime generate --lang
typescript --module-path rust_module --out-dir module_bindings` give the
same output.
- [x] Setting `USE_SPACETIME_METRICS_ENDPOINT` to `0` no longer causes
the error.

Author: coolreader18

templates/keynote-2/module_bindings/create_account_reducer.ts

@@ -5,6 +5,7 @@ use spacetimedb::{reducer, ReducerContext, Table};
 #[derive(Debug, Clone)]
 pub struct Accounts {
     #[primary_key]
+    #[index(hash)]
     pub id: u32,
     pub balance: i64,
 }
@@ -31,21 +32,7 @@ pub fn seed(ctx: &ReducerContext, n: u32, initial_balance: i64) -> Result<(), St
 }
 
 #[reducer]
-pub fn create_account(ctx: &ReducerContext, id: u32, balance: i64) -> Result<(), String> {
-    let accounts = ctx.db.accounts();
-    let by_id = accounts.id();
-
-    if let Some(mut row) = by_id.find(&id) {
-        row.balance = balance;
-        by_id.update(row);
-    } else {
-        accounts.insert(Accounts { id, balance });
-    }
-    Ok(())
-}
-
-#[reducer]
-pub fn transfer(ctx: &ReducerContext, from: u32, to: u32, amount: i64, _client_txn_id: u64) -> Result<(), String> {
+pub fn transfer(ctx: &ReducerContext, from: u32, to: u32, amount: i64) -> Result<(), String> {
     if from == to {
         return Err("same_account".into());
     }

templates/keynote-2/module_bindings/index.ts

@@ -1,8 +1,8 @@
 import { schema, table, t, SenderError } from 'spacetimedb/server';
 
 const spacetimedb = schema({
-  account: table(
-    { name: 'account' },
+  accounts: table(
+    { name: 'accounts', public: true },
     {
       id: t.u32().primaryKey().index('hash'),
       balance: t.i64(),
@@ -12,9 +12,9 @@ const spacetimedb = schema({
 export default spacetimedb;
 
 export const seed = spacetimedb.reducer(
-  { n: t.u32(), balance: t.i64() },
-  (ctx, { n, balance }) => {
-    const accounts = ctx.db.account;
+  { n: t.u32(), initialBalance: t.i64() },
+  (ctx, { n, initialBalance: balance }) => {
+    const accounts = ctx.db.accounts;
 
     for (const row of accounts) {
       accounts.delete(row);
@@ -27,15 +27,24 @@ export const seed = spacetimedb.reducer(
 );
 
 export const transfer = spacetimedb.reducer(
-  { from: t.u32(), to: t.u32(), amount: t.u32() },
-  (ctx, { from, to, amount: amt }) => {
-    const accounts = ctx.db.account;
+  { from: t.u32(), to: t.u32(), amount: t.i64() },
+  (ctx, { from, to, amount }) => {
+    if (from === to) {
+      throw new SenderError('same_account');
+    }
+    if (amount <= 0) {
+      throw new SenderError('non_positive_amount');
+    }
+
+    const accounts = ctx.db.accounts;
     const byId = accounts.id;
 
-    const fromRow = byId.find(from)!;
-    const toRow = byId.find(to)!;
+    const fromRow = byId.find(from);
+    const toRow = byId.find(to);
+    if (fromRow === null || toRow === null) {
+      throw new SenderError('account_missing');
+    }
 
-    const amount = BigInt(amt);
     if (fromRow.balance < amount) {
       throw new SenderError('insufficient_funds');
     }

templates/keynote-2/module_bindings/transfer_reducer.ts

@@ -226,7 +226,7 @@ const testDirPath = fileURLToPath(testDirUrl);
 
     if (connectors && !connectors.includes(tc.system)) continue;
 
-    const makeConnector = (CONNECTORS as any)[tc.system];
+    const makeConnector = CONNECTORS[tc.system];
     if (!makeConnector) throw new Error(`Unknown connector ${tc.system}`);
 
     const connector = makeConnector();

templates/keynote-2/module_bindings/types/reducers.ts

@@ -17,15 +17,6 @@ export function spacetimedb(
     });
   }
 
-  // --- reducer completion tracking  ------------------------
-  const transferWaiters = new Map<
-    bigint,
-    { resolve: () => void; reject: (e: unknown) => void }
-  >();
-
-  let nextTransferId = 1n;
-  let transferHooked = false;
-
   async function connectWithBindings() {
     if (!url) throw new Error('STDB_URL not set');
     if (!moduleName) throw new Error('STDB_MODULE not set');
@@ -49,53 +40,6 @@ export function spacetimedb(
         console.log('[stdb] connected');
         const conn = ctx;
 
-        const reducers = conn.reducers;
-
-        if (
-          process.env.USE_SPACETIME_METRICS_ENDPOINT === '0' &&
-          !transferHooked
-        ) {
-          transferHooked = true;
-          console.log('[stdb] hooking onTransfer');
-          (reducers as any).onTransfer(
-            (
-              eventCtx: any,
-              args: {
-                from: number;
-                to: number;
-                amount: bigint;
-                clientTxnId: bigint;
-              },
-            ) => {
-              const clientTxnId = args.clientTxnId;
-              // console.log('[stdb] onTransfer fired', { ...args, status: eventCtx?.event?.status });
-
-              const waiter = transferWaiters.get(clientTxnId);
-              if (!waiter) {
-                console.warn(
-                  '[stdb] no waiter for clientTxnId',
-                  clientTxnId.toString(),
-                );
-                return;
-              }
-
-              transferWaiters.delete(clientTxnId);
-
-              const status = eventCtx?.event?.status;
-
-              if (status?.tag === 'Committed') {
-                waiter.resolve();
-              } else if (status?.tag === 'Failed') {
-                waiter.reject(new Error(status?.value ?? 'transfer failed'));
-              } else if (status?.tag === 'OutOfEnergy') {
-                waiter.reject(new Error('transfer out of energy'));
-              } else {
-                waiter.reject(new Error('unknown transfer status'));
-              }
-            },
-          );
-        }
-
         resolveReady();
 
         if (subscriptions.length > 0) {
@@ -147,19 +91,6 @@ export function spacetimedb(
     },
 
     async close() {
-      const err = new Error('SpacetimeDB connection closed');
-
-      // Fail any in-flight transfers
-      for (const waiter of transferWaiters.values()) {
-        try {
-          waiter.reject(err);
-        } catch {
-          /* ignore */
-        }
-      }
-      transferWaiters.clear();
-      transferHooked = false;
-
       try {
         conn.disconnect();
       } catch (e) {
@@ -184,47 +115,18 @@ export function spacetimedb(
 
       switch (fn) {
         case 'seed': {
-          conn.reducers.seed({
+          return conn.reducers.seed({
             n: args.accounts,
             initialBalance: args.initialBalance,
           });
-          return;
-        }
-
-        case 'createAccount': {
-          conn.reducers.createAccount({ id: args.id, balance: args.balance });
-          return;
         }
 
         case 'transfer': {
-          const clientTxnId = nextTransferId++;
-
-          if (process.env.USE_SPACETIME_METRICS_ENDPOINT === '0') {
-            return new Promise<void>((resolve, reject) => {
-              const waiter = { resolve, reject };
-              transferWaiters.set(clientTxnId, waiter);
-
-              try {
-                conn.reducers.transfer({
-                  from: args.from,
-                  to: args.to,
-                  amount: args.amount,
-                  clientTxnId,
-                });
-              } catch (err) {
-                console.log(`ERROR ${err}`);
-                transferWaiters.delete(clientTxnId);
-                reject(err);
-              }
-            });
-          } else {
-            return conn.reducers.transfer({
-              from: args.from,
-              to: args.to,
-              amount: args.amount,
-              clientTxnId,
-            });
-          }
+          return conn.reducers.transfer({
+            from: args.from,
+            to: args.to,
+            amount: args.amount,
+          });
         }
 
         default: