Simplify the error check

packages/xrpl/src/Wallet/fundWallet.ts

@@ -1,3 +1,4 @@
+/* eslint-disable max-lines -- Relatively simple logic, but verbose */
 import { IncomingMessage } from 'http'
 import { request as httpsRequest, RequestOptions } from 'https'
 
@@ -29,7 +30,8 @@ const INTERVAL_SECONDS = 1
 const MAX_ATTEMPTS = 20
 
 /**
- * Generates a random wallet with some amount of XRP (usually 1000 XRP).
+ * Only usable on test networks.
+ * Fills this wallet with some amount of XRP (usually 1000 XRP).
  *
  * @example
  * ```typescript
@@ -41,15 +43,17 @@ const MAX_ATTEMPTS = 20
  * @param this - Client.
  * @param wallet - An existing XRPL Wallet to fund. If undefined or null, a new Wallet will be created.
  * @param options - See below.
- * @param options.faucetHost - A custom host for a faucet server. On devnet and
+ * @param options.faucetHost - A custom host for a faucet server. `fundWallet` will automatically
- * testnet, `fundWallet` will attempt to determine the correct server
+ * determine the correct server for devnet and testnet as long as `faucetHost` is null or undefined.
- * automatically. In other environments, or if you would like to customize the
+ * In other environments, you should provide the host using this option.
- * faucet host in devnet or testnet, you should provide the host using this
+ * Ex. Passing in faucetHost = `faucet.devnet.rippletest.net` will send a request
- * option.
+ * to https://faucet.devnet.rippletest.net/accounts:443
- * @returns A Wallet on the Testnet or Devnet that contains some amount of XRP,
+ * @returns A Wallet on a test network that contains some amount of XRP,
  * and that wallet's balance in XRP.
- * @throws When either Client isn't connected or unable to fund wallet address.
+ * @throws When the Client isn't connected, when it is unable to fund the wallet address,
+ * or if `faucetHost` is incorrectly formatted.
  */
+// eslint-disable-next-line max-lines-per-function -- Error checking makes for a better user experience.
 async function fundWallet(
   this: Client,
   wallet?: Wallet | null,
@@ -88,6 +92,14 @@ async function fundWallet(
     /* startingBalance remains '0' */
   }
 
+  if (
+    options?.faucetHost != null &&
+    /^(http|https|ws|wss):\/\//.test(options.faucetHost)
+  ) {
+    throw new XRPLFaucetError(
+      `Invalid format for faucetHost. Should not include ws(s)/http(s) prefix. Received '${options.faucetHost}'.`,
+    )
+  }
   // Options to pass to https.request
   const httpOptions = getHTTPOptions(this, postBody, options?.faucetHost)
 

packages/xrpl/src/Wallet/index.ts

@@ -23,6 +23,7 @@ import {
   sign,
 } from 'ripple-keypairs'
 
+import type { Client } from '../client'
 import ECDSA from '../ECDSA'
 import { ValidationError } from '../errors'
 import { Transaction } from '../models/transactions'
@@ -382,6 +383,34 @@ class Wallet {
     return classicAddressToXAddress(this.classicAddress, tag, isTestnet)
   }
 
+  /**
+   * Only usable on test networks.
+   * Funds an existing wallet using a faucet.
+   * This is an alias for Client.fundWallet()
+   *
+   * @param this - An existing XRPL Wallet to fund.
+   * @param client - An XRPL client.
+   * @param options - See below.
+   * @param options.faucetHost - A custom host for a faucet server. `fundWallet` will automatically
+   * determine the correct server for devnet and testnet as long as `faucetHost` is null or undefined.
+   * In other environments, you should provide the host using this option.
+   * Here's an example of how to format `faucetHost`: `faucet.devnet.rippletest.net`
+   * @returns This wallet and that its new balance in XRP.
+   * @throws When either Client isn't connected or unable to fund wallet address.
+   */
+  public async fundWallet(
+    this: Wallet,
+    client: Client,
+    options?: {
+      faucetHost?: string
+    },
+  ): Promise<{
+    wallet: Wallet
+    balance: number
+  }> {
+    return client.fundWallet(this, options)
+  }
+
   /**
    *  Decode a serialized transaction, remove the fields that are added during the signing process,
    *  and verify that it matches the transaction prior to signing. This gives the user a sanity check

packages/xrpl/test/integration/fundWallet.ts

@@ -6,6 +6,7 @@ import {
   isValidClassicAddress,
   isValidXAddress,
   dropsToXrp,
+  XRPLFaucetError,
 } from 'xrpl-local'
 // how long before each test case times out
 const TIMEOUT = 60000
@@ -69,6 +70,53 @@ describe('fundWallet', function () {
     await api.disconnect()
   })
 
+  it('can fund an existing Wallet using the Wallet alias', async function () {
+    const api = new Client('wss://s.devnet.rippletest.net:51233')
+
+    await api.connect()
+    const { wallet, balance } = await api.fundWallet()
+
+    assert.notEqual(wallet, undefined)
+    assert(isValidClassicAddress(wallet.classicAddress))
+    assert(isValidXAddress(wallet.getXAddress()))
+
+    const info = await api.request({
+      command: 'account_info',
+      account: wallet.classicAddress,
+    })
+
+    assert.equal(dropsToXrp(info.result.account_data.Balance), balance)
+
+    const { balance: newBalance } = await wallet.fundWallet(api)
+
+    const afterSent = await api.request({
+      command: 'account_info',
+      account: wallet.classicAddress,
+    })
+    assert.equal(dropsToXrp(afterSent.result.account_data.Balance), newBalance)
+
+    await api.disconnect()
+  })
+  it('throws when given an incorrectly formatted faucetHost', async function () {
+    const api = new Client('ws://xls20-sandbox.rippletest.net:51233')
+
+    let errorHappened = false
+    await api.connect()
+
+    // Using try/catch instead of assert.throws because 'await' has to be top-level
+    try {
+      await api.fundWallet(null, {
+        faucetHost: 'https://faucet-nft.ripple.com/',
+      })
+    } catch (error) {
+      assert.ok(error instanceof XRPLFaucetError)
+      errorHappened = true
+    }
+
+    assert.ok(errorHappened)
+    await api.disconnect()
+  })
+
   it('can generate and fund wallets using a custom host', async function () {
     const api = new Client('ws://xls20-sandbox.rippletest.net:51233')