Skip to content

Commit f5a06d7

Browse files
etienneohetienneoh
committed
Removed deprecated calls to convertHexToString in favor of @xrplf/isomorphic/utils's stringToHex 
1 parent e3188b8 commit f5a06d7

File tree

11 files changed

+36
-33
lines changed

11 files changed

+36
-33
lines changed

‎packages/xrpl/snippets/src/multisigning.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
import { stringToHex } from '@xrplf/isomorphic/utils'
2+
13
import {
24
multisign,
35
Client,
46
AccountSet,
5-
convertStringToHex,
67
SignerListSet,
78
Wallet,
89
} from '../../src'
@@ -50,7 +51,7 @@ async function multisigning(): Promise<void> {
5051
const accountSet: AccountSet = {
5152
TransactionType: 'AccountSet',
5253
Account: walletMaster.classicAddress,
53-
Domain: convertStringToHex('example.com'),
54+
Domain: stringToHex('example.com'),
5455
}
5556
const accountSetTx = await client.autofill(accountSet, 2)
5657
console.log('AccountSet transaction is ready to be multisigned:')

‎packages/xrpl/src/models/transactions/NFTokenMint.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export interface NFTokenMint extends BaseTransaction {
9292
* opaque issuer-specific encoding. The URI is NOT checked for validity, but
9393
* the field is limited to a maximum length of 256 bytes.
9494
*
95-
* This field must be hex-encoded. You can use `convertStringToHex` to
95+
* This field must be hex-encoded. You can use `@xrplf/isomorphic/utils`'s `stringToHex` to
9696
* convert this field to the proper encoding.
9797
*
9898
* This field must not be an empty string. Omit it from the transaction or

‎packages/xrpl/test/integration/integration.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import { stringToHex } from '@xrplf/isomorphic/utils'
12
import { assert } from 'chai'
23

34
import { Client, SubmitResponse } from '../../src'
45
import { AccountSet, SignerListSet } from '../../src/models/transactions'
5-
import { convertStringToHex } from '../../src/utils'
66
import { multisign } from '../../src/Wallet/signer'
77

88
import serverUrl from './serverUrl'
@@ -74,7 +74,7 @@ describe('integration tests', function () {
7474
const accountSet: AccountSet = {
7575
TransactionType: 'AccountSet',
7676
Account: testContext.wallet.classicAddress,
77-
Domain: convertStringToHex('example.com'),
77+
Domain: stringToHex('example.com'),
7878
}
7979
const accountSetTx = await client.autofill(accountSet, 2)
8080
const { tx_blob: tx_blob1 } = signerWallet1.sign(accountSetTx, true)

‎packages/xrpl/test/integration/regularKey.test.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { stringToHex } from '@xrplf/isomorphic/utils'
12
import { assert } from 'chai'
23

34
import {
@@ -10,7 +11,6 @@ import {
1011
OfferCreate,
1112
ECDSA,
1213
} from '../../src'
13-
import { convertStringToHex } from '../../src/utils'
1414
import { multisign } from '../../src/Wallet/signer'
1515

1616
import serverUrl from './serverUrl'
@@ -85,7 +85,7 @@ describe('regular key', function () {
8585
const accountSet: AccountSet = {
8686
TransactionType: 'AccountSet',
8787
Account: regularKeyWallet.classicAddress,
88-
Domain: convertStringToHex('example.com'),
88+
Domain: stringToHex('example.com'),
8989
}
9090

9191
await testTransaction(testContext.client, accountSet, regularKeyWallet)
@@ -103,7 +103,7 @@ describe('regular key', function () {
103103
const accountSet: AccountSet = {
104104
TransactionType: 'AccountSet',
105105
Account: masterWallet.classicAddress,
106-
Domain: convertStringToHex('example.com'),
106+
Domain: stringToHex('example.com'),
107107
}
108108

109109
await testTransaction(testContext.client, accountSet, masterWallet)
@@ -259,7 +259,7 @@ describe('regular key', function () {
259259
const accountSet: AccountSet = {
260260
TransactionType: 'AccountSet',
261261
Account: testContext.wallet.classicAddress,
262-
Domain: convertStringToHex('example.com'),
262+
Domain: stringToHex('example.com'),
263263
}
264264
const accountSetTx = await client.autofill(accountSet, 2)
265265
const signed1 = regularKeyWallet.sign(accountSetTx, true)
@@ -319,7 +319,7 @@ describe('regular key', function () {
319319
const accountSet: AccountSet = {
320320
TransactionType: 'AccountSet',
321321
Account: testContext.wallet.classicAddress,
322-
Domain: convertStringToHex('example.com'),
322+
Domain: stringToHex('example.com'),
323323
}
324324
const accountSetTx = await client.autofill(accountSet, 2)
325325
const signed1 = sameKeyDefaultAddressWallet.sign(accountSetTx, true)

‎packages/xrpl/test/integration/requests/submit.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { stringToHex } from '@xrplf/isomorphic/utils'
12
import { assert } from 'chai'
23
import { decode } from 'ripple-binary-codec'
34

@@ -8,7 +9,6 @@ import {
89
hashes,
910
SubmittableTransaction,
1011
} from '../../../src'
11-
import { convertStringToHex } from '../../../src/utils'
1212
import serverUrl from '../serverUrl'
1313
import {
1414
setupClient,
@@ -35,7 +35,7 @@ describe('submit', function () {
3535
const accountSet: AccountSet = {
3636
TransactionType: 'AccountSet',
3737
Account: testContext.wallet.classicAddress,
38-
Domain: convertStringToHex('example.com'),
38+
Domain: stringToHex('example.com'),
3939
}
4040

4141
const autofilledTx = await testContext.client.autofill(accountSet)

‎packages/xrpl/test/integration/requests/submitMultisigned.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { stringToHex } from '@xrplf/isomorphic/utils'
12
import { assert } from 'chai'
23
import { decode } from 'ripple-binary-codec'
34

@@ -11,7 +12,6 @@ import {
1112
SubmitMultisignedRequest,
1213
SubmitMultisignedV1Response,
1314
} from '../../../src'
14-
import { convertStringToHex } from '../../../src/utils'
1515
import { multisign } from '../../../src/Wallet/signer'
1616
import serverUrl from '../serverUrl'
1717
import {
@@ -75,7 +75,7 @@ describe('submit_multisigned', function () {
7575
const accountSet: AccountSet = {
7676
TransactionType: 'AccountSet',
7777
Account: testContext.wallet.classicAddress,
78-
Domain: convertStringToHex('example.com'),
78+
Domain: stringToHex('example.com'),
7979
}
8080
const accountSetTx = await client.autofill(accountSet, 2)
8181
const signed1 = signerWallet1.sign(accountSetTx, true)
@@ -148,7 +148,7 @@ describe('submit_multisigned', function () {
148148
const accountSet: AccountSet = {
149149
TransactionType: 'AccountSet',
150150
Account: testContext.wallet.classicAddress,
151-
Domain: convertStringToHex('example.com'),
151+
Domain: stringToHex('example.com'),
152152
}
153153
const accountSetTx = await client.autofill(accountSet, 2)
154154
const signed1 = signerWallet1.sign(accountSetTx, true)

‎packages/xrpl/test/integration/requests/tx.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { stringToHex } from '@xrplf/isomorphic/utils'
12
import { assert } from 'chai'
23

34
import {
@@ -8,7 +9,6 @@ import {
89
TxResponse,
910
TxV1Response,
1011
} from '../../../src'
11-
import { convertStringToHex } from '../../../src/utils'
1212
import serverUrl from '../serverUrl'
1313
import {
1414
setupClient,
@@ -35,7 +35,7 @@ describe('tx', function () {
3535
const accountSet: AccountSet = {
3636
TransactionType: 'AccountSet',
3737
Account: account,
38-
Domain: convertStringToHex('example.com'),
38+
Domain: stringToHex('example.com'),
3939
}
4040

4141
const response: SubmitResponse = await testContext.client.submit(
@@ -82,7 +82,7 @@ describe('tx', function () {
8282
const accountSet: AccountSet = {
8383
TransactionType: 'AccountSet',
8484
Account: account,
85-
Domain: convertStringToHex('example.com'),
85+
Domain: stringToHex('example.com'),
8686
}
8787

8888
const response: SubmitResponse = await testContext.client.submit(

‎packages/xrpl/test/integration/submitAndWait.test.ts

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import { stringToHex } from '@xrplf/isomorphic/utils'
12
import { assert } from 'chai'
23

3-
import { AccountSet, convertStringToHex, ValidationError } from '../../src'
4+
import { AccountSet, ValidationError } from '../../src'
45
import { assertRejects } from '../testUtils'
56

67
import serverUrl from './serverUrl'
@@ -35,7 +36,7 @@ describe('client.submitAndWait', function () {
3536
const accountSet: AccountSet = {
3637
TransactionType: 'AccountSet',
3738
Account: testContext.wallet.classicAddress,
38-
Domain: convertStringToHex('example.com'),
39+
Domain: stringToHex('example.com'),
3940
}
4041

4142
let retries = 10
@@ -89,7 +90,7 @@ describe('client.submitAndWait', function () {
8990
const accountSet: AccountSet = {
9091
TransactionType: 'AccountSet',
9192
Account: testContext.wallet.classicAddress,
92-
Domain: convertStringToHex('example.com'),
93+
Domain: stringToHex('example.com'),
9394
}
9495

9596
await assertRejects(
@@ -107,7 +108,7 @@ describe('client.submitAndWait', function () {
107108
const accountSet: AccountSet = {
108109
TransactionType: 'AccountSet',
109110
Account: testContext.wallet.classicAddress,
110-
Domain: convertStringToHex('example.com'),
111+
Domain: stringToHex('example.com'),
111112
}
112113
const { tx_blob: signedAccountSet } = testContext.wallet.sign(
113114
await testContext.client.autofill(accountSet),
@@ -130,7 +131,7 @@ describe('client.submitAndWait', function () {
130131
const accountSet: AccountSet = {
131132
TransactionType: 'AccountSet',
132133
Account: testContext.wallet.classicAddress,
133-
Domain: convertStringToHex('example.com'),
134+
Domain: stringToHex('example.com'),
134135
}
135136
const { tx_blob: signedAccountSet } = testContext.wallet.sign(
136137
await testContext.client.autofill(accountSet),

‎packages/xrpl/test/integration/transactions/nftokenMint.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import { stringToHex } from '@xrplf/isomorphic/utils'
12
import { assert } from 'chai'
23

34
import {
4-
convertStringToHex,
55
getNFTokenID,
66
NFTokenMint,
77
TransactionMetadata,
@@ -33,7 +33,7 @@ describe('NFTokenMint', function () {
3333
const tx: NFTokenMint = {
3434
TransactionType: 'NFTokenMint',
3535
Account: testContext.wallet.address,
36-
URI: convertStringToHex('https://www.google.com'),
36+
URI: stringToHex('https://www.google.com'),
3737
NFTokenTaxon: 0,
3838
}
3939
const response = await testTransaction(

‎packages/xrpl/test/models/NFTokenMint.test.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import { stringToHex } from '@xrplf/isomorphic/utils'
12
import { assert } from 'chai'
23

34
import {
4-
convertStringToHex,
55
validate,
66
ValidationError,
77
NFTokenMintFlags,
@@ -25,7 +25,7 @@ describe('NFTokenMint', function () {
2525
NFTokenTaxon: 0,
2626
Issuer: 'r9LqNeG6qHxjeUocjvVki2XR35weJ9mZgQ',
2727
TransferFee: 1,
28-
URI: convertStringToHex('http://xrpl.org'),
28+
URI: stringToHex('http://xrpl.org'),
2929
} as any
3030

3131
assert.doesNotThrow(() => validate(validNFTokenMint))
@@ -40,7 +40,7 @@ describe('NFTokenMint', function () {
4040
Flags: NFTokenMintFlags.tfTransferable,
4141
Issuer: 'r9LqNeG6qHxjeUocjvVki2XR35weJ9mZgQ',
4242
TransferFee: 1,
43-
URI: convertStringToHex('http://xrpl.org'),
43+
URI: stringToHex('http://xrpl.org'),
4444
} as any
4545

4646
assert.throws(
@@ -60,7 +60,7 @@ describe('NFTokenMint', function () {
6060
Issuer: 'rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm',
6161
TransferFee: 1,
6262
NFTokenTaxon: 0,
63-
URI: convertStringToHex('http://xrpl.org'),
63+
URI: stringToHex('http://xrpl.org'),
6464
} as any
6565

6666
assert.throws(

‎packages/xrpl/test/utils/hexConversion.test.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1+
import { stringToHex } from '@xrplf/isomorphic/utils'
12
import { assert } from 'chai'
23

3-
import { convertHexToString, convertStringToHex } from '../../src/utils'
4+
import { convertHexToString } from '../../src/utils'
45

5-
describe('convertHexToString and convertStringToHex', function () {
6+
describe('convertHexToString and stringToHex', function () {
67
it('converts "example.com"', function () {
78
const str = 'example.com'
8-
const hex = convertStringToHex(str)
9+
const hex = stringToHex(str)
910
assert.strictEqual(
1011
hex,
1112
'6578616D706C652E636F6D',
@@ -21,7 +22,7 @@ describe('convertHexToString and convertStringToHex', function () {
2122

2223
it('converts "你好"', function () {
2324
const str = '你好'
24-
const hex = convertStringToHex(str)
25+
const hex = stringToHex(str)
2526
assert.strictEqual(hex, 'E4BDA0E5A5BD', 'should convert to hex equivalent')
2627
const result = convertHexToString(hex)
2728
assert.strictEqual(result, '你好', 'should convert back to 你好')

0 commit comments

Comments
 (0)