Skip to content

Commit d1671fa

Browse files
authored
fix: use underscore for all event names and adjust tests + trigger (#1330)
fix: use underscore for all event names and adjust tests + trigger new event for session changes
1 parent 84ebd18 commit d1671fa

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

packages/sdk-multichain/src/connect.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ function testSuite<T extends MultiChainFNOptions>({ platform, createSDK, options
101101
t.expect(sdk.storage).toBeDefined();
102102
t.expect(mockedData.mockTransport.connect).toHaveBeenCalled();
103103
t.expect(mockMultichainClient.getSession).toHaveBeenCalled();
104-
t.expect(mockedData.emitSpy).toHaveBeenCalledWith('sessionChanged', mockSessionData);
104+
t.expect(mockedData.emitSpy).toHaveBeenCalledWith('session_changed', mockSessionData);
105105

106106
mockedData.mockTransport.connect.mockReset();
107107

packages/sdk-multichain/src/domain/events/types/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { SessionData } from '@metamask/multichain-api-client';
22

33
export type SDKEvents = {
44
display_uri: [evt: string];
5-
sessionChanged: [evt: SessionData | undefined];
5+
session_changed: [evt: SessionData | undefined];
66
};
77

88
export type EventTypes = SDKEvents;

packages/sdk-multichain/src/init.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ function testSuite<T extends MultiChainFNOptions>({ platform, createSDK, options
117117
t.expect(sdk.state).toBe('loaded');
118118

119119
// Check that sessionChanged event was emitted with the expected session data during initialization
120-
t.expect(emitSpy).toHaveBeenCalledWith('sessionChanged', mockSessionData);
120+
t.expect(emitSpy).toHaveBeenCalledWith('session_changed', mockSessionData);
121121

122122
// Restore the spy
123123
emitSpy.mockRestore();

packages/sdk-multichain/src/multichain/index.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ export class MultichainSDK extends MultichainCore {
137137
//TODO: We also should report this as an issue, sessions with no sessionScopes should be undefined, is there any reason
138138
//why the object comes empty?
139139
if (Object.keys(session?.sessionScopes ?? {}).length > 0) {
140-
this.emit('sessionChanged', session);
140+
this.emit('session_changed', session);
141141
} else {
142-
this.emit('sessionChanged', undefined);
142+
this.emit('session_changed', undefined);
143143
}
144144
}
145145
}
@@ -172,7 +172,7 @@ export class MultichainSDK extends MultichainCore {
172172
this.listeners.push(listener);
173173
const session = await this.getCurrentSession();
174174
if (Object.keys(session?.sessionScopes ?? {}).length > 0) {
175-
this.emit('sessionChanged', session);
175+
this.emit('session_changed', session);
176176
}
177177
}
178178
}
@@ -218,7 +218,7 @@ export class MultichainSDK extends MultichainCore {
218218
const isSameScopes = currentScopes.every((scope) => proposedScopes.includes(scope)) && proposedScopes.every((scope) => currentScopes.includes(scope));
219219

220220
if (isSameScopes) {
221-
this.emit('sessionChanged', session);
221+
this.emit('session_changed', session);
222222
return;
223223
}
224224

@@ -231,7 +231,7 @@ export class MultichainSDK extends MultichainCore {
231231
const sessionRequest: CreateSessionParams<RPCAPI> = { optionalScopes };
232232

233233
const newSession = await this.provider.createSession(sessionRequest);
234-
this.emit('sessionChanged', newSession);
234+
this.emit('session_changed', newSession);
235235
}
236236

237237
private getTransportForPlatformType(platformType: PlatformType) {
@@ -314,7 +314,7 @@ export class MultichainSDK extends MultichainCore {
314314
__transport = undefined;
315315
__provider = undefined;
316316

317-
this.emit('sessionChanged', undefined);
317+
this.emit('session_changed', undefined);
318318
this.listeners = [];
319319

320320
await this.storage.removeTransport();

packages/sdk-multichain/src/session.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ function testSuite<T extends MultiChainFNOptions>({ platform, createSDK, options
6363
t.expect(sdk.storage).toBeDefined();
6464
t.expect(mockedData.mockTransport.connect).toHaveBeenCalled();
6565
t.expect(mockMultichainClient.getSession).toHaveBeenCalled();
66-
t.expect(mockedData.emitSpy).toHaveBeenCalledWith('sessionChanged', mockSessionData);
66+
t.expect(mockedData.emitSpy).toHaveBeenCalledWith('session_changed', mockSessionData);
6767

6868
const mockedSessionUpgradeData: SessionData = {
6969
...mockSessionData,
@@ -88,7 +88,7 @@ function testSuite<T extends MultiChainFNOptions>({ platform, createSDK, options
8888
optionalScopes: mockedSessionUpgradeData.sessionScopes,
8989
});
9090
// sessionChanged should be emitted with the full session data returned from createSession, not just the scopes
91-
t.expect(mockedData.emitSpy).toHaveBeenCalledWith('sessionChanged', mockedSessionUpgradeData);
91+
t.expect(mockedData.emitSpy).toHaveBeenCalledWith('session_changed', mockedSessionUpgradeData);
9292
});
9393

9494
t.it(`${platform} should handle session retrieval when no session exists`, async () => {

0 commit comments

Comments
 (0)