Skip to content

Commit 89c00ee

Browse files
committed
fix: dmk naming
1 parent b32e758 commit 89c00ee

3 files changed

Lines changed: 31 additions & 27 deletions

File tree

packages/hw-wallet-sdk/src/dmk-error-mappings.test.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {
22
DMK_ERROR_MAPPINGS,
33
DMK_ERROR_TAG_MAPPINGS,
44
DMK_MESSAGE_PATTERNS,
5-
getDMKErrorFromTag,
5+
getDmkErrorFromTag,
66
} from './dmk-error-mappings';
77
import type { ErrorMapping } from './hardware-error-mappings';
88
import { Category, ErrorCode, Severity } from './hardware-errors-enums';
@@ -164,13 +164,13 @@ describe('DMK_MESSAGE_PATTERNS', () => {
164164
});
165165
});
166166

167-
describe('getDMKErrorFromTag', () => {
167+
describe('getDmkErrorFromTag', () => {
168168
it('returns DeviceDisconnected for DeviceSessionNotFound tag', () => {
169169
const error = {
170170
_tag: 'DeviceSessionNotFound',
171171
message: 'Session not found',
172172
};
173-
expect(getDMKErrorFromTag(error)).toStrictEqual({
173+
expect(getDmkErrorFromTag(error)).toStrictEqual({
174174
code: ErrorCode.DeviceDisconnected,
175175
tag: 'DeviceSessionNotFound',
176176
});
@@ -181,7 +181,7 @@ describe('getDMKErrorFromTag', () => {
181181
_tag: 'ConnectionOpeningError',
182182
message: 'Failed to open connection',
183183
};
184-
expect(getDMKErrorFromTag(error)).toStrictEqual({
184+
expect(getDmkErrorFromTag(error)).toStrictEqual({
185185
code: ErrorCode.BluetoothConnectionFailed,
186186
tag: 'ConnectionOpeningError',
187187
});
@@ -192,7 +192,7 @@ describe('getDMKErrorFromTag', () => {
192192
_tag: 'DeviceDisconnectedWhileSendingError',
193193
message: 'Disconnected',
194194
};
195-
expect(getDMKErrorFromTag(error)).toStrictEqual({
195+
expect(getDmkErrorFromTag(error)).toStrictEqual({
196196
code: ErrorCode.DeviceDisconnected,
197197
tag: 'DeviceDisconnectedWhileSendingError',
198198
});
@@ -203,7 +203,7 @@ describe('getDMKErrorFromTag', () => {
203203
_tag: 'DeviceLockedError',
204204
message: 'Device is locked',
205205
};
206-
expect(getDMKErrorFromTag(error)).toStrictEqual({
206+
expect(getDmkErrorFromTag(error)).toStrictEqual({
207207
code: ErrorCode.AuthenticationDeviceLocked,
208208
tag: 'DeviceLockedError',
209209
});
@@ -214,43 +214,43 @@ describe('getDMKErrorFromTag', () => {
214214
_tag: 'SessionRefresherError',
215215
message: 'Session refresh failed',
216216
};
217-
expect(getDMKErrorFromTag(error)).toStrictEqual({
217+
expect(getDmkErrorFromTag(error)).toStrictEqual({
218218
code: ErrorCode.DeviceDisconnected,
219219
tag: 'SessionRefresherError',
220220
});
221221
});
222222

223223
it('returns null when _tag is not a recognised DMK tag', () => {
224224
const error = { _tag: 'SomeUnknownTag', message: 'Unknown' };
225-
expect(getDMKErrorFromTag(error)).toBeNull();
225+
expect(getDmkErrorFromTag(error)).toBeNull();
226226
});
227227

228228
it('returns null when _tag is missing', () => {
229229
const error = { message: 'No tag here' };
230-
expect(getDMKErrorFromTag(error)).toBeNull();
230+
expect(getDmkErrorFromTag(error)).toBeNull();
231231
});
232232

233233
it('returns null when _tag is not a string', () => {
234234
const error = { _tag: 42, message: 'Numeric tag' };
235-
expect(getDMKErrorFromTag(error)).toBeNull();
235+
expect(getDmkErrorFromTag(error)).toBeNull();
236236
});
237237

238238
it('returns null for null input', () => {
239-
expect(getDMKErrorFromTag(null)).toBeNull();
239+
expect(getDmkErrorFromTag(null)).toBeNull();
240240
});
241241

242242
it('returns null for undefined input', () => {
243-
expect(getDMKErrorFromTag(undefined)).toBeNull();
243+
expect(getDmkErrorFromTag(undefined)).toBeNull();
244244
});
245245

246246
it('returns null for primitive input', () => {
247-
expect(getDMKErrorFromTag('string error')).toBeNull();
248-
expect(getDMKErrorFromTag(42)).toBeNull();
247+
expect(getDmkErrorFromTag('string error')).toBeNull();
248+
expect(getDmkErrorFromTag(42)).toBeNull();
249249
});
250250

251251
it('returns null for empty string _tag', () => {
252252
const error = { _tag: '', message: 'Empty tag' };
253-
expect(getDMKErrorFromTag(error)).toBeNull();
253+
expect(getDmkErrorFromTag(error)).toBeNull();
254254
});
255255

256256
it('handles errors with additional properties beyond _tag', () => {
@@ -260,7 +260,7 @@ describe('getDMKErrorFromTag', () => {
260260
name: 'SomeError',
261261
stack: 'trace...',
262262
};
263-
expect(getDMKErrorFromTag(error)).toStrictEqual({
263+
expect(getDmkErrorFromTag(error)).toStrictEqual({
264264
code: ErrorCode.AuthenticationDeviceLocked,
265265
tag: 'DeviceLockedError',
266266
});

packages/keyring-eth-ledger-bridge/src/dmk/ledger-dmk-bridge.test.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,12 @@ describe('LedgerDmkBridge', () => {
148148
bridge = new LedgerDmkBridge({ transportFactory: mockTransportFactory });
149149
});
150150

151-
afterEach(() => {
152-
jest.clearAllMocks();
151+
afterEach(async () => {
152+
// Cancel any pending session-monitoring retry timers before mocks are
153+
// reset. With `resetMocks: true`, an orphaned retry would call
154+
// `getDeviceSessionState()` after it returns `undefined`, crashing on `.pipe`.
155+
await bridge.destroy();
156+
jest.useRealTimers();
153157
});
154158

155159
describe('constructor', () => {

packages/keyring-eth-ledger-bridge/src/errors.test.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
} from '@metamask/hw-wallet-sdk';
55

66
import {
7-
createDMKError,
7+
createDmkError,
88
createLedgerError,
99
createKeyringStateError,
1010
isKnownLedgerError,
@@ -123,32 +123,32 @@ describe('createKeyringStateError', () => {
123123
});
124124
});
125125

126-
describe('createDMKError', () => {
126+
describe('createDmkError', () => {
127127
describe('known DMK tags', () => {
128128
it('creates HardwareWalletError for DeviceSessionNotFound', () => {
129-
const error = createDMKError('DeviceSessionNotFound');
129+
const error = createDmkError('DeviceSessionNotFound');
130130

131131
expect(error).toBeInstanceOf(HardwareWalletError);
132132
expect(error.code).toBe(ErrorCodeEnum.DeviceDisconnected);
133133
expect(error.message).toBe('DMK device session not found');
134134
});
135135

136136
it('creates HardwareWalletError for DeviceLockedError', () => {
137-
const error = createDMKError('DeviceLockedError');
137+
const error = createDmkError('DeviceLockedError');
138138

139139
expect(error).toBeInstanceOf(HardwareWalletError);
140140
expect(error.code).toBe(ErrorCodeEnum.AuthenticationDeviceLocked);
141141
});
142142

143143
it('creates HardwareWalletError for ConnectionOpeningError', () => {
144-
const error = createDMKError('ConnectionOpeningError');
144+
const error = createDmkError('ConnectionOpeningError');
145145

146146
expect(error).toBeInstanceOf(HardwareWalletError);
147147
expect(error.code).toBe(ErrorCodeEnum.BluetoothConnectionFailed);
148148
});
149149

150150
it('includes context in message when provided', () => {
151-
const error = createDMKError(
151+
const error = createDmkError(
152152
'DeviceSessionNotFound',
153153
'during signTransaction',
154154
);
@@ -159,7 +159,7 @@ describe('createDMKError', () => {
159159
});
160160

161161
it('uses the mapping userMessage', () => {
162-
const error = createDMKError('DeviceLockedError');
162+
const error = createDmkError('DeviceLockedError');
163163

164164
expect(error.userMessage).toBe(
165165
'Please unlock your Ledger device to continue.',
@@ -169,15 +169,15 @@ describe('createDMKError', () => {
169169

170170
describe('unknown DMK tags', () => {
171171
it('creates fallback error for unknown tag without context', () => {
172-
const error = createDMKError('SomeUnknownTag');
172+
const error = createDmkError('SomeUnknownTag');
173173

174174
expect(error).toBeInstanceOf(HardwareWalletError);
175175
expect(error.code).toBe(ErrorCodeEnum.Unknown);
176176
expect(error.message).toBe('Unknown DMK error: SomeUnknownTag');
177177
});
178178

179179
it('creates fallback error for unknown tag with context', () => {
180-
const error = createDMKError('SomeUnknownTag', 'while connecting');
180+
const error = createDmkError('SomeUnknownTag', 'while connecting');
181181

182182
expect(error.message).toBe(
183183
'Unknown DMK error: SomeUnknownTag (while connecting)',

0 commit comments

Comments
 (0)