From f3d00d3e57835afa4db0708510041aed33ab3346 Mon Sep 17 00:00:00 2001 From: CJ42 Date: Wed, 15 May 2024 14:45:31 +0100 Subject: [PATCH] test(wip): refactor tests to for ABI `bytes[]` --- src/index.test.ts | 15 ++++++--------- src/lib/getSchemaElement.test.ts | 10 +++++----- test/mockProviders.ts | 6 ++---- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/index.test.ts b/src/index.test.ts index 25e2c9ca..ce78de50 100644 --- a/src/index.test.ts +++ b/src/index.test.ts @@ -507,8 +507,7 @@ describe('Running @erc725/erc725.js tests...', () => { returnData: [ { key: '0x5ef83ad9559033e6e941db7d7c495acdce616347d28e90c7ce47cbfcfcad3bc5', - value: - '0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000', + value: '0x', }, ], }, @@ -544,17 +543,15 @@ describe('Running @erc725/erc725.js tests...', () => { { key: '0x48643a15ac5407a175674ab0f8c92df5ae90694dac72ebf0a058fb2599e3b06a', // MyURL value: - '0x0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000035697066733a2f2f516d6245724b6833466a73415236596a73546a485a4e6d364d6344703661527438324674637639414a4a765a62640000000000000000000000', + '0x697066733a2f2f516d6245724b6833466a73415236596a73546a485a4e6d364d6344703661527438324674637639414a4a765a62640000000000000000000000', }, { key: '0x74ac2555c10b9349e78f0000b74a88c43bcf691bd7a851f6603cb1868f6fc147', // LSP12IssuedAssetsMap:b74a88C43BCf691bd7A851f6603cb1868f6fc147 - value: - '0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000141098603b193d276f5fa176cc02007b609f9dae6b000000000000000000000000', + value: '0x1098603b193d276f5fa176cc02007b609f9dae6b', }, { key: '0xeafec4d89fa9619884b600005ef83ad9559033e6e941db7d7c495acdce616347', // SupportedStandards:LSP3Profile - value: - '0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000045ef83ad900000000000000000000000000000000000000000000000000000000', + value: '0x5ef83ad9', }, ], }, @@ -580,8 +577,8 @@ describe('Running @erc725/erc725.js tests...', () => { name: 'LSP12IssuedAssetsMap:
', key: '0x74ac2555c10b9349e78f0000
', keyType: 'Mapping', - valueContent: 'Address', - valueType: 'address', + valueType: '(bytes4,uint128)', + valueContent: '(Bytes4,Number)', }, ], '0x24464DbA7e7781a21eD86133Ebe88Eb9C0762620', // result is mocked so we can use any address diff --git a/src/lib/getSchemaElement.test.ts b/src/lib/getSchemaElement.test.ts index c038d8f3..0469391c 100644 --- a/src/lib/getSchemaElement.test.ts +++ b/src/lib/getSchemaElement.test.ts @@ -42,15 +42,15 @@ describe('getSchemaElement', () => { name: 'LSP12IssuedAssetsMap:
', key: '0x74ac2555c10b9349e78f0000
', keyType: 'Mapping', - valueType: 'bytes', - valueContent: 'Mixed', + valueType: '(bytes4,uint128)', + valueContent: '(Bytes4,Number)', }, { name: 'ARandomKey', key: '0x7cf0c8053453d0353fdbad6a48e68966b35dd13cb3a62e7b75009dc5035b80c0', keyType: 'Singleton', - valueContent: 'JSONURL', valueType: 'bytes', + valueContent: 'JSONURL', }, ]; @@ -71,8 +71,8 @@ describe('getSchemaElement', () => { name: 'LSP12IssuedAssetsMap:2ab3903c6e5815f4bc2a95b7f3b22b6a289bacac', key: '0x74ac2555c10b9349e78f00002ab3903c6e5815f4bc2a95b7f3b22b6a289bacac', keyType: 'Mapping', - valueType: 'bytes', - valueContent: 'Mixed', + valueType: '(bytes4,uint128)', + valueContent: '(Bytes4,Number)', }, ); }); diff --git a/test/mockProviders.ts b/test/mockProviders.ts index 79d007c9..ea8adb51 100644 --- a/test/mockProviders.ts +++ b/test/mockProviders.ts @@ -100,15 +100,13 @@ export class HttpProvider { const foundElement = this.returnData.find((element) => { return element.key === requestedKey; }); - return foundElement - ? abiCoder.decodeParameter('bytes[]', foundElement.value)[0] // we need to decode the keys as the values provided to the mock are already bytes[] encoded (as it was made for "single item" request mode) - : '0x'; + return foundElement ? foundElement.value : '0x'; }); results.push({ jsonrpc: '2.0', id: payload[index].id, - result: abiCoder.encodeParameter('bytes[]', decodedResult), + result: decodedResult, }); } break;