adjust

* test: Integration tests for Account Transactions

LICENSE

@@ -1,6 +1,6 @@
 ISC License
 
-Copyright (c) 2012-2015 Ripple Labs Inc.
+Copyright (c) 2012-2021 Contributers to xrpl.js
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

README.md

@@ -33,7 +33,7 @@ See also: [RippleAPI Beginners Guide](https://xrpl.org/get-started-with-rippleap
 
 In an existing project (with `package.json`), install `xrpl.js`:
 ```
-$ npm install xrpl
+$ npm install xrpl@beta
 ```
 
 Then see the [documentation](#documentation).
@@ -46,7 +46,7 @@ If you want to use `xrpl.js` with React Native you will need to have some of the
 
     ```shell
     npm install react-native-crypto
-    npm install xrpl
+    npm install xrpl@beta
     # install peer deps
     npm install react-native-randombytes
     # install latest rn-nodeify

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "xrpl",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "xrpl",
-      "version": "2.0.0-beta.1",
+      "version": "2.0.0-beta.2",
       "license": "ISC",
       "dependencies": {
         "@types/lodash": "^4.14.136",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "xrpl",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.2",
   "license": "ISC",
   "description": "A TypeScript/JavaScript API for interacting with the XRP Ledger in Node.js and the browser",
   "files": [
@@ -79,14 +79,15 @@
     "build:snippets": "tsc --build ./snippets/tsconfig.json",
     "build:lib": "tsc --build tsconfig.build.json",
     "build:web": "webpack",
+    "build:browserTests": "webpack --config ./test/webpack.config.js",
     "analyze": "run-s build:web --analyze",
     "watch": "run-s build:lib --watch",
     "clean": "rm -rf dist",
     "docgen": "typedoc ./src/index.ts",
-    "prepublish": "run-s clean build",
+    "prepublish": "npm run clean && npm run build",
     "test": "nyc mocha --config=test/.mocharc.json --exit",
     "test:integration": "TS_NODE_PROJECT=tsconfig.build.json nyc mocha ./test/integration/**/*.ts ./test/integration/*.ts",
-    "test:browser": "TS_NODE_PROJECT=tsconfig.build.json nyc mocha ./test/browser/*.ts",
+    "test:browser": "npm run build:browserTests && TS_NODE_PROJECT=tsconfig.build.json nyc mocha ./test/browser/*.ts",
     "test:watch": "TS_NODE_PROJECT=src/tsconfig.json mocha --config=test/.mocharc.json --watch --reporter dot",
     "format": "prettier --write '{src,test}/**/*.ts'",
     "lint": "eslint . --ext .ts --max-warnings 0",
@@ -98,7 +99,7 @@
   "prettier": "@xrplf/prettier-config",
   "repository": {
     "type": "git",
-    "url": "git://github.com/XRPLF/xrpl.js.git"
+    "url": "git@github.com:XRPLF/xrpl.js.git"
   },
   "readmeFilename": "README.md",
   "engines": {

src/client/connection.ts

@@ -216,6 +216,7 @@ export class Connection extends EventEmitter {
    * @throws ConnectionError if there is a connection error, RippleError if there is already a WebSocket in existence.
    */
   public async connect(): Promise<void> {
+    console.log('CONNECTING IN CONNECTION.CONNECT')
     if (this.isConnected()) {
       return Promise.resolve()
     }
@@ -325,6 +326,7 @@ export class Connection extends EventEmitter {
     if (!this.shouldBeConnected || this.ws == null) {
       throw new NotConnectedError()
     }
+
     const [id, message, responsePromise] = this.requestManager.createRequest(
       request,
       timeout ?? this.config.timeout,

src/client/index.ts

@@ -164,7 +164,7 @@ const MAX_LIMIT = 400
 class Client extends EventEmitter {
   // New in > 0.21.0
   // non-validated ledger versions are allowed, and passed to rippled as-is.
-  private readonly connection: Connection
+  public readonly connection: Connection
 
   // Factor to multiply estimated fee by to provide a cushion in case the
   // required fee rises during submission of a transaction. Defaults to 1.2.
@@ -182,6 +182,8 @@ class Client extends EventEmitter {
   // eslint-disable-next-line max-lines-per-function -- okay because we have to set up all the connection handlers
   public constructor(server: string, options: ClientOptions = {}) {
     super()
+    console.log('CONSTRUCTING CLIENT')
+
     if (typeof server !== 'string' || !/wss?(?:\+unix)?:\/\//u.exec(server)) {
       throw new ValidationError(
         'server URI must start with `wss://`, `ws://`, `wss+unix://`, or `ws+unix://`.',
@@ -241,15 +243,6 @@ class Client extends EventEmitter {
     })
   }
 
-  /**
-   * Get the URL of the server the Client is connected to.
-   *
-   * @returns The URL of the rippled server this Client is connected to.
-   */
-  public get url(): string {
-    return this.connection.getUrl()
-  }
-
   /**
    * Returns true if there are more pages of data.
    *
@@ -509,6 +502,8 @@ class Client extends EventEmitter {
    * @returns A promise that resolves with a void value when a connection is established.
    */
   public async connect(): Promise<void> {
+    console.log('CONNECTING IN CLIENT.CONNECT')
+
     return this.connection.connect()
   }
 

src/sugar/autofill.ts

@@ -127,6 +127,7 @@ async function setNextValidSequenceNumber(
   const request: AccountInfoRequest = {
     command: 'account_info',
     account: tx.Account,
+    ledger_index: 'validated',
   }
   const data = await client.request(request)
   // eslint-disable-next-line no-param-reassign, require-atomic-updates -- param reassign is safe with no race condition

src/sugar/orderbook.ts

@@ -54,7 +54,7 @@ async function getOrderbook(
     command: 'book_offers',
     taker_pays: takerPays,
     taker_gets: takerGets,
-    ledger_index: options.ledger_index,
+    ledger_index: options.ledger_index ?? 'validated',
     ledger_hash: options.ledger_hash,
     limit: options.limit ?? DEFAULT_LIMIT,
     taker: options.taker,

src/utils/index.ts

@@ -56,6 +56,17 @@ function isValidSecret(secret: string): boolean {
   }
 }
 
+/**
+ * Validates that a given address is a valid X-Address or a valid classic
+ * address.
+ *
+ * @param address - Address to validate.
+ * @returns True if address is a valid X-Address or classic address.
+ */
+function isValidAddress(address: string): boolean {
+  return isValidXAddress(address) || isValidClassicAddress(address)
+}
+
 /**
  * Removes undefined values from an object.
  *
@@ -94,6 +105,7 @@ export {
   rippleTimeToUnixTime,
   unixTimeToRippleTime,
   isValidSecret,
+  isValidAddress,
   computeSignedTransactionHash,
   computeBinaryTransactionSigningHash,
   computeAccountRootIndex,

src/wallet/generateFaucetWallet.ts

@@ -36,7 +36,7 @@ const MAX_ATTEMPTS = 20
 async function generateFaucetWallet(
   this: Client,
   wallet?: Wallet,
-): Promise<Wallet | undefined> {
+): Promise<Wallet> {
   if (!this.isConnected()) {
     throw new RippledError('Client not connected, cannot call faucet')
   }
@@ -48,22 +48,22 @@ async function generateFaucetWallet(
       : Wallet.generate()
 
   // Create the POST request body
-  const postBody = new TextEncoder().encode(
-    JSON.stringify({
-      destination: fundWallet.classicAddress,
-    }),
-  )
-  // Retrieve the existing account balance
-  const addressToFundBalance = await getAddressXrpBalance(
-    this,
-    fundWallet.classicAddress,
+  const postBody = Buffer.from(
+    new TextEncoder().encode(
+      JSON.stringify({
+        destination: fundWallet.classicAddress,
+      }),
+    ),
   )
 
-  // Check the address balance is not undefined and is a number
-  const startingBalance =
-    addressToFundBalance && !Number.isNaN(Number(addressToFundBalance))
-      ? Number(addressToFundBalance)
-      : 0
+  let startingBalance = 0
+  try {
+    startingBalance = Number(
+      await getAddressXrpBalance(this, fundWallet.classicAddress),
+    )
+  } catch {
+    /* startingBalance remains '0' */
+  }
 
   // Options to pass to https.request
   const options = getOptions(this, postBody)
@@ -77,8 +77,8 @@ async function returnPromise(
   client: Client,
   startingBalance: number,
   fundWallet: Wallet,
-  postBody: Uint8Array,
-): Promise<Wallet | undefined> {
+  postBody: Buffer,
+): Promise<Wallet> {
   return new Promise((resolve, reject) => {
     const request = httpsRequest(options, (response) => {
       const chunks: Uint8Array[] = []
@@ -127,7 +127,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<void> {
   const body = Buffer.concat(chunks).toString()
@@ -161,7 +161,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<void> {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment -- We know this is safe and correct
@@ -212,13 +212,13 @@ async function getAddressXrpBalance(
 ): Promise<string> {
   // Get all the account balances
   try {
-    const balances = await client.getBalances(address)
+    const balances = await client.request({
+      command: 'account_info',
+      account: address,
+      ledger_index: 'validated',
+    })
 
-    // Retrieve the XRP balance
-    const xrpBalance = balances.filter(
-      (balance) => balance.currency.toUpperCase() === 'XRP',
-    )
-    return xrpBalance[0].value
+    return balances.result.account_data.Balance
   } catch (err) {
     if (err instanceof Error) {
       throw new XRPLFaucetError(
@@ -254,7 +254,13 @@ async function hasAddressBalanceIncreased(
       }
 
       try {
-        const newBalance = Number(await getAddressXrpBalance(client, address))
+        let newBalance
+        try {
+          newBalance = Number(await getAddressXrpBalance(client, address))
+        } catch {
+          /* newBalance remains undefined */
+        }
+
         if (newBalance > originalBalance) {
           clearInterval(interval)
           resolve(true)
@@ -279,9 +285,10 @@ async function hasAddressBalanceIncreased(
  *
  * @param client - Client.
  * @returns A {@link FaucetNetwork}.
+ * @throws When the client url is not on altnet or devnet.
  */
 function getFaucetUrl(client: Client): FaucetNetwork | undefined {
-  const connectionUrl = client.url
+  const connectionUrl = client.connection.getUrl()
 
   // 'altnet' for Ripple Testnet server and 'testnet' for XRPL Labs Testnet server
   if (connectionUrl.includes('altnet') || connectionUrl.includes('testnet')) {
@@ -292,7 +299,7 @@ function getFaucetUrl(client: Client): FaucetNetwork | undefined {
     return FaucetNetwork.Devnet
   }
 
-  return undefined
+  throw new XRPLFaucetError('Faucet URL is not defined or inferrable.')
 }
 
 export default generateFaucetWallet

test/browser/browserIntegration.ts

@@ -3,17 +3,23 @@ import path from 'path'
 import { expect, assert } from 'chai'
 import puppeteer from 'puppeteer'
 
+const TIMEOUT = 60000
 describe('Browser Tests', function () {
+  this.timeout(TIMEOUT)
+
   it('Integration Tests', async function () {
     const browser = await puppeteer.launch({ headless: true })
     try {
       const page = await browser.newPage().catch()
+      page.setDefaultNavigationTimeout(0)
+
       await page.goto(
         path.join('file:///', __dirname, '../localIntegrationRunner.html'),
       )
 
       await page.waitForFunction(
         'document.querySelector("body").innerText.includes("submit multisigned transaction")',
+        { timeout: TIMEOUT },
       )
 
       const fails = await page.evaluate(() => {

test/client.ts

@@ -25,7 +25,8 @@ describe('Client', function () {
 
   it('Client valid options', function () {
     const client = new Client('wss://s:1')
-    const privateConnectionUrl = client.url
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any -- TODO: fix when src/client linting is merged
+    const privateConnectionUrl = (client.connection as any).url
     assert.deepEqual(privateConnectionUrl, 'wss://s:1')
   })
 

test/client/constructor.ts

@@ -15,7 +15,7 @@ describe('client constructor', function () {
 
   it('Client valid options', function () {
     const client = new Client('wss://s:1')
-    const privateConnectionUrl = client.url
+    const privateConnectionUrl = client.connection.getUrl()
     assert.deepEqual(privateConnectionUrl, 'wss://s:1')
   })
 

test/integration/generateFaucetWallet.ts

@@ -0,0 +1,65 @@
+import assert from 'assert'
+
+import _ from 'lodash'
+
+import { Client, isValidClassicAddress, isValidXAddress } from 'xrpl-local'
+// how long before each test case times out
+const TIMEOUT = 60000
+// This test is reliant on external networks, and as such may be flaky.
+describe('generateFaucetWallet', function () {
+  this.timeout(TIMEOUT)
+
+  it('submit generates a testnet wallet', async function () {
+    const api = new Client('wss://s.altnet.rippletest.net:51233')
+
+    await api.connect()
+    const wallet = await api.generateFaucetWallet()
+
+    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(info.result.account_data.Balance, '1000000000')
+
+    await api.generateFaucetWallet(wallet)
+
+    const afterSent = await api.request({
+      command: 'account_info',
+      account: wallet.classicAddress,
+    })
+
+    assert.equal(afterSent.result.account_data.Balance, '2000000000')
+
+    await api.disconnect()
+  })
+  it('submit generates a devnet wallet', async function () {
+    const api = new Client('wss://s.devnet.rippletest.net:51233')
+
+    await api.connect()
+    const wallet = await api.generateFaucetWallet()
+
+    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(info.result.account_data.Balance, '1000000000')
+
+    await api.generateFaucetWallet(wallet)
+
+    const afterSent = await api.request({
+      command: 'account_info',
+      account: wallet.classicAddress,
+    })
+    assert.equal(afterSent.result.account_data.Balance, '2000000000')
+
+    await api.disconnect()
+  })
+})

test/integration/index.ts

@@ -36,4 +36,6 @@ export * from './requests/ripplePathFind'
 export * from './requests/submit'
 export * from './requests/tx'
 export * from './requests/utility'
+
+export * from './generateFaucetWallet'
 export * from './integration'

test/integration/requests/fee.ts

@@ -0,0 +1,56 @@
+import { assert } from 'chai'
+import _ from 'lodash'
+
+import { FeeRequest } from 'xrpl-local'
+
+import serverUrl from '../serverUrl'
+import { setupClient, suiteClientSetup, teardownClient } from '../setup'
+
+// how long before each test case times out
+const TIMEOUT = 20000
+
+describe('fee', function () {
+  this.timeout(TIMEOUT)
+
+  before(suiteClientSetup)
+  beforeEach(_.partial(setupClient, serverUrl))
+  afterEach(teardownClient)
+
+  it('base', async function () {
+    const request: FeeRequest = {
+      command: 'fee',
+    }
+    const response = await this.client.request(request)
+    const expected = {
+      id: 0,
+      result: {
+        current_ledger_size: '0',
+        current_queue_size: '0',
+        drops: {
+          base_fee: '10',
+          median_fee: '5000',
+          minimum_fee: '10',
+          open_ledger_fee: '10',
+        },
+        expected_ledger_size: '1000',
+        ledger_current_index: 2925,
+        levels: {
+          median_level: '128000',
+          minimum_level: '256',
+          open_ledger_level: '256',
+          reference_level: '256',
+        },
+        max_queue_size: '20000',
+      },
+      status: 'success',
+      type: 'response',
+    }
+    assert.equal(response.status, expected.status)
+    assert.equal(response.type, expected.type)
+    assert.equal(typeof response.result.ledger_current_index, 'number')
+    assert.deepEqual(
+      _.omit(response.result, ['ledger_current_index']),
+      _.omit(expected.result, ['ledger_current_index']),
+    )
+  })
+})

test/integration/requests/serverInfo.ts

@@ -0,0 +1,136 @@
+import { assert } from 'chai'
+import _ from 'lodash'
+
+import { ServerInfoRequest } from 'xrpl-local'
+
+import serverUrl from '../serverUrl'
+import { setupClient, suiteClientSetup, teardownClient } from '../setup'
+
+// how long before each test case times out
+const TIMEOUT = 20000
+
+describe('server_info', function () {
+  this.timeout(TIMEOUT)
+
+  before(suiteClientSetup)
+  beforeEach(_.partial(setupClient, serverUrl))
+  afterEach(teardownClient)
+
+  it('base', async function () {
+    const request: ServerInfoRequest = {
+      command: 'server_info',
+    }
+    const response = await this.client.request(request)
+    const expected = {
+      id: 0,
+      result: {
+        info: {
+          build_version: '1.7.3',
+          complete_ledgers: '2563-2928',
+          hostid: '44578fe64241',
+          io_latency_ms: 1,
+          jq_trans_overflow: '0',
+          last_close: { converge_time_s: 0.1, proposers: 0 },
+          load: {
+            job_types: [
+              {
+                in_progress: 1,
+                job_type: 'clientCommand',
+                peak_time: 4,
+                per_second: 9,
+              },
+              { job_type: 'updatePaths', per_second: 1 },
+              { job_type: 'advanceLedger', per_second: 1 },
+              { job_type: 'pathFind', per_second: 1 },
+              { job_type: 'WriteNode', per_second: 17 },
+            ],
+            threads: 1,
+          },
+          load_factor: 1,
+          peer_disconnects: '0',
+          peer_disconnects_resources: '0',
+          peers: 0,
+          pubkey_node: 'n9K6DaaReKkCjb9sEfXh5xP3BV9JisrJ9biKB3CSSFXancBnv5cW',
+          pubkey_validator: 'none',
+          server_state: 'full',
+          server_state_duration_us: '8752395105',
+          state_accounting: {
+            connected: { duration_us: '0', transitions: 0 },
+            disconnected: { duration_us: '41860', transitions: 1 },
+            full: { duration_us: '20723121268', transitions: 1 },
+            syncing: { duration_us: '0', transitions: 0 },
+            tracking: { duration_us: '0', transitions: 0 },
+          },
+          time: '2021-Sep-23 22:56:55.320858 UTC',
+          uptime: 8752,
+          validated_ledger: {
+            age: 0,
+            base_fee_xrp: 0.00001,
+            hash: '532175EC25CF34081D7F83584F37DAB70035A422CBE94352BEDA8EC123CB8F60',
+            reserve_base_xrp: 200,
+            reserve_inc_xrp: 50,
+            seq: 1906,
+          },
+          validation_quorum: 0,
+          validator_list: {
+            count: 0,
+            expiration: 'unknown',
+            status: 'unknown',
+          },
+        },
+      },
+      status: 'success',
+      type: 'response',
+    }
+    assert.equal(response.status, expected.status)
+    assert.equal(response.type, expected.type)
+
+    assert.equal(typeof response.result.info.time, 'string')
+    assert.equal(typeof response.result.info.uptime, 'number')
+    assert.equal(typeof response.result.info.complete_ledgers, 'string')
+    assert.equal(typeof response.result.info.hostid, 'string')
+    assert.equal(typeof response.result.info.pubkey_node, 'string')
+    assert.equal(typeof response.result.info.server_state_duration_us, 'string')
+    const removeKeys = [
+      'time',
+      'uptime',
+      'complete_ledgers',
+      'hostid',
+      'load',
+      'state_accounting',
+      'pubkey_node',
+      'server_state_duration_us',
+      'validated_ledger',
+    ]
+    assert.deepEqual(
+      _.omit(response.result.info, removeKeys),
+      _.omit(expected.result.info, removeKeys),
+    )
+
+    // load
+    assert.equal(typeof response.result.info.load.threads, 'number')
+    for (const obj of response.result.info.load.job_types) {
+      assert.equal(typeof obj.per_second, 'number')
+      assert.equal(typeof obj.job_type, 'string')
+    }
+    // state_accounting
+    Object.keys(response.result.info.state_accounting).forEach(function (key) {
+      assert.equal(
+        typeof response.result.info.state_accounting[key].duration_us,
+        'string',
+      )
+      assert.equal(
+        typeof response.result.info.state_accounting[key].transitions,
+        'number',
+      )
+    })
+
+    // validated_ledger
+    assert.equal(typeof response.result.info.validated_ledger.hash, 'string')
+    for (const key of Object.keys(
+      _.omit(response.result.info.validated_ledger, 'hash'),
+    )) {
+      assert.equal(typeof response.result.info.validated_ledger[key], 'number')
+    }
+  })
+})

test/integration/requests/serverState.ts

@@ -0,0 +1,141 @@
+import { assert } from 'chai'
+import _ from 'lodash'
+
+import { ServerStateRequest } from 'xrpl-local'
+
+import serverUrl from '../serverUrl'
+import { setupClient, suiteClientSetup, teardownClient } from '../setup'
+
+// how long before each test case times out
+const TIMEOUT = 20000
+
+describe('server_state', function () {
+  this.timeout(TIMEOUT)
+
+  before(suiteClientSetup)
+  beforeEach(_.partial(setupClient, serverUrl))
+  afterEach(teardownClient)
+
+  it('base', async function () {
+    const request: ServerStateRequest = {
+      command: 'server_state',
+    }
+    const response = await this.client.request(request)
+    const expected = {
+      id: 0,
+      result: {
+        state: {
+          build_version: '1.7.3',
+          complete_ledgers: '2563-2932',
+          io_latency_ms: 1,
+          jq_trans_overflow: '0',
+          last_close: {
+            converge_time: 100,
+            proposers: 0,
+          },
+          load: {
+            job_types: [
+              {
+                in_progress: 1,
+                job_type: 'clientCommand',
+                peak_time: 4,
+                per_second: 9,
+              },
+              { job_type: 'updatePaths', per_second: 1 },
+              { job_type: 'advanceLedger', per_second: 1 },
+              { job_type: 'pathFind', per_second: 1 },
+              { job_type: 'WriteNode', per_second: 17 },
+            ],
+            threads: 1,
+          },
+          load_base: 256,
+          load_factor: 256,
+          load_factor_fee_escalation: 256,
+          load_factor_fee_queue: 256,
+          load_factor_fee_reference: 256,
+          load_factor_server: 256,
+          peer_disconnects: '0',
+          peer_disconnects_resources: '0',
+          peers: 0,
+          pubkey_node: 'n9K6DaaReKkCjb9sEfXh5xP3BV9JisrJ9biKB3CSSFXancBnv5cW',
+          pubkey_validator: 'none',
+          server_state: 'full',
+          server_state_duration_us: '8752487389',
+          state_accounting: {
+            connected: { duration_us: '0', transitions: 0 },
+            disconnected: { duration_us: '41860', transitions: 1 },
+            full: { duration_us: '20723121268', transitions: 1 },
+            syncing: { duration_us: '0', transitions: 0 },
+            tracking: { duration_us: '0', transitions: 0 },
+          },
+          time: '2021-Sep-23 22:56:55.413151 UTC',
+          uptime: 8752,
+          validated_ledger: {
+            base_fee: 10,
+            close_time: 685829741,
+            hash: 'B98AABCE40A54DF654C86E56088AD7D46BBA8B8E93AD3FAC2426FEFF847F7937',
+            reserve_base: 200000000,
+            reserve_inc: 50000000,
+            seq: 2294,
+          },
+          validation_quorum: 0,
+          validator_list_expires: 0,
+        },
+      },
+      status: 'success',
+      type: 'response',
+    }
+    assert.equal(response.status, expected.status)
+    assert.equal(response.type, expected.type)
+
+    assert.equal(typeof response.result.state.complete_ledgers, 'string')
+    assert.equal(typeof response.result.state.pubkey_node, 'string')
+    assert.equal(typeof response.result.state.time, 'string')
+    assert.equal(typeof response.result.state.uptime, 'number')
+    assert.equal(
+      typeof response.result.state.server_state_duration_us,
+      'string',
+    )
+
+    const removeKeys = [
+      'complete_ledgers',
+      'load',
+      'state_accounting',
+      'pubkey_node',
+      'time',
+      'uptime',
+      'server_state_duration_us',
+      'validated_ledger',
+    ]
+    assert.deepEqual(
+      _.omit(response.result.state, removeKeys),
+      _.omit(expected.result.state, removeKeys),
+    )
+
+    // load
+    assert.equal(typeof response.result.state.load.threads, 'number')
+    for (const obj of response.result.state.load.job_types) {
+      assert.equal(typeof obj.per_second, 'number')
+      assert.equal(typeof obj.job_type, 'string')
+    }
+    // state_accounting
+    Object.keys(response.result.state.state_accounting).forEach(function (key) {
+      assert.equal(
+        typeof response.result.state.state_accounting[key].duration_us,
+        'string',
+      )
+      assert.equal(
+        typeof response.result.state.state_accounting[key].transitions,
+        'number',
+      )
+    })
+
+    // validated_ledger
+    assert.equal(typeof response.result.state.validated_ledger.hash, 'string')
+    for (const key of Object.keys(
+      _.omit(response.result.state.validated_ledger, 'hash'),
+    )) {
+      assert.equal(typeof response.result.state.validated_ledger[key], 'number')
+    }
+  })
+})

test/integration/transactions/accountDelete.ts

@@ -0,0 +1,35 @@
+import _ from 'lodash'
+
+import { AccountDelete } from 'xrpl-local/models/transactions'
+
+import serverUrl from '../serverUrl'
+import { setupClient, suiteClientSetup, teardownClient } from '../setup'
+import { generateFundedWallet, ledgerAccept, testTransaction } from '../utils'
+
+// how long before each test case times out
+const TIMEOUT = 20000
+
+describe('AccountDelete', function () {
+  this.timeout(TIMEOUT)
+
+  before(suiteClientSetup)
+  beforeEach(_.partial(setupClient, serverUrl))
+  afterEach(teardownClient)
+
+  it('base', async function () {
+    const wallet2 = await generateFundedWallet(this.client)
+    // to the satisfy the condition that account sequence and current ledger_index should be 256 apart.
+    const promises: Array<Promise<void>> = []
+    for (let iter = 0; iter < 256; iter += 1) {
+      promises.push(ledgerAccept(this.client))
+    }
+
+    await Promise.all(promises)
+    const tx: AccountDelete = {
+      TransactionType: 'AccountDelete',
+      Account: this.wallet.getClassicAddress(),
+      Destination: wallet2.getClassicAddress(),
+    }
+    await testTransaction(this.client, tx, this.wallet)
+  })
+})

test/integration/transactions/accountSet.ts

@@ -0,0 +1,26 @@
+import _ from 'lodash'
+
+import { AccountSet } from 'xrpl-local/models/transactions'
+
+import serverUrl from '../serverUrl'
+import { setupClient, suiteClientSetup, teardownClient } from '../setup'
+import { testTransaction } from '../utils'
+
+// how long before each test case times out
+const TIMEOUT = 20000
+
+describe('AccountSet', function () {
+  this.timeout(TIMEOUT)
+
+  before(suiteClientSetup)
+  beforeEach(_.partial(setupClient, serverUrl))
+  afterEach(teardownClient)
+
+  it('base', async function () {
+    const tx: AccountSet = {
+      TransactionType: 'AccountSet',
+      Account: this.wallet.getClassicAddress(),
+    }
+    await testTransaction(this.client, tx, this.wallet)
+  })
+})

test/integration/transactions/paymentChannelClaim.ts

@@ -13,7 +13,7 @@ import { generateFundedWallet, testTransaction } from '../utils'
 // how long before each test case times out
 const TIMEOUT = 20000
 
-describe('PaymentChannelFund', function () {
+describe('PaymentChannelClaim', function () {
   this.timeout(TIMEOUT)
 
   before(suiteClientSetup)

test/integration/transactions/paymentChannelFund.ts

@@ -35,7 +35,6 @@ describe('PaymentChannelFund', function () {
       this.wallet,
       paymentChannelCreate,
     )
-
     await testTransaction(this.client, paymentChannelCreate, this.wallet)
 
     const paymentChannelFund: PaymentChannelFund = {

test/integration/utils.ts

@@ -11,7 +11,7 @@ const masterSecret = 'snoPBrXtMeMyMHUVTgbuqAfg1SUTb'
 
 export async function ledgerAccept(client: Client): Promise<void> {
   const request = { command: 'ledger_accept' }
-  await client.request(request)
+  await client.connection.request(request)
 }
 
 export async function fundAccount(
@@ -83,6 +83,9 @@ export async function testTransaction(
   transaction: Transaction,
   wallet: Wallet,
 ): Promise<void> {
+  // Accept any un-validated changes.
+  await ledgerAccept(client)
+
   // sign/submit the transaction
   const response = await client.submitTransaction(wallet, transaction)
 

test/localIntegrationRunner.html

@@ -17,7 +17,7 @@
       mocha.ui('bdd')
     </script>
 
-    <script src="../testCompiledForWeb/index.js"></script>
+    <script src="./testCompiledForWeb/index.js"></script>
 
     <script>
       mocha.run()

test/setupClientWeb.ts

@@ -12,7 +12,7 @@ async function setupClient(this: any, port = defaultPort): Promise<void> {
   return tclient
     .connect()
     .then(async () => {
-      return tclient.request({
+      return tclient.connection.request({
         command: 'test_command',
         data: { openOnOtherPort: true },
       })

test/utils/isValidAddress.ts

@@ -0,0 +1,25 @@
+import { assert } from 'chai'
+
+import { isValidAddress } from 'xrpl-local'
+
+describe('isValidAddress', function () {
+  it('Validates valid classic address', function () {
+    const classic = 'r3rhWeE31Jt5sWmi4QiGLMZnY3ENgqw96W'
+    assert(isValidAddress(classic))
+  })
+
+  it('Does not validate invalid classic address', function () {
+    const classic = 'r3rhWeE31Jt5sWmi4QiGLMZnY3ENhqw96W'
+    assert(!isValidAddress(classic))
+  })
+
+  it('Validates valid X-Address', function () {
+    const xAddress = 'XV5sbjUmgPpvXv4ixFWZ5ptAYZ6PD28Sq49uo34VyjnmK5H'
+    assert(isValidAddress(xAddress))
+  })
+
+  it('Does not validate invalid X-Address', function () {
+    const xAddress = 'XV5sbjUmgPpvXv4ixFWZ5pfAYZ6PD28Sq49uo34VyjnmK5H'
+    assert(!isValidAddress(xAddress))
+  })
+})

test/wallet/generateFaucetWallet.ts

@@ -32,6 +32,6 @@ describe('Get Faucet URL', function () {
 
   it('returns undefined if not a Testnet or Devnet server URL', function () {
     // Info: setupClient.setup creates a connection to 'localhost'
-    assert.strictEqual(getFaucetUrl(this.client), undefined)
+    assert.throws(() => getFaucetUrl(this.client))
   })
 })

test/webpack.config.js

@@ -0,0 +1,79 @@
+'use strict'
+const path = require('path')
+const webpack = require('webpack')
+const assert = require('assert')
+
+function webpackForTest(testFileName) {
+  const match = testFileName.match(/\/?([^\/]*)\.ts$/)
+  if (!match) {
+    assert(false, 'wrong filename:' + testFileName)
+  }
+
+  const test = {
+    mode: 'production',
+    cache: true,
+    externals: [
+      {
+        'xrpl-local': 'xrpl',
+        net: 'null',
+      },
+    ],
+    entry: testFileName,
+    output: {
+      library: match[1].replace(/-/g, '_'),
+      path: path.join(__dirname, './testCompiledForWeb/'),
+      filename: match[1] + '.js',
+    },
+    plugins: [
+      new webpack.ProvidePlugin({ process: 'process/browser' }),
+      new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'] }),
+    ],
+    module: {
+      rules: [
+        {
+          test: /jayson/,
+          use: 'null',
+        },
+        {
+          test: /\.ts$/,
+          use: [
+            {
+              loader: 'ts-loader',
+              options: {
+                compilerOptions: {
+                  composite: false,
+                  declaration: false,
+                  declarationMap: false,
+                },
+              },
+            },
+          ],
+        },
+      ],
+    },
+    node: {
+      global: true,
+      __filename: false,
+      __dirname: true,
+    },
+    resolve: {
+      alias: {
+        ws: './dist/npm/client/wsWrapper.js',
+        'https-proxy-agent': false,
+      },
+      extensions: ['.ts', '.js', '.json'],
+      fallback: {
+        buffer: require.resolve('buffer/'),
+        assert: require.resolve('assert/'),
+        url: require.resolve('url/'),
+        stream: require.resolve('stream-browserify'),
+        crypto: require.resolve('crypto-browserify'),
+        path: require.resolve('path-browserify'),
+        http: require.resolve('stream-http'),
+      },
+    },
+  }
+  return test
+}
+
+module.exports = [(env, argv) => webpackForTest('./test/integration/index.ts')]

webpack.config.js

@@ -1,8 +1,6 @@
 'use strict'
 const path = require('path')
-const fs = require('fs')
 const webpack = require('webpack')
-const assert = require('assert')
 const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer')
 
 function getDefaultConfiguration() {
@@ -51,79 +49,6 @@ function getDefaultConfiguration() {
   }
 }
 
-function webpackForTest(testFileName) {
-  const match = testFileName.match(/\/?([^\/]*)\.ts$/)
-  if (!match) {
-    assert(false, 'wrong filename:' + testFileName)
-  }
-
-  const test = {
-    mode: 'production',
-    cache: true,
-    externals: [
-      {
-        'xrpl-local': 'xrpl',
-        net: 'null',
-      },
-    ],
-    entry: testFileName,
-    output: {
-      library: match[1].replace(/-/g, '_'),
-      path: path.join(__dirname, './testCompiledForWeb/'),
-      filename: match[1] + '.js',
-    },
-    plugins: [
-      new webpack.ProvidePlugin({ process: 'process/browser' }),
-      new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'] }),
-    ],
-    module: {
-      rules: [
-        {
-          test: /jayson/,
-          use: 'null',
-        },
-        {
-          test: /\.ts$/,
-          use: [
-            {
-              loader: 'ts-loader',
-              options: {
-                compilerOptions: {
-                  composite: false,
-                  declaration: false,
-                  declarationMap: false,
-                },
-              },
-            },
-          ],
-        },
-      ],
-    },
-    node: {
-      global: true,
-      __filename: false,
-      __dirname: true,
-    },
-    resolve: {
-      alias: {
-        ws: './dist/npm/client/wsWrapper.js',
-        'https-proxy-agent': false,
-      },
-      extensions: ['.ts', '.js', '.json'],
-      fallback: {
-        buffer: require.resolve('buffer/'),
-        assert: require.resolve('assert/'),
-        url: require.resolve('url/'),
-        stream: require.resolve('stream-browserify'),
-        crypto: require.resolve('crypto-browserify'),
-        path: require.resolve('path-browserify'),
-        http: require.resolve('stream-http'),
-      },
-    },
-  }
-  return test
-}
-
 module.exports = [
   (env, argv) => {
     const config = getDefaultConfiguration()
@@ -140,5 +65,4 @@ module.exports = [
     }
     return config
   },
-  (env, argv) => webpackForTest('./test/integration/index.ts'),
 ]