update tests for error handling

Author: spypsy

yarn-project/validator-client/src/key_store/ha_key_store.test.ts

@@ -179,24 +179,22 @@ describe('HAKeyStore', () => {
       );
     });
 
-    it('should return null when duty was already signed', async () => {
-      mockHASigner.signWithProtection.mockRejectedValue(
-        new DutyAlreadySignedError(SlotNumber(100), DutyType.BLOCK_PROPOSAL, 'other-node'),
-      );
-
-      const result = await haKeyStore.signMessageWithAddress(VALIDATOR_ADDRESS, SIGNING_ROOT, context);
-
-      expect(result).toBeNull();
-    });
+    it('should throw DutyAlreadySignedError when duty was already signed', async () => {
+      const error = new DutyAlreadySignedError(SlotNumber(100), DutyType.BLOCK_PROPOSAL, 'other-node');
+      mockHASigner.signWithProtection.mockRejectedValue(error);
 
-    it('should return null when slashing protection triggers', async () => {
-      mockHASigner.signWithProtection.mockRejectedValue(
-        new SlashingProtectionError(SlotNumber(100), DutyType.BLOCK_PROPOSAL, '0xexisting', '0xattempted'),
+      await expect(haKeyStore.signMessageWithAddress(VALIDATOR_ADDRESS, SIGNING_ROOT, context)).rejects.toThrow(
+        DutyAlreadySignedError,
       );
+    });
 
-      const result = await haKeyStore.signMessageWithAddress(VALIDATOR_ADDRESS, SIGNING_ROOT, context);
+    it('should throw SlashingProtectionError when slashing protection triggers', async () => {
+      const error = new SlashingProtectionError(SlotNumber(100), DutyType.BLOCK_PROPOSAL, '0xexisting', '0xattempted');
+      mockHASigner.signWithProtection.mockRejectedValue(error);
 
-      expect(result).toBeNull();
+      await expect(haKeyStore.signMessageWithAddress(VALIDATOR_ADDRESS, SIGNING_ROOT, context)).rejects.toThrow(
+        SlashingProtectionError,
+      );
     });
 
     it('should re-throw unexpected errors', async () => {
@@ -270,24 +268,22 @@ describe('HAKeyStore', () => {
       );
     });
 
-    it('should return null when duty was already signed', async () => {
-      mockHASigner.signWithProtection.mockRejectedValue(
-        new DutyAlreadySignedError(SlotNumber(100), DutyType.ATTESTATION, 'other-node'),
-      );
+    it('should throw DutyAlreadySignedError when duty was already signed', async () => {
+      const error = new DutyAlreadySignedError(SlotNumber(100), DutyType.ATTESTATION, 'other-node');
+      mockHASigner.signWithProtection.mockRejectedValue(error);
 
-      const result = await haKeyStore.signTypedDataWithAddress(VALIDATOR_ADDRESS, mockTypedData, context);
-
-      expect(result).toBeNull();
-    });
-
-    it('should return null when slashing protection triggers', async () => {
-      mockHASigner.signWithProtection.mockRejectedValue(
-        new SlashingProtectionError(SlotNumber(100), DutyType.ATTESTATION, '0xexisting', '0xattempted'),
+      await expect(haKeyStore.signTypedDataWithAddress(VALIDATOR_ADDRESS, mockTypedData, context)).rejects.toThrow(
+        DutyAlreadySignedError,
       );
+    });
 
-      const result = await haKeyStore.signTypedDataWithAddress(VALIDATOR_ADDRESS, mockTypedData, context);
+    it('should throw SlashingProtectionError when slashing protection triggers', async () => {
+      const error = new SlashingProtectionError(SlotNumber(100), DutyType.ATTESTATION, '0xexisting', '0xattempted');
+      mockHASigner.signWithProtection.mockRejectedValue(error);
 
-      expect(result).toBeNull();
+      await expect(haKeyStore.signTypedDataWithAddress(VALIDATOR_ADDRESS, mockTypedData, context)).rejects.toThrow(
+        SlashingProtectionError,
+      );
     });
 
     it('should call base key store signTypedDataWithAddress through callback', async () => {

yarn-project/validator-client/src/key_store/ha_key_store.ts

@@ -36,7 +36,7 @@ import type { ExtendedValidatorKeyStore } from './interface.js';
  * // Without context - signs directly (no HA protection)
  * const sig = await haKeyStore.signMessageWithAddress(addr, msg);
  *
- * // With context - HA protected, returns null if already signed
+ * // With context - HA protected, throws DutyAlreadySignedError if already signed
  * const result = await haKeyStore.signMessageWithAddress(addr, msg, {
  *   slot: 100n,
  *   blockNumber: 50n,
@@ -101,7 +101,8 @@ export class HAKeyStore implements ExtendedValidatorKeyStore {
   /**
    * Sign typed data with a specific address.
    * When context is provided and HA is enabled, coordinates across nodes to prevent double-signing.
-   * Returns null if the duty was already signed by another node.
+   * @throws DutyAlreadySignedError if the duty was already signed by another node
+   * @throws SlashingProtectionError if attempting to sign different data for the same slot
    */
   async signTypedDataWithAddress(
     address: EthAddress,
@@ -133,7 +134,8 @@ export class HAKeyStore implements ExtendedValidatorKeyStore {
   /**
    * Sign a message with a specific address.
    * When context is provided and HA is enabled, coordinates across nodes to prevent double-signing.
-   * Returns null if the duty was already signed by another node.
+   * @throws DutyAlreadySignedError if the duty was already signed by another node
+   * @throws SlashingProtectionError if attempting to sign different data for the same slot
    */
   async signMessageWithAddress(address: EthAddress, message: Buffer32, context?: SigningContext): Promise<Signature> {
     // No context or HA disabled - sign directly
@@ -194,8 +196,9 @@ export class HAKeyStore implements ExtendedValidatorKeyStore {
   }
 
   /**
-   * Handle signing errors from the HA signer.
-   * Returns null for expected HA errors (already signed), re-throws unexpected errors.
+   * Log signing errors from the HA signer.
+   * Logs expected HA errors (already signed) at appropriate levels.
+   * Re-throws unexpected errors.
    */
   private logSigningError(error: unknown, context: SigningContext) {
     if (error instanceof DutyAlreadySignedError) {