Skip to content

Commit

Permalink
feat: remove BroadcastClient (#2408)
Browse files Browse the repository at this point in the history
BREAKING CHANGE: `BroadcastClient` was removed. It was deprecated in 2.2
  • Loading branch information
ckniffen authored Jul 27, 2023
1 parent 12512d8 commit 6bdcf62
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 131 deletions.
84 changes: 0 additions & 84 deletions packages/xrpl/src/client/BroadcastClient.ts

This file was deleted.

3 changes: 0 additions & 3 deletions packages/xrpl/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// Broadcast client is experimental
export { BroadcastClient } from './client/BroadcastClient'

export { Client, ClientOptions } from './client'

export * from './models'
Expand Down
27 changes: 2 additions & 25 deletions packages/xrpl/test/setupClient.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import { Client } from '../src/client'
// eslint-disable-next-line import/no-deprecated -- Will remove in 3.0.0
import { BroadcastClient } from '../src/client/BroadcastClient'

import createMockRippled, {
type MockedWebSocketServer,
Expand All @@ -9,8 +7,7 @@ import rippled from './fixtures/rippled'
import { destroyServer, getFreePort } from './testUtils'

export interface XrplTestContext {
// eslint-disable-next-line import/no-deprecated -- Will remove in 3.0.0
client: Client | BroadcastClient
client: Client
_mockedServerPort?: number
mockRippled?: MockedWebSocketServer
mocks?: MockedWebSocketServer[]
Expand Down Expand Up @@ -38,32 +35,12 @@ async function setupMockRippledConnection(
return context.client.connect().then(() => context)
}

async function setupMockRippledConnectionForBroadcast(
ports: number[],
): Promise<XrplTestContext> {
const servers = ports.map((port) => `ws://localhost:${port}`)
const context: XrplTestContext = {
mocks: ports.map((port) => createMockRippled(port)),
// eslint-disable-next-line import/no-deprecated -- Will remove in 3.0.0
client: new BroadcastClient(servers),
servers: ports,
}

return context.client.connect().then(() => context)
}

async function setupClient(): Promise<XrplTestContext> {
return getFreePort().then(async (port) => {
return setupMockRippledConnection(port)
})
}

async function setupBroadcast(): Promise<XrplTestContext> {
return Promise.all([getFreePort(), getFreePort()]).then(async (ports) => {
return setupMockRippledConnectionForBroadcast(ports)
})
}

async function teardownClient(
incomingContext: XrplTestContext,
done?: () => void,
Expand Down Expand Up @@ -98,4 +75,4 @@ async function teardownClient(
})
}

export { setupClient, teardownClient, setupBroadcast, createMockRippled }
export { setupClient, teardownClient, createMockRippled }
25 changes: 6 additions & 19 deletions packages/xrpl/test/wallet/fundWallet.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { assert } from 'chai'

import type { Client } from '../../src/client'
import {
FaucetNetwork,
FaucetNetworkPaths,
Expand All @@ -26,43 +25,31 @@ describe('Get Faucet host ', function () {
// @ts-expect-error Intentionally modifying private data for test
testContext.client.connection.url = FaucetNetwork.Devnet

assert.strictEqual(
getFaucetHost(testContext.client as Client),
expectedFaucet,
)
assert.strictEqual(getFaucetHost(testContext.client), expectedFaucet)
})

it('returns the Testnet host', function () {
const expectedFaucet = FaucetNetwork.Testnet
// @ts-expect-error Intentionally modifying private data for test
testContext.client.connection.url = FaucetNetwork.Testnet

assert.strictEqual(
getFaucetHost(testContext.client as Client),
expectedFaucet,
)
assert.strictEqual(getFaucetHost(testContext.client), expectedFaucet)
})

it('returns the Testnet host with the XRPL Labs server', function () {
const expectedFaucet = FaucetNetwork.Testnet
// @ts-expect-error Intentionally modifying private data for test
testContext.client.connection.url = 'wss://testnet.xrpl-labs.com'

assert.strictEqual(
getFaucetHost(testContext.client as Client),
expectedFaucet,
)
assert.strictEqual(getFaucetHost(testContext.client), expectedFaucet)
})

it('returns the Hooks V3 Testnet host', function () {
const expectedFaucet = FaucetNetwork.HooksV3Testnet
// @ts-expect-error Intentionally modifying private data for test
testContext.client.connection.url = FaucetNetwork.HooksV3Testnet

assert.strictEqual(
getFaucetHost(testContext.client as Client),
expectedFaucet,
)
assert.strictEqual(getFaucetHost(testContext.client), expectedFaucet)
})

it('returns the correct faucetPath for Devnet host', function () {
Expand All @@ -71,7 +58,7 @@ describe('Get Faucet host ', function () {
testContext.client.connection.url = FaucetNetwork.Devnet

assert.strictEqual(
getDefaultFaucetPath(getFaucetHost(testContext.client as Client)),
getDefaultFaucetPath(getFaucetHost(testContext.client)),
expectedFaucetPath,
)
})
Expand All @@ -82,7 +69,7 @@ describe('Get Faucet host ', function () {
testContext.client.connection.url = FaucetNetwork.HooksV3Testnet

assert.strictEqual(
getDefaultFaucetPath(getFaucetHost(testContext.client as Client)),
getDefaultFaucetPath(getFaucetHost(testContext.client)),
expectedFaucetPath,
)
})
Expand Down

0 comments on commit 6bdcf62

Please sign in to comment.