From cab88911fed08d1abffbcaa80ced716579048585 Mon Sep 17 00:00:00 2001 From: Chris Duncan Date: Mon, 22 Sep 2025 08:16:20 -0700 Subject: [PATCH] Rename method to avoid conflict with built-in Function class `call` method. --- src/lib/account/refresh.ts | 6 +++--- src/lib/ledger.ts | 2 +- src/lib/rpc.ts | 2 +- src/lib/wallet/refresh.ts | 10 +++++----- src/lib/wallet/unopened.ts | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/lib/account/refresh.ts b/src/lib/account/refresh.ts index 713dc95..4280e6f 100644 --- a/src/lib/account/refresh.ts +++ b/src/lib/account/refresh.ts @@ -20,7 +20,7 @@ export async function _refresh (account: Account, rpc: unknown): Promise { representative: true, weight: true } - const resAccountInfo = await rpc.call('account_info', reqAccountInfo) + const resAccountInfo = await rpc.post('account_info', reqAccountInfo) if (resAccountInfo.frontier == null) { throw new Error('Account not found') } @@ -30,7 +30,7 @@ export async function _refresh (account: Account, rpc: unknown): Promise { json_block: true, hash: account.confirmed_frontier } - const { contents: confirmedFrontierContents, subtype: confirmedFrontierSubtype } = await rpc.call('block_info', reqConfirmedFrontier) + const { contents: confirmedFrontierContents, subtype: confirmedFrontierSubtype } = await rpc.post('block_info', reqConfirmedFrontier) const confirmedFrontierBlock = new Block(confirmedFrontierContents.account, confirmedFrontierContents.balance, confirmedFrontierContents.previous, confirmedFrontierContents.representative) if (typeof confirmedFrontierBlock[confirmedFrontierSubtype] !== 'function') { throw new TypeError('Unknown subtype of confirmed frontier block', { cause: confirmedFrontierSubtype }) @@ -42,7 +42,7 @@ export async function _refresh (account: Account, rpc: unknown): Promise { json_block: true, hash: account.frontier } - const { contents: frontierContents, subtype: frontierSubtype } = await rpc.call('block_info', reqFrontier) + const { contents: frontierContents, subtype: frontierSubtype } = await rpc.post('block_info', reqFrontier) const frontierBlock = new Block(frontierContents.account, frontierContents.balance, frontierContents.previous, frontierContents.representative) if (typeof frontierBlock[frontierSubtype] !== 'function') { throw new TypeError('Unknown subtype of frontier block', { cause: frontierSubtype }) diff --git a/src/lib/ledger.ts b/src/lib/ledger.ts index 8c83c5f..b8fd1cb 100644 --- a/src/lib/ledger.ts +++ b/src/lib/ledger.ts @@ -290,7 +290,7 @@ export class Ledger { 'json_block': 'true', 'hash': input } - const res = await node.call('block_info', data) + const res = await node.post('block_info', data) if (!res || !res.ok || res.error) { throw new Error(`Unable to fetch block info`, res) } diff --git a/src/lib/rpc.ts b/src/lib/rpc.ts index 9b361e2..404c5a1 100644 --- a/src/lib/rpc.ts +++ b/src/lib/rpc.ts @@ -29,7 +29,7 @@ export class Rpc { * @param {object} [data] - JSON to send to the node as defined by the action * @returns {Promise} JSON-formatted RPC results from the node */ - async call (action: string, data?: { [key: string]: unknown }): Promise { + async post (action: string, data?: { [key: string]: unknown }): Promise { var process: any = process || null this.#validate(action) const headers: { [key: string]: string } = {} diff --git a/src/lib/wallet/refresh.ts b/src/lib/wallet/refresh.ts index 6c7a6dd..fb4ea62 100644 --- a/src/lib/wallet/refresh.ts +++ b/src/lib/wallet/refresh.ts @@ -40,16 +40,16 @@ export async function _refresh (wallet: Wallet, rpc: unknown, from: unknown, to: json_block: true, accounts: addresses } - const { balances } = await rpc.call('accounts_balances', data) as { balances: { [address: string]: { balance: string, receivable: string } } } - const { frontiers } = await rpc.call('accounts_frontiers', data) as { frontiers: { [address: string]: string } } - const { representatives } = await rpc.call('accounts_representatives', data) as { representatives: { [address: string]: string } } - const { blocks } = await rpc.call('blocks_info', { json_block: true, hashes: Object.values(frontiers) }) as BlockInfo + const { balances } = await rpc.post('accounts_balances', data) as { balances: { [address: string]: { balance: string, receivable: string } } } + const { frontiers } = await rpc.post('accounts_frontiers', data) as { frontiers: { [address: string]: string } } + const { representatives } = await rpc.post('accounts_representatives', data) as { representatives: { [address: string]: string } } + const { blocks } = await rpc.post('blocks_info', { json_block: true, hashes: Object.values(frontiers) }) as BlockInfo for (const [index, account] of accounts) { account.balance = balances[account.address]?.balance account.receivable = balances[account.address]?.receivable account.representative = representatives?.[account.address] if (frontiers[account.address] != null) { - account.representative ??= (await rpc.call('account_representative', { account: account.address }))?.representative + account.representative ??= (await rpc.post('account_representative', { account: account.address }))?.representative account.frontier = frontiers[account.address] const { subtype, contents: { balance, link, previous, representative, signature } } = blocks[account.frontier] const frontierBlock = new Block(account, balance, previous, representative) diff --git a/src/lib/wallet/unopened.ts b/src/lib/wallet/unopened.ts index c2cecdc..96cd556 100644 --- a/src/lib/wallet/unopened.ts +++ b/src/lib/wallet/unopened.ts @@ -25,7 +25,7 @@ export async function _unopened (wallet: Wallet, rpc: unknown, batchSize: unknow const data = { "accounts": addresses } - const { errors } = await rpc.call('accounts_frontiers', data) + const { errors } = await rpc.post('accounts_frontiers', data) if (errors != null) { for (const a of addresses) { const value = errors[a] -- 2.47.3