Skip to content
This repository has been archived by the owner on Oct 7, 2024. It is now read-only.

fix: use UuidStruct for IDs in the internap API #158

Merged
merged 1 commit into from
Oct 17, 2023
Merged

fix: use UuidStruct for IDs in the internap API #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/internal/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const GetAccountRequestStruct = object({
...CommonHeader,
method: literal('keyring_getAccount'),
params: object({
id: string(),
id: UuidStruct,
}),
});

Expand Down Expand Up @@ -70,7 +70,7 @@ export const FilterAccountChainsStruct = object({
...CommonHeader,
method: literal('keyring_filterAccountChains'),
params: object({
id: string(),
id: UuidStruct,
chains: array(string()),
}),
});
Expand Down Expand Up @@ -109,7 +109,7 @@ export const DeleteAccountRequestStruct = object({
...CommonHeader,
method: literal('keyring_deleteAccount'),
params: object({
id: string(),
id: UuidStruct,
}),
});

Expand All @@ -126,7 +126,7 @@ export const ExportAccountRequestStruct = object({
...CommonHeader,
method: literal('keyring_exportAccount'),
params: object({
id: string(),
id: UuidStruct,
}),
});

Expand Down Expand Up @@ -157,7 +157,7 @@ export const GetRequestRequestStruct = object({
...CommonHeader,
method: literal('keyring_getRequest'),
params: object({
id: string(),
id: UuidStruct,
}),
});

Expand Down Expand Up @@ -189,7 +189,7 @@ export const ApproveRequestRequestStruct = object({
...CommonHeader,
method: literal('keyring_approveRequest'),
params: object({
id: string(),
id: UuidStruct,
data: record(string(), JsonStruct),
}),
});
Expand All @@ -207,7 +207,7 @@ export const RejectRequestRequestStruct = object({
...CommonHeader,
method: literal('keyring_rejectRequest'),
params: object({
id: string(),
id: UuidStruct,
}),
});

Expand Down
19 changes: 13 additions & 6 deletions src/rpc-handler.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,13 +255,15 @@ describe('keyringRpcDispatcher', () => {
jsonrpc: '2.0',
id: '7c507ff0-365f-4de0-8cd5-eb83c30ebda4',
method: 'keyring_getRequest',
params: { id: 'request_id' },
params: { id: '523713e3-f751-4a20-8788-c7a0ea92bef5' },
};

keyring.getRequest.mockResolvedValue('GetRequest result');
const result = await handleKeyringRequest(keyring, request);

expect(keyring.getRequest).toHaveBeenCalledWith('request_id');
expect(keyring.getRequest).toHaveBeenCalledWith(
'523713e3-f751-4a20-8788-c7a0ea92bef5',
);
expect(result).toBe('GetRequest result');
});

Expand All @@ -270,7 +272,7 @@ describe('keyringRpcDispatcher', () => {
jsonrpc: '2.0',
id: '7c507ff0-365f-4de0-8cd5-eb83c30ebda4',
method: 'keyring_getRequest',
params: { id: 'request_id' },
params: { id: '0cea396f-54e4-4fa9-bf33-8419da668add' },
};

const partialKeyring: Keyring = {
Expand Down Expand Up @@ -309,7 +311,10 @@ describe('keyringRpcDispatcher', () => {
});

it('should call keyring_approveRequest', async () => {
const payload = { id: 'request_id', data: { signature: '0x0123' } };
const payload = {
id: '59db4ff8-8eb3-4a75-8ef3-b80aff8fa780',
data: { signature: '0x0123' },
};
const request: JsonRpcRequest = {
jsonrpc: '2.0',
id: '7c507ff0-365f-4de0-8cd5-eb83c30ebda4',
Expand Down Expand Up @@ -362,13 +367,15 @@ describe('keyringRpcDispatcher', () => {
jsonrpc: '2.0',
id: '7c507ff0-365f-4de0-8cd5-eb83c30ebda4',
method: 'keyring_rejectRequest',
params: { id: 'request_id' },
params: { id: 'e5efe6d2-b703-4740-baf5-eb0fc47ba4ad' },
};

keyring.rejectRequest.mockResolvedValue('RejectRequest result');
const result = await handleKeyringRequest(keyring, request);

expect(keyring.rejectRequest).toHaveBeenCalledWith('request_id');
expect(keyring.rejectRequest).toHaveBeenCalledWith(
'e5efe6d2-b703-4740-baf5-eb0fc47ba4ad',
);
expect(result).toBe('RejectRequest result');
});

Expand Down