From 8df224232c0caa64dfb6ada70ca197d4c03e9e89 Mon Sep 17 00:00:00 2001 From: Nathan Nichols Date: Tue, 28 Sep 2021 16:44:56 -0700 Subject: [PATCH] fix: remove undefined from generateFaucetWallet return type (#1676) * fix: remove undefined from generateFaucetWallet return type --- src/wallet/generateFaucetWallet.ts | 8 ++++---- test/integration/generateFaucetWallet.ts | 17 +++++++++-------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/wallet/generateFaucetWallet.ts b/src/wallet/generateFaucetWallet.ts index 0636a8a7..c70c8e36 100644 --- a/src/wallet/generateFaucetWallet.ts +++ b/src/wallet/generateFaucetWallet.ts @@ -36,7 +36,7 @@ const MAX_ATTEMPTS = 20 async function generateFaucetWallet( this: Client, wallet?: Wallet, -): Promise { +): Promise { if (!this.isConnected()) { throw new RippledError('Client not connected, cannot call faucet') } @@ -76,7 +76,7 @@ async function returnPromise( startingBalance: number, fundWallet: Wallet, postBody: Uint8Array, -): Promise { +): Promise { return new Promise((resolve, reject) => { const request = httpsRequest(options, (response) => { const chunks: Uint8Array[] = [] @@ -125,7 +125,7 @@ async function onEnd( client: Client, startingBalance: number, fundWallet: Wallet, - resolve: (wallet?: Wallet) => void, + resolve: (wallet: Wallet) => void, reject: (err: ErrorConstructor | Error | unknown) => void, ): Promise { const body = Buffer.concat(chunks).toString() @@ -159,7 +159,7 @@ async function processSuccessfulResponse( body: string, startingBalance: number, fundWallet: Wallet, - resolve: (wallet?: Wallet) => void, + resolve: (wallet: Wallet) => void, reject: (err: ErrorConstructor | Error | unknown) => void, ): Promise { // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment -- We know this is safe and correct diff --git a/test/integration/generateFaucetWallet.ts b/test/integration/generateFaucetWallet.ts index 9f866040..da5d83af 100644 --- a/test/integration/generateFaucetWallet.ts +++ b/test/integration/generateFaucetWallet.ts @@ -16,12 +16,12 @@ describe('generateFaucetWallet', function () { const wallet = await api.generateFaucetWallet() assert.notEqual(wallet, undefined) - assert(isValidClassicAddress(wallet?.classicAddress ?? '')) - assert(isValidXAddress(wallet?.getXAddress() ?? '')) + assert(isValidClassicAddress(wallet.classicAddress)) + assert(isValidXAddress(wallet.getXAddress())) const info = await api.request({ command: 'account_info', - account: wallet?.classicAddress ?? '', + account: wallet.classicAddress, }) assert.equal(info.result.account_data.Balance, '1000000000') @@ -29,8 +29,9 @@ describe('generateFaucetWallet', function () { const afterSent = await api.request({ command: 'account_info', - account: wallet?.classicAddress ?? '', + account: wallet.classicAddress, }) + assert.equal(afterSent.result.account_data.Balance, '2000000000') await api.disconnect() @@ -42,12 +43,12 @@ describe('generateFaucetWallet', function () { const wallet = await api.generateFaucetWallet() assert.notEqual(wallet, undefined) - assert(isValidClassicAddress(wallet?.classicAddress ?? '')) - assert(isValidXAddress(wallet?.getXAddress() ?? '')) + assert(isValidClassicAddress(wallet.classicAddress)) + assert(isValidXAddress(wallet.getXAddress())) const info = await api.request({ command: 'account_info', - account: wallet?.classicAddress ?? '', + account: wallet.classicAddress, }) assert.equal(info.result.account_data.Balance, '1000000000') @@ -55,7 +56,7 @@ describe('generateFaucetWallet', function () { const afterSent = await api.request({ command: 'account_info', - account: wallet?.classicAddress ?? '', + account: wallet.classicAddress, }) assert.equal(afterSent.result.account_data.Balance, '2000000000')