fix param/import issues

Author: spiral-ladder

bindings/napi/metrics.zig

@@ -28,7 +28,7 @@ pub fn init() !void {
 pub fn registerLocalValidator(index: js.Number) !void {
     const value = try index.toI64();
     if (value < 0) return error.InvalidValidatorIndex;
-    try validator_monitor.get().registerLocalValidator(napi_io.get(), @intCast(value));
+    try validator_monitor.get().registerLocalValidator(@intCast(value));
 }
 
 /// JS: metrics.unregisterLocalValidator(index) → void
@@ -37,7 +37,7 @@ pub fn registerLocalValidator(index: js.Number) !void {
 pub fn unregisterLocalValidator(index: js.Number) !void {
     const value = try index.toI64();
     if (value < 0) return error.InvalidValidatorIndex;
-    validator_monitor.get().unregisterLocalValidator(napi_io.get(), @intCast(value));
+    validator_monitor.get().unregisterLocalValidator(@intCast(value));
 }
 
 /// JS: metrics.scrapeMetrics() → string

src/state_transition/ValidatorMonitor.zig

@@ -37,14 +37,14 @@ pub fn deinit(self: *ValidatorMonitor) void {
 /// Adds a validator to the list of monitored validators.
 ///
 /// Registering an already-monitored validator is a no-op.
-pub fn registerLocalValidator(self: *ValidatorMonitor, io: std.Io, index: ValidatorIndex) !void {
+pub fn registerLocalValidator(self: *ValidatorMonitor, index: ValidatorIndex) !void {
     try self.validators.put(self.allocator, index, {});
 }
 
 /// Prunes a validator from the list of monitored validators.
 ///
 /// Unregistering an unknown validator is a no-op.
-pub fn unregisterLocalValidator(self: *ValidatorMonitor, io: std.Io, index: ValidatorIndex) void {
+pub fn unregisterLocalValidator(self: *ValidatorMonitor, index: ValidatorIndex) void {
     _ = self.validators.swapRemove(index);
 }
 
@@ -120,8 +120,8 @@ test "registerValidatorStatuses records metrics" {
 
     var monitor = ValidatorMonitor.init(allocator);
     defer monitor.deinit();
-    try monitor.registerLocalValidator(std.testing.io, 0);
-    try monitor.registerLocalValidator(std.testing.io, 1);
+    try monitor.registerLocalValidator(0);
+    try monitor.registerLocalValidator(1);
 
     const flags = [_]u8{
         attester_status.FLAG_PREV_SOURCE_ATTESTER |
@@ -182,13 +182,13 @@ test "registerValidatorStatuses guards" {
     const balances = [_]u64{ 32_000_000_000, 31_000_000_000, 33_000_000_000 };
 
     // epoch 0 is registered but has no previous epoch activity
-    monitor.registerValidatorStatuses(std.testing.io, 0, &flags, &balances);
+    monitor.registerValidatorStatuses(0, &flags, &balances);
     try std.testing.expectEqual(@as(?Epoch, 0), monitor.last_registered_status_epoch);
 
-    monitor.registerValidatorStatuses(std.testing.io, 1, &flags, &balances);
+    monitor.registerValidatorStatuses(1, &flags, &balances);
     try std.testing.expectEqual(@as(?Epoch, 1), monitor.last_registered_status_epoch);
 
     // same epoch twice is a no-op
-    monitor.registerValidatorStatuses(std.testing.io, 1, &flags, &balances);
+    monitor.registerValidatorStatuses(1, &flags, &balances);
     try std.testing.expectEqual(@as(?Epoch, 1), monitor.last_registered_status_epoch);
 }

src/state_transition/state_transition.zig

@@ -23,7 +23,7 @@ const processEpoch = @import("epoch/process_epoch.zig").processEpoch;
 const computeEpochAtSlot = @import("utils/epoch.zig").computeEpochAtSlot;
 const processSlot = @import("slot/process_slot.zig").processSlot;
 const ValidatorMonitor = @import("ValidatorMonitor.zig");
-const deinitReusedEpochTransitionCache = @import("cache/epoch_transition_cache.zig").deinitReusedEpochTransitionCache;
+pub const deinitReusedEpochTransitionCache = @import("cache/epoch_transition_cache.zig").deinitReusedEpochTransitionCache;
 const upgradeStateToAltair = @import("slot/upgrade_state_to_altair.zig").upgradeStateToAltair;
 const upgradeStateToBellatrix = @import("slot/upgrade_state_to_bellatrix.zig").upgradeStateToBellatrix;
 const upgradeStateToCapella = @import("slot/upgrade_state_to_capella.zig").upgradeStateToCapella;