From 6eec7b0b77243a585c83efee10d27700cf4d7a28 Mon Sep 17 00:00:00 2001 From: Mayukha Vadari Date: Tue, 21 Sep 2021 14:25:37 -0400 Subject: [PATCH] refactor: move everything out of the common folder (#1629) * remove common/constants (all in models now) * remove common/txFlags (all in models now) * move ecdsa from src/common to src * move errors from src/common to src, export at top level --- src/client/connection.ts | 2 +- src/client/index.ts | 11 +-- src/client/requestManager.ts | 6 +- src/common/constants.ts | 99 ------------------- src/common/txflags.ts | 61 ------------ src/{common => }/ecdsa.ts | 0 src/{common => }/errors.ts | 0 src/index.ts | 2 + src/models/transactions/accountDelete.ts | 2 +- src/models/transactions/accountSet.ts | 2 +- src/models/transactions/checkCancel.ts | 2 +- src/models/transactions/checkCash.ts | 2 +- src/models/transactions/checkCreate.ts | 2 +- src/models/transactions/common.ts | 2 +- src/models/transactions/depositPreauth.ts | 2 +- src/models/transactions/escrowCancel.ts | 2 +- src/models/transactions/escrowCreate.ts | 2 +- src/models/transactions/escrowFinish.ts | 2 +- src/models/transactions/offerCancel.ts | 2 +- src/models/transactions/offerCreate.ts | 2 +- src/models/transactions/payment.ts | 2 +- .../transactions/paymentChannelClaim.ts | 2 +- .../transactions/paymentChannelCreate.ts | 2 +- src/models/transactions/paymentChannelFund.ts | 2 +- src/models/transactions/setRegularKey.ts | 2 +- src/models/transactions/signerListSet.ts | 2 +- src/models/transactions/ticketCreate.ts | 2 +- src/models/transactions/transaction.ts | 2 +- src/models/transactions/trustSet.ts | 2 +- src/models/utils/index.ts | 2 +- src/sugar/autofill.ts | 2 +- src/sugar/submit.ts | 2 +- src/transaction/combine.ts | 2 +- src/utils/generateAddress.ts | 4 +- src/utils/hashes/ledgerHash.ts | 2 +- src/utils/xrpConversion.ts | 2 +- src/wallet/generateFaucetWallet.ts | 2 +- src/wallet/index.ts | 4 +- src/wallet/signer.ts | 2 +- test/client/submitSignedTransaction.ts | 2 +- test/connection.ts | 7 +- test/mockRippledTest.ts | 2 +- test/models/accountDelete.ts | 3 +- test/models/accountSet.ts | 3 +- test/models/baseTransaction.ts | 2 +- test/models/checkCancel.ts | 3 +- test/models/checkCash.ts | 3 +- test/models/checkCreate.ts | 3 +- test/models/depositPreauth.ts | 3 +- test/models/escrowCancel.ts | 3 +- test/models/escrowCreate.ts | 3 +- test/models/escrowFinish.ts | 3 +- test/models/offerCancel.ts | 3 +- test/models/offerCreate.ts | 3 +- test/models/payment.ts | 8 +- test/models/paymentChannelClaim.ts | 7 +- test/models/paymentChannelCreate.ts | 7 +- test/models/paymentChannelFund.ts | 7 +- test/models/setRegularKey.ts | 3 +- test/models/signerListSet.ts | 3 +- test/models/ticketCreate.ts | 3 +- test/models/trustSet.ts | 3 +- test/utils/computeLedgerHash.ts | 2 +- test/utils/generateAddress.ts | 4 +- test/utils/hashes.ts | 3 +- test/wallet/index.ts | 7 +- test/wallet/signer.ts | 8 +- 67 files changed, 92 insertions(+), 266 deletions(-) delete mode 100644 src/common/constants.ts delete mode 100644 src/common/txflags.ts rename src/{common => }/ecdsa.ts (100%) rename src/{common => }/errors.ts (100%) diff --git a/src/client/connection.ts b/src/client/connection.ts index a7215e90..09ae0756 100644 --- a/src/client/connection.ts +++ b/src/client/connection.ts @@ -12,7 +12,7 @@ import { NotConnectedError, ConnectionError, XrplError, -} from '../common/errors' +} from '../errors' import { BaseRequest } from '../models/methods/baseMethod' import ExponentialBackoff from './backoff' diff --git a/src/client/index.ts b/src/client/index.ts index ecd98434..7fd47416 100644 --- a/src/client/index.ts +++ b/src/client/index.ts @@ -3,10 +3,8 @@ import * as assert from 'assert' import { EventEmitter } from 'events' -import * as constants from '../common/constants' -import { ValidationError, XrplError } from '../common/errors' -import * as errors from '../common/errors' -import { txFlags } from '../common/txflags' +import { ValidationError, XrplError } from '../errors' +import * as errors from '../errors' import { // account methods AccountChannelsRequest, @@ -538,11 +536,6 @@ class Client extends EventEmitter { public generateFaucetWallet = prepend(generateFaucetWallet, this) public errors = errors - - public txFlags = txFlags - public static txFlags = txFlags - public accountSetFlags = constants.AccountSetFlags - public static accountSetFlags = constants.AccountSetFlags } export { Client, Connection } diff --git a/src/client/requestManager.ts b/src/client/requestManager.ts index a9e00c05..6cb0160f 100644 --- a/src/client/requestManager.ts +++ b/src/client/requestManager.ts @@ -1,8 +1,4 @@ -import { - ResponseFormatError, - RippledError, - TimeoutError, -} from '../common/errors' +import { ResponseFormatError, RippledError, TimeoutError } from '../errors' import { Response } from '../models/methods' import { BaseRequest, ErrorResponse } from '../models/methods/baseMethod' diff --git a/src/common/constants.ts b/src/common/constants.ts deleted file mode 100644 index 3f10e2bf..00000000 --- a/src/common/constants.ts +++ /dev/null @@ -1,99 +0,0 @@ -import { txFlagIndices } from './txflags' - -// Ordering from https://developers.ripple.com/accountroot.html -const accountRootFlags = { - // lsfDefaultRipple: - // Enable rippling on trust lines by default. - // Required for issuing addresses; discouraged for others. - DefaultRipple: 0x00800000, - - // lsfDepositAuth: - // Require account to auth deposits. - // This account can only receive funds from transactions it sends, - // or preauthorized accounts. - DepositAuth: 0x01000000, - - // lsfDisableMaster: - // Force regular key. - // Disallows use of the master key. - DisableMaster: 0x00100000, - - // lsfDisallowXRP: - // Disallow sending XRP. - // Not enforced by rippled; client applications should check. - DisallowXRP: 0x00080000, - - // lsfGlobalFreeze: - // Trustlines globally frozen. - GlobalFreeze: 0x00400000, - - // lsfNoFreeze: - // Permanently disallowed freezing trustlines. - // Once enabled, cannot be disabled. - NoFreeze: 0x00200000, - - // lsfPasswordSpent: - // Password set fee is spent. - // The account has used its free SetRegularKey transaction. - PasswordSpent: 0x00010000, - - // lsfRequireAuth: - // Require authorization to hold IOUs (issuances). - RequireAuth: 0x00040000, - - // lsfRequireDestTag: - // Require a DestinationTag for incoming payments. - RequireDestTag: 0x00020000, -} - -const AccountFlags = { - passwordSpent: accountRootFlags.PasswordSpent, - requireDestinationTag: accountRootFlags.RequireDestTag, - requireAuthorization: accountRootFlags.RequireAuth, - depositAuth: accountRootFlags.DepositAuth, - disallowIncomingXRP: accountRootFlags.DisallowXRP, - disableMasterKey: accountRootFlags.DisableMaster, - noFreeze: accountRootFlags.NoFreeze, - globalFreeze: accountRootFlags.GlobalFreeze, - defaultRipple: accountRootFlags.DefaultRipple, -} - -export interface Settings { - passwordSpent?: boolean - requireDestinationTag?: boolean - requireAuthorization?: boolean - depositAuth?: boolean - disallowIncomingXRP?: boolean - disableMasterKey?: boolean - noFreeze?: boolean - globalFreeze?: boolean - defaultRipple?: boolean -} - -const AccountSetFlags = { - requireDestinationTag: txFlagIndices.AccountSet.asfRequireDest, - requireAuthorization: txFlagIndices.AccountSet.asfRequireAuth, - depositAuth: txFlagIndices.AccountSet.asfDepositAuth, - disallowIncomingXRP: txFlagIndices.AccountSet.asfDisallowXRP, - disableMasterKey: txFlagIndices.AccountSet.asfDisableMaster, - enableTransactionIDTracking: txFlagIndices.AccountSet.asfAccountTxnID, - noFreeze: txFlagIndices.AccountSet.asfNoFreeze, - globalFreeze: txFlagIndices.AccountSet.asfGlobalFreeze, - defaultRipple: txFlagIndices.AccountSet.asfDefaultRipple, -} - -const AccountFields = { - EmailHash: { - name: 'emailHash', - encoding: 'hex', - length: 32, - defaults: '00000000000000000000000000000000', - }, - WalletLocator: { name: 'walletLocator' }, - MessageKey: { name: 'messageKey' }, - Domain: { name: 'domain', encoding: 'hex' }, - TransferRate: { name: 'transferRate', defaults: 0, shift: 9 }, - TickSize: { name: 'tickSize', defaults: 0 }, -} - -export { AccountFields, AccountSetFlags, AccountFlags } diff --git a/src/common/txflags.ts b/src/common/txflags.ts deleted file mode 100644 index 2dfc0894..00000000 --- a/src/common/txflags.ts +++ /dev/null @@ -1,61 +0,0 @@ -const txFlags = { - // Universal flags can apply to any transaction type - Universal: { - FullyCanonicalSig: 0x80000000, - }, - - AccountSet: { - RequireDestTag: 0x00010000, - OptionalDestTag: 0x00020000, - RequireAuth: 0x00040000, - OptionalAuth: 0x00080000, - DisallowXRP: 0x00100000, - AllowXRP: 0x00200000, - }, - - TrustSet: { - SetAuth: 0x00010000, - NoRipple: 0x00020000, - SetNoRipple: 0x00020000, - ClearNoRipple: 0x00040000, - SetFreeze: 0x00100000, - ClearFreeze: 0x00200000, - }, - - OfferCreate: { - Passive: 0x00010000, - ImmediateOrCancel: 0x00020000, - FillOrKill: 0x00040000, - Sell: 0x00080000, - }, - - Payment: { - NoRippleDirect: 0x00010000, - PartialPayment: 0x00020000, - LimitQuality: 0x00040000, - }, - - PaymentChannelClaim: { - Renew: 0x00010000, - Close: 0x00020000, - }, -} - -// The following are integer (as opposed to bit) flags -// that can be set for particular transactions in the -// SetFlag or ClearFlag field -const txFlagIndices = { - AccountSet: { - asfRequireDest: 1, - asfRequireAuth: 2, - asfDisallowXRP: 3, - asfDisableMaster: 4, - asfAccountTxnID: 5, - asfNoFreeze: 6, - asfGlobalFreeze: 7, - asfDefaultRipple: 8, - asfDepositAuth: 9, - }, -} - -export { txFlags, txFlagIndices } diff --git a/src/common/ecdsa.ts b/src/ecdsa.ts similarity index 100% rename from src/common/ecdsa.ts rename to src/ecdsa.ts diff --git a/src/common/errors.ts b/src/errors.ts similarity index 100% rename from src/common/errors.ts rename to src/errors.ts diff --git a/src/index.ts b/src/index.ts index b88631b9..1ec0f4e3 100644 --- a/src/index.ts +++ b/src/index.ts @@ -9,4 +9,6 @@ export * from './models/transactions' export * from './utils' +export * from './errors' + export { default as Wallet } from './wallet' diff --git a/src/models/transactions/accountDelete.ts b/src/models/transactions/accountDelete.ts index 682e5d09..46e505a1 100644 --- a/src/models/transactions/accountDelete.ts +++ b/src/models/transactions/accountDelete.ts @@ -1,4 +1,4 @@ -import { ValidationError } from '../../common/errors' +import { ValidationError } from '../../errors' import { BaseTransaction, validateBaseTransaction } from './common' diff --git a/src/models/transactions/accountSet.ts b/src/models/transactions/accountSet.ts index dec622b8..e7ccdd35 100644 --- a/src/models/transactions/accountSet.ts +++ b/src/models/transactions/accountSet.ts @@ -1,5 +1,5 @@ /* eslint-disable complexity -- Necessary for validateAccountSet */ -import { ValidationError } from '../../common/errors' +import { ValidationError } from '../../errors' import { BaseTransaction, validateBaseTransaction } from './common' diff --git a/src/models/transactions/checkCancel.ts b/src/models/transactions/checkCancel.ts index 739e88b5..bc572092 100644 --- a/src/models/transactions/checkCancel.ts +++ b/src/models/transactions/checkCancel.ts @@ -1,4 +1,4 @@ -import { ValidationError } from '../../common/errors' +import { ValidationError } from '../../errors' import { BaseTransaction, validateBaseTransaction } from './common' diff --git a/src/models/transactions/checkCash.ts b/src/models/transactions/checkCash.ts index 92b0f965..f78165d5 100644 --- a/src/models/transactions/checkCash.ts +++ b/src/models/transactions/checkCash.ts @@ -1,5 +1,5 @@ /* eslint-disable complexity -- Necessary for validateCheckCash */ -import { ValidationError } from '../../common/errors' +import { ValidationError } from '../../errors' import { Amount } from '../common' import { BaseTransaction, validateBaseTransaction, isAmount } from './common' diff --git a/src/models/transactions/checkCreate.ts b/src/models/transactions/checkCreate.ts index 096ef4f8..43b137f2 100644 --- a/src/models/transactions/checkCreate.ts +++ b/src/models/transactions/checkCreate.ts @@ -1,5 +1,5 @@ /* eslint-disable complexity -- Necessary for validateCheckCreate */ -import { ValidationError } from '../../common/errors' +import { ValidationError } from '../../errors' import { Amount } from '../common' import { diff --git a/src/models/transactions/common.ts b/src/models/transactions/common.ts index 3264c554..648eb9fb 100644 --- a/src/models/transactions/common.ts +++ b/src/models/transactions/common.ts @@ -1,7 +1,7 @@ /* eslint-disable max-lines-per-function -- Necessary for validateBaseTransaction */ /* eslint-disable complexity -- Necessary for validateBaseTransaction */ /* eslint-disable max-statements -- Necessary for validateBaseTransaction */ -import { ValidationError } from '../../common/errors' +import { ValidationError } from '../../errors' import { Memo, Signer } from '../common' import { onlyHasFields } from '../utils' diff --git a/src/models/transactions/depositPreauth.ts b/src/models/transactions/depositPreauth.ts index c0d2a6ac..68c9238c 100644 --- a/src/models/transactions/depositPreauth.ts +++ b/src/models/transactions/depositPreauth.ts @@ -1,5 +1,5 @@ /* eslint-disable complexity -- Necessary for validateDepositPreauth */ -import { ValidationError } from '../../common/errors' +import { ValidationError } from '../../errors' import { BaseTransaction, validateBaseTransaction } from './common' diff --git a/src/models/transactions/escrowCancel.ts b/src/models/transactions/escrowCancel.ts index 34183f42..f4dbe7a5 100644 --- a/src/models/transactions/escrowCancel.ts +++ b/src/models/transactions/escrowCancel.ts @@ -1,4 +1,4 @@ -import { ValidationError } from '../../common/errors' +import { ValidationError } from '../../errors' import { BaseTransaction, validateBaseTransaction } from './common' diff --git a/src/models/transactions/escrowCreate.ts b/src/models/transactions/escrowCreate.ts index cea7685c..094244a5 100644 --- a/src/models/transactions/escrowCreate.ts +++ b/src/models/transactions/escrowCreate.ts @@ -1,5 +1,5 @@ /* eslint-disable complexity -- Necessary for validateEscrowCreate */ -import { ValidationError } from '../../common/errors' +import { ValidationError } from '../../errors' import { BaseTransaction, validateBaseTransaction } from './common' diff --git a/src/models/transactions/escrowFinish.ts b/src/models/transactions/escrowFinish.ts index ad6c56cb..9d70b42b 100644 --- a/src/models/transactions/escrowFinish.ts +++ b/src/models/transactions/escrowFinish.ts @@ -1,4 +1,4 @@ -import { ValidationError } from '../../common/errors' +import { ValidationError } from '../../errors' import { BaseTransaction, validateBaseTransaction } from './common' diff --git a/src/models/transactions/offerCancel.ts b/src/models/transactions/offerCancel.ts index bfe64299..4d886fee 100644 --- a/src/models/transactions/offerCancel.ts +++ b/src/models/transactions/offerCancel.ts @@ -1,4 +1,4 @@ -import { ValidationError } from '../../common/errors' +import { ValidationError } from '../../errors' import { BaseTransaction, validateBaseTransaction } from './common' diff --git a/src/models/transactions/offerCreate.ts b/src/models/transactions/offerCreate.ts index a350034e..77cd052b 100644 --- a/src/models/transactions/offerCreate.ts +++ b/src/models/transactions/offerCreate.ts @@ -1,5 +1,5 @@ /* eslint-disable complexity -- Necessary for validateOfferCreate */ -import { ValidationError } from '../../common/errors' +import { ValidationError } from '../../errors' import { Amount } from '../common' import { diff --git a/src/models/transactions/payment.ts b/src/models/transactions/payment.ts index be7e8b91..52b29659 100644 --- a/src/models/transactions/payment.ts +++ b/src/models/transactions/payment.ts @@ -1,6 +1,6 @@ /* eslint-disable max-statements -- Necessary for validatePayment */ /* eslint-disable complexity -- Necessary for validatePayment */ -import { ValidationError } from '../../common/errors' +import { ValidationError } from '../../errors' import { Amount, Path } from '../common' import { isFlagEnabled } from '../utils' diff --git a/src/models/transactions/paymentChannelClaim.ts b/src/models/transactions/paymentChannelClaim.ts index 596d1e95..efdaefb9 100644 --- a/src/models/transactions/paymentChannelClaim.ts +++ b/src/models/transactions/paymentChannelClaim.ts @@ -1,5 +1,5 @@ /* eslint-disable complexity -- Necessary for validatePaymentChannelClaim */ -import { ValidationError } from '../../common/errors' +import { ValidationError } from '../../errors' import { BaseTransaction, GlobalFlags, validateBaseTransaction } from './common' diff --git a/src/models/transactions/paymentChannelCreate.ts b/src/models/transactions/paymentChannelCreate.ts index c6405865..40ffb28b 100644 --- a/src/models/transactions/paymentChannelCreate.ts +++ b/src/models/transactions/paymentChannelCreate.ts @@ -1,5 +1,5 @@ /* eslint-disable complexity -- Necessary for validatePaymentChannelCreate */ -import { ValidationError } from '../../common/errors' +import { ValidationError } from '../../errors' import { BaseTransaction, validateBaseTransaction } from './common' diff --git a/src/models/transactions/paymentChannelFund.ts b/src/models/transactions/paymentChannelFund.ts index 026c3dff..51667ee5 100644 --- a/src/models/transactions/paymentChannelFund.ts +++ b/src/models/transactions/paymentChannelFund.ts @@ -1,4 +1,4 @@ -import { ValidationError } from '../../common/errors' +import { ValidationError } from '../../errors' import { BaseTransaction, validateBaseTransaction } from './common' diff --git a/src/models/transactions/setRegularKey.ts b/src/models/transactions/setRegularKey.ts index 9b9b25e8..50a9c407 100644 --- a/src/models/transactions/setRegularKey.ts +++ b/src/models/transactions/setRegularKey.ts @@ -1,4 +1,4 @@ -import { ValidationError } from '../../common/errors' +import { ValidationError } from '../../errors' import { BaseTransaction, validateBaseTransaction } from './common' diff --git a/src/models/transactions/signerListSet.ts b/src/models/transactions/signerListSet.ts index 8a9a277c..27030a78 100644 --- a/src/models/transactions/signerListSet.ts +++ b/src/models/transactions/signerListSet.ts @@ -1,4 +1,4 @@ -import { ValidationError } from '../../common/errors' +import { ValidationError } from '../../errors' import { SignerEntry } from '../common' import { BaseTransaction, validateBaseTransaction } from './common' diff --git a/src/models/transactions/ticketCreate.ts b/src/models/transactions/ticketCreate.ts index 0f5388b5..4c0e4694 100644 --- a/src/models/transactions/ticketCreate.ts +++ b/src/models/transactions/ticketCreate.ts @@ -1,4 +1,4 @@ -import { ValidationError } from '../../common/errors' +import { ValidationError } from '../../errors' import { BaseTransaction, validateBaseTransaction } from './common' diff --git a/src/models/transactions/transaction.ts b/src/models/transactions/transaction.ts index 205bfb80..a224e0a6 100644 --- a/src/models/transactions/transaction.ts +++ b/src/models/transactions/transaction.ts @@ -4,7 +4,7 @@ import _ from 'lodash' import { encode, decode } from 'ripple-binary-codec' -import { ValidationError } from '../../common/errors' +import { ValidationError } from '../../errors' import { setTransactionFlagsToNumber } from '../utils' import { AccountDelete, validateAccountDelete } from './accountDelete' diff --git a/src/models/transactions/trustSet.ts b/src/models/transactions/trustSet.ts index e8af0c49..ae8b1a22 100644 --- a/src/models/transactions/trustSet.ts +++ b/src/models/transactions/trustSet.ts @@ -1,4 +1,4 @@ -import { ValidationError } from '../../common/errors' +import { ValidationError } from '../../errors' import { Amount } from '../common' import { diff --git a/src/models/utils/index.ts b/src/models/utils/index.ts index def2d01e..570cba1a 100644 --- a/src/models/utils/index.ts +++ b/src/models/utils/index.ts @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign -- param reassign is safe */ /* eslint-disable no-bitwise -- flags require bitwise operations */ -import { ValidationError } from '../../common/errors' +import { ValidationError } from '../../errors' // eslint-disable-next-line import/no-cycle -- cycle is safe import { AccountSetFlagsInterface, diff --git a/src/sugar/autofill.ts b/src/sugar/autofill.ts index 5057ffca..671d6a7e 100644 --- a/src/sugar/autofill.ts +++ b/src/sugar/autofill.ts @@ -2,7 +2,7 @@ import BigNumber from 'bignumber.js' import { xAddressToClassicAddress, isValidXAddress } from 'ripple-address-codec' import type { Client } from '..' -import { ValidationError } from '../common/errors' +import { ValidationError } from '../errors' import { AccountInfoRequest, LedgerRequest } from '../models/methods' import { Transaction } from '../models/transactions' import { setTransactionFlagsToNumber } from '../models/utils' diff --git a/src/sugar/submit.ts b/src/sugar/submit.ts index 308d20a6..c3fd4e5e 100644 --- a/src/sugar/submit.ts +++ b/src/sugar/submit.ts @@ -1,7 +1,7 @@ import { decode, encode } from 'ripple-binary-codec' import type { Client, SubmitRequest, SubmitResponse, Wallet } from '..' -import { ValidationError } from '../common/errors' +import { ValidationError } from '../errors' import { Transaction } from '../models/transactions' import { sign } from '../wallet/signer' diff --git a/src/transaction/combine.ts b/src/transaction/combine.ts index 1ad53595..67580e56 100644 --- a/src/transaction/combine.ts +++ b/src/transaction/combine.ts @@ -4,7 +4,7 @@ import { decodeAccountID } from 'ripple-address-codec' import binary from 'ripple-binary-codec' import { JsonObject } from 'ripple-binary-codec/dist/types/serialized-type' -import { ValidationError } from '../common/errors' +import { ValidationError } from '../errors' import { computeSignedTransactionHash } from '../utils/hashes' /** diff --git a/src/utils/generateAddress.ts b/src/utils/generateAddress.ts index 57e43ace..33fb2fa7 100644 --- a/src/utils/generateAddress.ts +++ b/src/utils/generateAddress.ts @@ -1,8 +1,8 @@ import { classicAddressToXAddress } from 'ripple-address-codec' import keypairs from 'ripple-keypairs' -import ECDSA from '../common/ecdsa' -import { UnexpectedError } from '../common/errors' +import ECDSA from '../ecdsa' +import { UnexpectedError } from '../errors' export interface GeneratedAddress { xAddress: string diff --git a/src/utils/hashes/ledgerHash.ts b/src/utils/hashes/ledgerHash.ts index ba416c7b..136aa5e0 100644 --- a/src/utils/hashes/ledgerHash.ts +++ b/src/utils/hashes/ledgerHash.ts @@ -6,7 +6,7 @@ import BigNumber from 'bignumber.js' import { decode, encode } from 'ripple-binary-codec' -import { ValidationError } from '../../common/errors' +import { ValidationError } from '../../errors' import type { Ledger } from '../../models/ledger' import { LedgerEntry } from '../../models/ledger' import { Transaction } from '../../models/transactions' diff --git a/src/utils/xrpConversion.ts b/src/utils/xrpConversion.ts index f5501b7c..9a802fb5 100644 --- a/src/utils/xrpConversion.ts +++ b/src/utils/xrpConversion.ts @@ -1,6 +1,6 @@ import BigNumber from 'bignumber.js' -import { ValidationError } from '../common/errors' +import { ValidationError } from '../errors' const DROPS_PER_XRP = 1000000.0 const MAX_FRACTION_LENGTH = 6 diff --git a/src/wallet/generateFaucetWallet.ts b/src/wallet/generateFaucetWallet.ts index 2251df3d..11a80398 100644 --- a/src/wallet/generateFaucetWallet.ts +++ b/src/wallet/generateFaucetWallet.ts @@ -4,7 +4,7 @@ import { request as httpsRequest, RequestOptions } from 'https' import { isValidClassicAddress } from 'ripple-address-codec' import type { Client } from '..' -import { RippledError, XRPLFaucetError } from '../common/errors' +import { RippledError, XRPLFaucetError } from '../errors' import { GeneratedAddress } from '../utils/generateAddress' import Wallet from '.' diff --git a/src/wallet/index.ts b/src/wallet/index.ts index ec45163a..5e7aa328 100644 --- a/src/wallet/index.ts +++ b/src/wallet/index.ts @@ -20,8 +20,8 @@ import { sign, } from 'ripple-keypairs' -import ECDSA from '../common/ecdsa' -import { ValidationError } from '../common/errors' +import ECDSA from '../ecdsa' +import { ValidationError } from '../errors' import { Transaction } from '../models/transactions' const DEFAULT_ALGORITHM: ECDSA = ECDSA.ed25519 diff --git a/src/wallet/signer.ts b/src/wallet/signer.ts index e01575f1..9af3d997 100644 --- a/src/wallet/signer.ts +++ b/src/wallet/signer.ts @@ -9,7 +9,7 @@ import { } from 'ripple-binary-codec' import { sign as signWithKeypair, verify } from 'ripple-keypairs' -import { ValidationError } from '../common/errors' +import { ValidationError } from '../errors' import { Signer } from '../models/common' import { Transaction } from '../models/transactions' import { validateBaseTransaction } from '../models/transactions/common' diff --git a/test/client/submitSignedTransaction.ts b/test/client/submitSignedTransaction.ts index 213d072a..c77af642 100644 --- a/test/client/submitSignedTransaction.ts +++ b/test/client/submitSignedTransaction.ts @@ -1,6 +1,6 @@ import { assert } from 'chai' -import { ValidationError } from 'xrpl-local/common/errors' +import { ValidationError } from 'xrpl-local' import { Transaction } from 'xrpl-local/models/transactions' import rippled from '../fixtures/rippled' diff --git a/test/connection.ts b/test/connection.ts index 505e39c5..ccd50d9a 100644 --- a/test/connection.ts +++ b/test/connection.ts @@ -3,17 +3,16 @@ import net from 'net' import { assert } from 'chai' import _ from 'lodash' -import { Client } from 'xrpl-local' -import { Connection } from 'xrpl-local/client' - import { + Client, ConnectionError, DisconnectedError, NotConnectedError, ResponseFormatError, XrplError, TimeoutError, -} from '../src/common/errors' +} from 'xrpl-local' +import { Connection } from 'xrpl-local/client' import rippled from './fixtures/rippled' import { setupClient, teardownClient } from './setupClient' diff --git a/test/mockRippledTest.ts b/test/mockRippledTest.ts index bacc5b0d..247037d7 100644 --- a/test/mockRippledTest.ts +++ b/test/mockRippledTest.ts @@ -1,6 +1,6 @@ import { assert } from 'chai' -import { RippledError } from '../src/common/errors' +import { RippledError } from 'xrpl-local' import { setupClient, teardownClient } from './setupClient' import { assertRejects } from './testUtils' diff --git a/test/models/accountDelete.ts b/test/models/accountDelete.ts index a7a517c6..12a76d53 100644 --- a/test/models/accountDelete.ts +++ b/test/models/accountDelete.ts @@ -1,7 +1,6 @@ import { assert } from 'chai' -import { validateAccountDelete, validate } from 'xrpl-local' -import { ValidationError } from 'xrpl-local/common/errors' +import { validateAccountDelete, validate, ValidationError } from 'xrpl-local' /** * AccountDelete Transaction Verification Testing. diff --git a/test/models/accountSet.ts b/test/models/accountSet.ts index b8bd8bc8..1da698d5 100644 --- a/test/models/accountSet.ts +++ b/test/models/accountSet.ts @@ -1,7 +1,6 @@ import { assert } from 'chai' -import { validateAccountSet, validate } from 'xrpl-local' -import { ValidationError } from 'xrpl-local/common/errors' +import { validateAccountSet, validate, ValidationError } from 'xrpl-local' /** * AccountSet Transaction Verification Testing. diff --git a/test/models/baseTransaction.ts b/test/models/baseTransaction.ts index 26f905f7..5559d4b1 100644 --- a/test/models/baseTransaction.ts +++ b/test/models/baseTransaction.ts @@ -1,6 +1,6 @@ import { assert } from 'chai' -import { ValidationError } from 'xrpl-local/common/errors' +import { ValidationError } from 'xrpl-local' import { validateBaseTransaction } from 'xrpl-local/models/transactions/common' /** diff --git a/test/models/checkCancel.ts b/test/models/checkCancel.ts index aed98773..54cac038 100644 --- a/test/models/checkCancel.ts +++ b/test/models/checkCancel.ts @@ -1,7 +1,6 @@ import { assert } from 'chai' -import { validateCheckCancel, validate } from 'xrpl-local' -import { ValidationError } from 'xrpl-local/common/errors' +import { validateCheckCancel, validate, ValidationError } from 'xrpl-local' /** * CheckCancel Transaction Verification Testing. diff --git a/test/models/checkCash.ts b/test/models/checkCash.ts index 5a5b1ae5..061b2330 100644 --- a/test/models/checkCash.ts +++ b/test/models/checkCash.ts @@ -1,7 +1,6 @@ import { assert } from 'chai' -import { validateCheckCash, validate } from 'xrpl-local' -import { ValidationError } from 'xrpl-local/common/errors' +import { validateCheckCash, validate, ValidationError } from 'xrpl-local' /** * CheckCash Transaction Verification Testing. diff --git a/test/models/checkCreate.ts b/test/models/checkCreate.ts index ae37cdbd..4c4d58fe 100644 --- a/test/models/checkCreate.ts +++ b/test/models/checkCreate.ts @@ -1,7 +1,6 @@ import { assert } from 'chai' -import { validateCheckCreate, validate } from 'xrpl-local' -import { ValidationError } from 'xrpl-local/common/errors' +import { validateCheckCreate, validate, ValidationError } from 'xrpl-local' /** * CheckCreate Transaction Verification Testing. diff --git a/test/models/depositPreauth.ts b/test/models/depositPreauth.ts index b9996e12..d39a4a9c 100644 --- a/test/models/depositPreauth.ts +++ b/test/models/depositPreauth.ts @@ -1,7 +1,6 @@ import { assert } from 'chai' -import { validateDepositPreauth, validate } from 'xrpl-local' -import { ValidationError } from 'xrpl-local/common/errors' +import { validateDepositPreauth, validate, ValidationError } from 'xrpl-local' /** * DepositPreauth Transaction Verification Testing. diff --git a/test/models/escrowCancel.ts b/test/models/escrowCancel.ts index 92b42001..4d60dfc9 100644 --- a/test/models/escrowCancel.ts +++ b/test/models/escrowCancel.ts @@ -1,7 +1,6 @@ import { assert } from 'chai' -import { validateEscrowCancel, validate } from 'xrpl-local' -import { ValidationError } from 'xrpl-local/common/errors' +import { validateEscrowCancel, validate, ValidationError } from 'xrpl-local' /** * Transaction Verification Testing. diff --git a/test/models/escrowCreate.ts b/test/models/escrowCreate.ts index 52fc7e33..ece97f20 100644 --- a/test/models/escrowCreate.ts +++ b/test/models/escrowCreate.ts @@ -1,7 +1,6 @@ import { assert } from 'chai' -import { validateEscrowCreate, validate } from 'xrpl-local' -import { ValidationError } from 'xrpl-local/common/errors' +import { validateEscrowCreate, validate, ValidationError } from 'xrpl-local' /** * EscrowCreate Transaction Verification Testing. diff --git a/test/models/escrowFinish.ts b/test/models/escrowFinish.ts index d83e27d0..78bc2fb5 100644 --- a/test/models/escrowFinish.ts +++ b/test/models/escrowFinish.ts @@ -1,7 +1,6 @@ import { assert } from 'chai' -import { validateEscrowFinish, validate } from 'xrpl-local' -import { ValidationError } from 'xrpl-local/common/errors' +import { validateEscrowFinish, validate, ValidationError } from 'xrpl-local' /** * EscrowFinish Transaction Verification Testing. diff --git a/test/models/offerCancel.ts b/test/models/offerCancel.ts index 3ef30eba..f7d631cc 100644 --- a/test/models/offerCancel.ts +++ b/test/models/offerCancel.ts @@ -1,7 +1,6 @@ import { assert } from 'chai' -import { validateOfferCancel, validate } from 'xrpl-local' -import { ValidationError } from 'xrpl-local/common/errors' +import { validateOfferCancel, validate, ValidationError } from 'xrpl-local' /** * OfferCancel Transaction Verification Testing. diff --git a/test/models/offerCreate.ts b/test/models/offerCreate.ts index 31d068f8..cae201f4 100644 --- a/test/models/offerCreate.ts +++ b/test/models/offerCreate.ts @@ -1,7 +1,6 @@ import { assert } from 'chai' -import { validateOfferCreate, validate } from 'xrpl-local' -import { ValidationError } from 'xrpl-local/common/errors' +import { validateOfferCreate, validate, ValidationError } from 'xrpl-local' /** * OfferCreate Transaction Verification Testing. diff --git a/test/models/payment.ts b/test/models/payment.ts index f6461565..eb0c674d 100644 --- a/test/models/payment.ts +++ b/test/models/payment.ts @@ -1,7 +1,11 @@ import { assert } from 'chai' -import { validatePayment, validate, PaymentTransactionFlags } from 'xrpl-local' -import { ValidationError } from 'xrpl-local/common/errors' +import { + validatePayment, + validate, + PaymentTransactionFlags, + ValidationError, +} from 'xrpl-local' /** * PaymentTransaction Verification Testing. diff --git a/test/models/paymentChannelClaim.ts b/test/models/paymentChannelClaim.ts index ee6aa247..760049c3 100644 --- a/test/models/paymentChannelClaim.ts +++ b/test/models/paymentChannelClaim.ts @@ -1,7 +1,10 @@ import { assert } from 'chai' -import { validatePaymentChannelClaim, validate } from 'xrpl-local' -import { ValidationError } from 'xrpl-local/common/errors' +import { + validatePaymentChannelClaim, + validate, + ValidationError, +} from 'xrpl-local' /** * PaymentChannelClaim Transaction Verification Testing. diff --git a/test/models/paymentChannelCreate.ts b/test/models/paymentChannelCreate.ts index 7e1cdf3c..9a7877a0 100644 --- a/test/models/paymentChannelCreate.ts +++ b/test/models/paymentChannelCreate.ts @@ -1,7 +1,10 @@ import { assert } from 'chai' -import { validatePaymentChannelCreate, validate } from 'xrpl-local' -import { ValidationError } from 'xrpl-local/common/errors' +import { + validatePaymentChannelCreate, + validate, + ValidationError, +} from 'xrpl-local' /** * PaymentChannelCreate Transaction Verification Testing. diff --git a/test/models/paymentChannelFund.ts b/test/models/paymentChannelFund.ts index 44884a09..a0b06a0a 100644 --- a/test/models/paymentChannelFund.ts +++ b/test/models/paymentChannelFund.ts @@ -1,7 +1,10 @@ import { assert } from 'chai' -import { validatePaymentChannelFund, validate } from 'xrpl-local' -import { ValidationError } from 'xrpl-local/common/errors' +import { + validatePaymentChannelFund, + validate, + ValidationError, +} from 'xrpl-local' /** * PaymentChannelFund Transaction Verification Testing. diff --git a/test/models/setRegularKey.ts b/test/models/setRegularKey.ts index 0ae95079..7b5fa407 100644 --- a/test/models/setRegularKey.ts +++ b/test/models/setRegularKey.ts @@ -1,7 +1,6 @@ import { assert } from 'chai' -import { validate, validateSetRegularKey } from 'xrpl-local' -import { ValidationError } from 'xrpl-local/common/errors' +import { validate, validateSetRegularKey, ValidationError } from 'xrpl-local' /** * SetRegularKey Transaction Verification Testing. diff --git a/test/models/signerListSet.ts b/test/models/signerListSet.ts index 3a75b79d..6c19bfe6 100644 --- a/test/models/signerListSet.ts +++ b/test/models/signerListSet.ts @@ -1,7 +1,6 @@ import { assert } from 'chai' -import { validate, validateSignerListSet } from 'xrpl-local' -import { ValidationError } from 'xrpl-local/common/errors' +import { validate, validateSignerListSet, ValidationError } from 'xrpl-local' /** * SignerListSet Transaction Verification Testing. diff --git a/test/models/ticketCreate.ts b/test/models/ticketCreate.ts index 049c21f8..de1c4030 100644 --- a/test/models/ticketCreate.ts +++ b/test/models/ticketCreate.ts @@ -1,7 +1,6 @@ import { assert } from 'chai' -import { validateTicketCreate, validate } from 'xrpl-local' -import { ValidationError } from 'xrpl-local/common/errors' +import { validateTicketCreate, validate, ValidationError } from 'xrpl-local' /** * TicketCreate Transaction Verification Testing. diff --git a/test/models/trustSet.ts b/test/models/trustSet.ts index a84bd3b0..4c02aa34 100644 --- a/test/models/trustSet.ts +++ b/test/models/trustSet.ts @@ -1,7 +1,6 @@ import { assert } from 'chai' -import { validateTrustSet, validate } from 'xrpl-local' -import { ValidationError } from 'xrpl-local/common/errors' +import { validateTrustSet, validate, ValidationError } from 'xrpl-local' /** * TrustSet Transaction Verification Testing. diff --git a/test/utils/computeLedgerHash.ts b/test/utils/computeLedgerHash.ts index ee5a0ed3..50f266b2 100644 --- a/test/utils/computeLedgerHash.ts +++ b/test/utils/computeLedgerHash.ts @@ -1,6 +1,6 @@ import { assert } from 'chai' -import { ValidationError, XrplError } from '../../src/common/errors' +import { ValidationError, XrplError } from 'xrpl-local' import { computeLedgerHash } from '../../src/utils' import requests from '../fixtures/requests' import responses from '../fixtures/responses' diff --git a/test/utils/generateAddress.ts b/test/utils/generateAddress.ts index a07c4c8c..e88d99a9 100644 --- a/test/utils/generateAddress.ts +++ b/test/utils/generateAddress.ts @@ -1,7 +1,7 @@ import { assert } from 'chai' -import ECDSA from '../../src/common/ecdsa' -import { UnexpectedError } from '../../src/common/errors' +import ECDSA from '../../src/ecdsa' +import { UnexpectedError } from 'xrpl-local' import { generateXAddress, GenerateAddressOptions, diff --git a/test/utils/hashes.ts b/test/utils/hashes.ts index 09ec89ed..5c0a651c 100644 --- a/test/utils/hashes.ts +++ b/test/utils/hashes.ts @@ -4,8 +4,7 @@ import path from 'path' import { assert } from 'chai' import { encode } from 'ripple-binary-codec' -import { OfferCreate, Transaction } from 'xrpl-local' -import { ValidationError } from 'xrpl-local/common/errors' +import { OfferCreate, Transaction, ValidationError } from 'xrpl-local' import { computeStateTreeHash, diff --git a/test/wallet/index.ts b/test/wallet/index.ts index b2f013c6..2e95dff4 100644 --- a/test/wallet/index.ts +++ b/test/wallet/index.ts @@ -1,9 +1,10 @@ import { assert } from 'chai' import { decode } from 'ripple-binary-codec/dist' -import ECDSA from '../../src/common/ecdsa' -import { Transaction } from '../../src/models/transactions' -import Wallet from '../../src/wallet' +import { Transaction } from 'xrpl-local' +import ECDSA from 'xrpl-local/ecdsa' +import Wallet from 'xrpl-local/wallet' + import requests from '../fixtures/requests' import responses from '../fixtures/responses' diff --git a/test/wallet/signer.ts b/test/wallet/signer.ts index 6a7f7dc8..9e231e83 100644 --- a/test/wallet/signer.ts +++ b/test/wallet/signer.ts @@ -2,16 +2,14 @@ import { assert } from 'chai' import { decode, encode } from 'ripple-binary-codec/dist' import { JsonObject } from 'ripple-binary-codec/dist/types/serialized-type' -import { Transaction } from 'xrpl-local' - -import { ValidationError } from '../../src/common/errors' -import Wallet from '../../src/wallet' +import { Transaction, ValidationError } from 'xrpl-local' +import Wallet from 'xrpl-local/wallet' import { sign, authorizeChannel, multisign, verifySignature, -} from '../../src/wallet/signer' +} from 'xrpl-local/wallet/signer' const publicKey = '030E58CDD076E798C84755590AAF6237CA8FAE821070A59F648B517A30DC6F589D'