tigerbeetle-node 0.5.0 → 0.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tigerbeetle-node",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "TigerBeetle Node.js client",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -37,7 +37,7 @@
     "benchmark": "./scripts/benchmark.sh",
     "build": "yarn build:tsc && yarn build:zig",
     "build:tsc": "tsc",
-    "build:zig": "mkdir -p dist && ZIG_SYSTEM_LINKER_HACK=1 zig/zig build-lib -mcpu=baseline -OReleaseSafe -dynamic -lc -isystem build/node-$(node --version)/include/node src/node.zig -fallow-shlib-undefined -femit-bin=dist/client.node",
+    "build:zig": "mkdir -p dist && zig/zig build-lib -mcpu=baseline -OReleaseSafe -dynamic -lc -isystem build/node-$(node --version)/include/node src/node.zig -fallow-shlib-undefined -femit-bin=dist/client.node",
     "clean": "rm -rf build dist node_modules src/zig-cache zig",
     "install:zig": "./src/tigerbeetle/scripts/install_zig.sh",
     "postinstall": "./scripts/postinstall.sh",

package/scripts/postinstall.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
 
-./src/tigerbeetle/scripts/install_zig.sh 0.8.1
+./src/tigerbeetle/scripts/install_zig.sh
 ./scripts/download_node_headers.sh
-mkdir -p dist && ZIG_SYSTEM_LINKER_HACK=1 zig/zig build-lib -mcpu=baseline -OReleaseSafe -dynamic -lc -isystem build/node-$(node --version)/include/node src/node.zig -fallow-shlib-undefined -femit-bin=dist/client.node
+mkdir -p dist && zig/zig build-lib -mcpu=baseline -OReleaseSafe -dynamic -lc -isystem build/node-$(node --version)/include/node src/node.zig -fallow-shlib-undefined -femit-bin=dist/client.node

package/src/node.zig

@@ -45,7 +45,7 @@ export fn napi_register_module_v1(env: c.napi_env, exports: c.napi_value) c.napi
 
     const allocator = std.heap.c_allocator;
     var global = Globals.init(allocator, env) catch {
-        std.log.emerg("Failed to initialise environment.\n", .{});
+        std.log.err("Failed to initialise environment.\n", .{});
         return null;
     };
     errdefer global.deinit();
@@ -57,7 +57,7 @@ export fn napi_register_module_v1(env: c.napi_env, exports: c.napi_value) c.napi
     // state.
     translate.set_instance_data(
         env,
-        @ptrCast(*c_void, @alignCast(@alignOf(u8), global)),
+        @ptrCast(*anyopaque, @alignCast(@alignOf(u8), global)),
         Globals.destroy,
     ) catch {
         global.deinit();
@@ -68,11 +68,11 @@ export fn napi_register_module_v1(env: c.napi_env, exports: c.napi_value) c.napi
 }
 
 const Globals = struct {
-    allocator: *std.mem.Allocator,
+    allocator: std.mem.Allocator,
     io: IO,
     napi_undefined: c.napi_value,
 
-    pub fn init(allocator: *std.mem.Allocator, env: c.napi_env) !*Globals {
+    pub fn init(allocator: std.mem.Allocator, env: c.napi_env) !*Globals {
         const self = try allocator.create(Globals);
         errdefer allocator.destroy(self);
 
@@ -93,7 +93,7 @@ const Globals = struct {
         };
         errdefer self.io.deinit();
 
-        if (c.napi_get_undefined(env, &self.napi_undefined) != .napi_ok) {
+        if (c.napi_get_undefined(env, &self.napi_undefined) != c.napi_ok) {
             return translate.throw(env, "Failed to capture the value of \"undefined\".");
         }
 
@@ -105,13 +105,16 @@ const Globals = struct {
         self.allocator.destroy(self);
     }
 
-    pub fn destroy(env: c.napi_env, data: ?*c_void, hint: ?*c_void) callconv(.C) void {
+    pub fn destroy(env: c.napi_env, data: ?*anyopaque, hint: ?*anyopaque) callconv(.C) void {
+        _ = env;
+        _ = hint;
+
         const self = globalsCast(data.?);
         self.deinit();
     }
 };
 
-fn globalsCast(globals_raw: *c_void) *Globals {
+fn globalsCast(globals_raw: *anyopaque) *Globals {
     return @ptrCast(*Globals, @alignCast(@alignOf(Globals), globals_raw));
 }
 
@@ -123,7 +126,7 @@ const Context = struct {
 
     fn create(
         env: c.napi_env,
-        allocator: *std.mem.Allocator,
+        allocator: std.mem.Allocator,
         io: *IO,
         cluster: u32,
         addresses_raw: []const u8,
@@ -163,7 +166,7 @@ const Context = struct {
     }
 };
 
-fn contextCast(context_raw: *c_void) !*Context {
+fn contextCast(context_raw: *anyopaque) !*Context {
     return @ptrCast(*Context, @alignCast(@alignOf(Context), context_raw));
 }
 
@@ -522,7 +525,7 @@ fn encode_napi_results_array(
 fn init(env: c.napi_env, info: c.napi_callback_info) callconv(.C) c.napi_value {
     var argc: usize = 1;
     var argv: [1]c.napi_value = undefined;
-    if (c.napi_get_cb_info(env, info, &argc, &argv, null, null) != .napi_ok) {
+    if (c.napi_get_cb_info(env, info, &argc, &argv, null, null) != c.napi_ok) {
         translate.throw(env, "Failed to get args.") catch return null;
     }
     if (argc != 1) translate.throw(
@@ -555,7 +558,7 @@ fn init(env: c.napi_env, info: c.napi_callback_info) callconv(.C) c.napi_value {
 fn request(env: c.napi_env, info: c.napi_callback_info) callconv(.C) c.napi_value {
     var argc: usize = 4;
     var argv: [4]c.napi_value = undefined;
-    if (c.napi_get_cb_info(env, info, &argc, &argv, null, null) != .napi_ok) {
+    if (c.napi_get_cb_info(env, info, &argc, &argv, null, null) != c.napi_ok) {
         translate.throw(env, "Failed to get args.") catch return null;
     }
 
@@ -609,7 +612,7 @@ fn request(env: c.napi_env, info: c.napi_callback_info) callconv(.C) c.napi_valu
 fn raw_request(env: c.napi_env, info: c.napi_callback_info) callconv(.C) c.napi_value {
     var argc: usize = 4;
     var argv: [4]c.napi_value = undefined;
-    if (c.napi_get_cb_info(env, info, &argc, &argv, null, null) != .napi_ok) {
+    if (c.napi_get_cb_info(env, info, &argc, &argv, null, null) != c.napi_ok) {
         translate.throw(env, "Failed to get args.") catch return null;
     }
 
@@ -730,11 +733,10 @@ fn on_result(user_data: u128, operation: Operation, results: Client.Error![]cons
 fn tick(env: c.napi_env, info: c.napi_callback_info) callconv(.C) c.napi_value {
     var argc: usize = 1;
     var argv: [1]c.napi_value = undefined;
-    if (c.napi_get_cb_info(env, info, &argc, &argv, null, null) != .napi_ok) {
+    if (c.napi_get_cb_info(env, info, &argc, &argv, null, null) != c.napi_ok) {
         translate.throw(env, "Failed to get args.") catch return null;
     }
 
-    const allocator = std.heap.c_allocator;
     if (argc != 1) translate.throw(
         env,
         "Function tick() requires 1 argument exactly.",
@@ -760,7 +762,7 @@ fn tick(env: c.napi_env, info: c.napi_callback_info) callconv(.C) c.napi_value {
 fn deinit(env: c.napi_env, info: c.napi_callback_info) callconv(.C) c.napi_value {
     var argc: usize = 1;
     var argv: [1]c.napi_value = undefined;
-    if (c.napi_get_cb_info(env, info, &argc, &argv, null, null) != .napi_ok) {
+    if (c.napi_get_cb_info(env, info, &argc, &argv, null, null) != c.napi_ok) {
         translate.throw(env, "Failed to get args.") catch return null;
     }
 

package/src/tigerbeetle/scripts/install.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-scripts/install_zig.sh 0.8.1
+scripts/install_zig.sh
 echo "Building TigerBeetle..."
 zig/zig build -Dcpu=baseline -Drelease-safe
 mv zig-out/bin/tigerbeetle .

package/src/tigerbeetle/scripts/install_zig.bat

@@ -1,10 +1,10 @@
 @echo off
 
-set DEFAULT_RELEASE=0.8.1
+set ZIG_RELEASE_DEFAULT=0.9.0
 
 :: Determine the Zig build:
 if "%~1"=="" (
-    set ZIG_RELEASE=%DEFAULT_RELEASE%
+    set ZIG_RELEASE=%ZIG_RELEASE_DEFAULT%
 ) else if "%~1"=="latest" (
     set ZIG_RELEASE=builds
 ) else (
@@ -106,4 +106,4 @@ if exist %ZIG_TARBALL% (
   exit 1
 )
 
-echo "Congratulations, you have successfully installed Zig version %ZIG_RELEASE%. Enjoy!"
+echo "Congratulations, you have successfully installed Zig version %ZIG_RELEASE%. Enjoy!"

package/src/tigerbeetle/scripts/install_zig.sh

@@ -1,9 +1,11 @@
 #!/bin/bash
 set -e
 
-# Default to the 0.8.1 build, or allow the latest dev build, or an explicit release version:
+ZIG_RELEASE_DEFAULT="0.9.0"
+
+# Default to the release build, or allow the latest dev build, or an explicit release version:
 if [ -z "$1" ]; then
-    ZIG_RELEASE="0.8.1"
+    ZIG_RELEASE=$ZIG_RELEASE_DEFAULT
 elif [ "$1" == "latest" ]; then
     ZIG_RELEASE="builds"
 else

package/src/tigerbeetle/scripts/lint.zig

@@ -23,7 +23,7 @@ var file_stats = std.ArrayListUnmanaged(Stats){};
 var seen = std.AutoArrayHashMapUnmanaged(fs.File.INode, void){};
 
 var general_purpose_allocator = std.heap.GeneralPurposeAllocator(.{}){};
-const gpa = &general_purpose_allocator.allocator;
+const gpa = general_purpose_allocator.allocator();
 
 pub fn main() !void {
     const argv = std.os.argv;
@@ -119,7 +119,13 @@ fn lint_file(file_path: []const u8, dir: fs.Dir, sub_path: []const u8) LintError
     // Add to set after no longer possible to get error.IsDir.
     if (try seen.fetchPut(gpa, stat.inode, {})) |_| return;
 
-    const source = try source_file.readToEndAlloc(gpa, math.maxInt(usize));
+    const source = try source_file.readToEndAllocOptions(
+        gpa,
+        math.maxInt(usize),
+        null,
+        @alignOf(u8),
+        0,
+    );
     try check_line_length(source, file_path);
 
     var tree = try std.zig.parse(gpa, source);

package/src/tigerbeetle/src/benchmark.zig

@@ -1,4 +1,5 @@
 const std = @import("std");
+const builtin = @import("builtin");
 const assert = std.debug.assert;
 const config = @import("config.zig");
 
@@ -30,7 +31,7 @@ const BATCHES: f32 = MAX_TRANSFERS / BATCH_SIZE;
 const TOTAL_BATCHES = @ceil(BATCHES);
 
 const log = std.log;
-pub const log_level: std.log.Level = .notice;
+pub const log_level: std.log.Level = .info;
 
 var accounts = [_]Account{
     Account{
@@ -65,13 +66,14 @@ pub fn main() !void {
     const stdout = std.io.getStdOut().writer();
     const stderr = std.io.getStdErr().writer();
 
-    if (std.builtin.mode != .ReleaseSafe and std.builtin.mode != .ReleaseFast) {
+    if (builtin.mode != .ReleaseSafe and builtin.mode != .ReleaseFast) {
         try stderr.print("Benchmark must be built as ReleaseSafe for minimum performance.\n", .{});
     }
 
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena.deinit();
-    const allocator = &arena.allocator;
+
+    const allocator = arena.allocator();
 
     const client_id = std.crypto.random.int(u128);
     const cluster_id: u32 = 0;
@@ -90,7 +92,7 @@ pub fn main() !void {
     message_bus.set_on_message(*Client, &client, Client.on_message);
 
     // Pre-allocate a million transfers:
-    var transfers = try arena.allocator.alloc(Transfer, MAX_TRANSFERS);
+    const transfers = try arena.allocator().alloc(Transfer, MAX_TRANSFERS);
     for (transfers) |*transfer, index| {
         transfer.* = .{
             .id = index,
@@ -106,7 +108,7 @@ pub fn main() !void {
     }
 
     // Pre-allocate a million commits:
-    var commits: ?[]Commit = if (IS_TWO_PHASE_COMMIT) try arena.allocator.alloc(Commit, MAX_TRANSFERS) else null;
+    const commits: ?[]Commit = if (IS_TWO_PHASE_COMMIT) try arena.allocator().alloc(Commit, MAX_TRANSFERS) else null;
     if (commits) |all_commits| {
         for (all_commits) |*commit, index| {
             commit.* = .{
@@ -254,7 +256,7 @@ const TimedQueue = struct {
     pub fn lap(user_data: u128, operation: Operation, results: Client.Error![]const u8) void {
         const now = std.time.milliTimestamp();
         const value = results catch |err| {
-            log.emerg("Client returned error={o}", .{@errorName(err)});
+            log.err("Client returned error={o}", .{@errorName(err)});
             @panic("Client returned error during benchmarking.");
         };
 

package/src/tigerbeetle/src/cli.zig

@@ -87,7 +87,7 @@ pub const Command = union(enum) {
 
 /// Parse the command line arguments passed to the tigerbeetle binary.
 /// Exits the program with a non-zero exit code if an error is found.
-pub fn parse_args(allocator: *std.mem.Allocator) Command {
+pub fn parse_args(allocator: std.mem.Allocator) Command {
     var maybe_cluster: ?[]const u8 = null;
     var maybe_replica: ?[]const u8 = null;
     var maybe_addresses: ?[]const u8 = null;
@@ -118,8 +118,10 @@ pub fn parse_args(allocator: *std.mem.Allocator) Command {
         } else if (mem.eql(u8, arg, "-h") or mem.eql(u8, arg, "--help")) {
             std.io.getStdOut().writeAll(usage) catch os.exit(1);
             os.exit(0);
-        } else {
+        } else if (mem.startsWith(u8, arg, "--")) {
             fatal("unexpected argument: '{s}'", .{arg});
+        } else {
+            fatal("unexpected argument: '{s}' (must start with '--')", .{arg});
         }
     }
 
@@ -130,7 +132,7 @@ pub fn parse_args(allocator: *std.mem.Allocator) Command {
     const replica = parse_replica(raw_replica);
 
     const dir_path = maybe_directory orelse config.directory;
-    const dir_fd = os.openZ(dir_path, os.O_CLOEXEC | os.O_RDONLY, 0) catch |err|
+    const dir_fd = os.openZ(dir_path, os.O.CLOEXEC | os.O.RDONLY, 0) catch |err|
         fatal("failed to open directory '{s}': {}", .{ dir_path, err });
 
     switch (command) {
@@ -193,7 +195,7 @@ fn parse_cluster(raw_cluster: []const u8) u32 {
 }
 
 /// Parse and allocate the addresses returning a slice into that array.
-fn parse_addresses(allocator: *std.mem.Allocator, raw_addresses: []const u8) []net.Address {
+fn parse_addresses(allocator: std.mem.Allocator, raw_addresses: []const u8) []net.Address {
     return vsr.parse_addresses(allocator, raw_addresses) catch |err| switch (err) {
         error.AddressHasTrailingComma => fatal("--addresses: invalid trailing comma", .{}),
         error.AddressLimitExceeded => {

package/src/tigerbeetle/src/config.zig

@@ -1,8 +1,8 @@
 /// Whether development or production:
 pub const deployment_environment = .development;
 
-/// The maximum log level in increasing order of verbosity (emergency=0, debug=7):
-pub const log_level = 6;
+/// The maximum log level in increasing order of verbosity (emergency=0, debug=3):
+pub const log_level = 2;
 
 /// The maximum number of replicas allowed in a cluster.
 pub const replicas_max = 6;

package/src/tigerbeetle/src/demo.zig

@@ -1,7 +1,16 @@
 const std = @import("std");
 const assert = std.debug.assert;
 
-usingnamespace @import("tigerbeetle.zig");
+const config = @import("config.zig");
+
+const tb = @import("tigerbeetle.zig");
+const Account = tb.Account;
+const Transfer = tb.Transfer;
+const Commit = tb.Commit;
+
+const CreateAccountsResult = tb.CreateAccountsResult;
+const CreateTransfersResult = tb.CreateTransfersResult;
+const CommitTransfersResult = tb.CommitTransfersResult;
 
 const IO = @import("io.zig").IO;
 const MessageBus = @import("message_bus.zig").MessageBusClient;
@@ -13,104 +22,117 @@ const Client = vsr.Client(StateMachine, MessageBus);
 
 pub const log_level: std.log.Level = .alert;
 
-pub const Demo = struct {
-    pub fn request(
-        operation: StateMachine.Operation,
-        batch: anytype,
-        on_reply: fn (
-            user_data: u128,
-            operation: StateMachine.Operation,
-            results: Client.Error![]const u8,
-        ) void,
-    ) !void {
-        const allocator = std.heap.page_allocator;
-        const client_id = std.crypto.random.int(u128);
-        const cluster_id: u32 = 0;
-        var addresses = [_]std.net.Address{try std.net.Address.parseIp4("127.0.0.1", config.port)};
-
-        var io = try IO.init(32, 0);
-        defer io.deinit();
-
-        var message_bus = try MessageBus.init(allocator, cluster_id, &addresses, client_id, &io);
-        defer message_bus.deinit();
-
-        var client = try Client.init(
-            allocator,
-            client_id,
-            cluster_id,
-            @intCast(u8, addresses.len),
-            &message_bus,
-        );
-        defer client.deinit();
-
-        message_bus.set_on_message(*Client, &client, Client.on_message);
-
-        var message = client.get_message() orelse unreachable;
-        defer client.unref(message);
-
-        const body = std.mem.asBytes(&batch);
-        std.mem.copy(u8, message.buffer[@sizeOf(Header)..], body);
-
-        client.request(
-            0,
-            on_reply,
-            operation,
-            message,
-            body.len,
-        );
-
-        while (client.request_queue.count > 0) {
-            client.tick();
-            try io.run_for_ns(config.tick_ms * std.time.ns_per_ms);
-        }
-    }
-
-    pub fn on_create_accounts(
-        user_data: u128,
-        operation: StateMachine.Operation,
-        results: Client.Error![]const u8,
-    ) void {
-        print_results(CreateAccountsResult, results);
-    }
-
-    pub fn on_lookup_accounts(
-        user_data: u128,
-        operation: StateMachine.Operation,
-        results: Client.Error![]const u8,
-    ) void {
-        print_results(Account, results);
-    }
-
-    pub fn on_lookup_transfers(
-        user_data: u128,
-        operation: StateMachine.Operation,
-        results: Client.Error![]const u8,
-    ) void {
-        print_results(Transfer, results);
-    }
-
-    pub fn on_create_transfers(
+pub fn request(
+    operation: StateMachine.Operation,
+    batch: anytype,
+    on_reply: fn (
         user_data: u128,
         operation: StateMachine.Operation,
         results: Client.Error![]const u8,
-    ) void {
-        print_results(CreateTransfersResult, results);
+    ) void,
+) !void {
+    const allocator = std.heap.page_allocator;
+    const client_id = std.crypto.random.int(u128);
+    const cluster_id: u32 = 0;
+    var addresses = [_]std.net.Address{try std.net.Address.parseIp4("127.0.0.1", config.port)};
+
+    var io = try IO.init(32, 0);
+    defer io.deinit();
+
+    var message_bus = try MessageBus.init(allocator, cluster_id, &addresses, client_id, &io);
+    defer message_bus.deinit();
+
+    var client = try Client.init(
+        allocator,
+        client_id,
+        cluster_id,
+        @intCast(u8, addresses.len),
+        &message_bus,
+    );
+    defer client.deinit();
+
+    message_bus.set_on_message(*Client, &client, Client.on_message);
+
+    var message = client.get_message() orelse unreachable;
+    defer client.unref(message);
+
+    const body = std.mem.asBytes(&batch);
+    std.mem.copy(u8, message.buffer[@sizeOf(Header)..], body);
+
+    client.request(
+        0,
+        on_reply,
+        operation,
+        message,
+        body.len,
+    );
+
+    while (client.request_queue.count > 0) {
+        client.tick();
+        try io.run_for_ns(config.tick_ms * std.time.ns_per_ms);
     }
-
-    pub fn on_commit_transfers(
-        user_data: u128,
-        operation: StateMachine.Operation,
-        results: Client.Error![]const u8,
-    ) void {
-        print_results(CommitTransfersResult, results);
-    }
-
-    fn print_results(comptime Results: type, results: Client.Error![]const u8) void {
-        const body = results catch unreachable;
-        const slice = std.mem.bytesAsSlice(Results, body);
-        for (slice) |result| {
-            std.debug.print("{}\n", .{result});
-        }
-        if (slice.len == 0) std.debug.print("OK\n", .{});
+}
+
+pub fn on_create_accounts(
+    user_data: u128,
+    operation: StateMachine.Operation,
+    results: Client.Error![]const u8,
+) void {
+    _ = user_data;
+    _ = operation;
+
+    print_results(CreateAccountsResult, results);
+}
+
+pub fn on_lookup_accounts(
+    user_data: u128,
+    operation: StateMachine.Operation,
+    results: Client.Error![]const u8,
+) void {
+    _ = user_data;
+    _ = operation;
+
+    print_results(Account, results);
+}
+
+pub fn on_lookup_transfers(
+    user_data: u128,
+    operation: StateMachine.Operation,
+    results: Client.Error![]const u8,
+) void {
+    _ = user_data;
+    _ = operation;
+
+    print_results(Transfer, results);
+}
+
+pub fn on_create_transfers(
+    user_data: u128,
+    operation: StateMachine.Operation,
+    results: Client.Error![]const u8,
+) void {
+    _ = user_data;
+    _ = operation;
+
+    print_results(CreateTransfersResult, results);
+}
+
+pub fn on_commit_transfers(
+    user_data: u128,
+    operation: StateMachine.Operation,
+    results: Client.Error![]const u8,
+) void {
+    _ = user_data;
+    _ = operation;
+
+    print_results(CommitTransfersResult, results);
+}
+
+fn print_results(comptime Results: type, results: Client.Error![]const u8) void {
+    const body = results catch unreachable;
+    const slice = std.mem.bytesAsSlice(Results, body);
+    for (slice) |result| {
+        std.debug.print("{}\n", .{result});
     }
-};
+    if (slice.len == 0) std.debug.print("OK\n", .{});
+}

package/src/tigerbeetle/src/demo_01_create_accounts.zig

@@ -1,5 +1,7 @@
-usingnamespace @import("tigerbeetle.zig");
-usingnamespace @import("demo.zig");
+const tb = @import("tigerbeetle.zig");
+const demo = @import("demo.zig");
+
+const Account = tb.Account;
 
 pub fn main() !void {
     const accounts = [_]Account{
@@ -29,5 +31,5 @@ pub fn main() !void {
         },
     };
 
-    try Demo.request(.create_accounts, accounts, Demo.on_create_accounts);
+    try demo.request(.create_accounts, accounts, demo.on_create_accounts);
 }

package/src/tigerbeetle/src/demo_02_lookup_accounts.zig

@@ -1,8 +1,7 @@
-usingnamespace @import("tigerbeetle.zig");
-usingnamespace @import("demo.zig");
+const demo = @import("demo.zig");
 
 pub fn main() !void {
     const ids = [_]u128{ 1, 2 };
 
-    try Demo.request(.lookup_accounts, ids, Demo.on_lookup_accounts);
+    try demo.request(.lookup_accounts, ids, demo.on_lookup_accounts);
 }

package/src/tigerbeetle/src/demo_03_create_transfers.zig

@@ -1,5 +1,7 @@
-usingnamespace @import("tigerbeetle.zig");
-usingnamespace @import("demo.zig");
+const tb = @import("tigerbeetle.zig");
+const demo = @import("demo.zig");
+
+const Transfer = tb.Transfer;
 
 pub fn main() !void {
     const transfers = [_]Transfer{
@@ -16,5 +18,5 @@ pub fn main() !void {
         },
     };
 
-    try Demo.request(.create_transfers, transfers, Demo.on_create_transfers);
+    try demo.request(.create_transfers, transfers, demo.on_create_transfers);
 }

package/src/tigerbeetle/src/demo_04_create_transfers_two_phase_commit.zig

@@ -1,7 +1,9 @@
 const std = @import("std");
 
-usingnamespace @import("tigerbeetle.zig");
-usingnamespace @import("demo.zig");
+const tb = @import("tigerbeetle.zig");
+const demo = @import("demo.zig");
+
+const Transfer = tb.Transfer;
 
 pub fn main() !void {
     const transfers = [_]Transfer{
@@ -49,5 +51,5 @@ pub fn main() !void {
         },
     };
 
-    try Demo.request(.create_transfers, transfers, Demo.on_create_transfers);
+    try demo.request(.create_transfers, transfers, demo.on_create_transfers);
 }

package/src/tigerbeetle/src/demo_05_accept_transfers.zig

@@ -1,5 +1,7 @@
-usingnamespace @import("tigerbeetle.zig");
-usingnamespace @import("demo.zig");
+const tb = @import("tigerbeetle.zig");
+const demo = @import("demo.zig");
+
+const Commit = tb.Commit;
 
 pub fn main() !void {
     const commits = [_]Commit{
@@ -17,5 +19,5 @@ pub fn main() !void {
         },
     };
 
-    try Demo.request(.commit_transfers, commits, Demo.on_commit_transfers);
+    try demo.request(.commit_transfers, commits, demo.on_commit_transfers);
 }

package/src/tigerbeetle/src/demo_06_reject_transfers.zig

@@ -1,5 +1,7 @@
-usingnamespace @import("tigerbeetle.zig");
-usingnamespace @import("demo.zig");
+const tb = @import("tigerbeetle.zig");
+const demo = @import("demo.zig");
+
+const Commit = tb.Commit;
 
 pub fn main() !void {
     const commits = [_]Commit{
@@ -11,5 +13,5 @@ pub fn main() !void {
         },
     };
 
-    try Demo.request(.commit_transfers, commits, Demo.on_commit_transfers);
+    try demo.request(.commit_transfers, commits, demo.on_commit_transfers);
 }

package/src/tigerbeetle/src/demo_07_lookup_transfers.zig

@@ -1,8 +1,7 @@
-usingnamespace @import("tigerbeetle.zig");
-usingnamespace @import("demo.zig");
+const demo = @import("demo.zig");
 
 pub fn main() !void {
     const ids = [_]u128{ 1000, 1001, 1002 };
 
-    try Demo.request(.lookup_transfers, ids, Demo.on_lookup_transfers);
+    try demo.request(.lookup_transfers, ids, demo.on_lookup_transfers);
 }