chore: restructure utils code
This commit is contained in:
parent
52dc24abfb
commit
8e30dbbbf2
|
@ -2,7 +2,7 @@ import nacl from 'tweetnacl';
|
|||
import type {SignKeyPair as KeyPair} from 'tweetnacl';
|
||||
import type {Buffer} from 'buffer';
|
||||
|
||||
import {toBuffer} from './util/to-buffer';
|
||||
import {toBuffer} from './utils/to-buffer';
|
||||
import {PublicKey} from './publickey';
|
||||
|
||||
/**
|
||||
|
|
|
@ -24,7 +24,7 @@ import type {Struct} from 'superstruct';
|
|||
import {Client as RpcWebSocketClient} from 'rpc-websockets';
|
||||
import RpcClient from 'jayson/lib/client/browser';
|
||||
|
||||
import {URL} from './util/url-impl';
|
||||
import {URL} from './utils/url-impl';
|
||||
import {AgentManager} from './agent-manager';
|
||||
import {EpochSchedule} from './epoch-schedule';
|
||||
import {SendTransactionError, SolanaJSONRPCError} from './errors';
|
||||
|
@ -35,14 +35,14 @@ import {Signer} from './keypair';
|
|||
import {MS_PER_SLOT} from './timing';
|
||||
import {Transaction, TransactionStatus} from './transaction';
|
||||
import {Message} from './message';
|
||||
import assert from './util/assert';
|
||||
import {sleep} from './util/sleep';
|
||||
import {toBuffer} from './util/to-buffer';
|
||||
import assert from './utils/assert';
|
||||
import {sleep} from './utils/sleep';
|
||||
import {toBuffer} from './utils/to-buffer';
|
||||
import {
|
||||
TransactionExpiredBlockheightExceededError,
|
||||
TransactionExpiredTimeoutError,
|
||||
} from './util/tx-expiry-custom-errors';
|
||||
import {makeWebsocketUrl} from './util/makeWebsocketUrl';
|
||||
} from './transaction/expiry-custom-errors';
|
||||
import {makeWebsocketUrl} from './utils/makeWebsocketUrl';
|
||||
import type {Blockhash} from './blockhash';
|
||||
import type {FeeCalculator} from './fee-calculator';
|
||||
import type {TransactionSignature} from './transaction';
|
||||
|
|
|
@ -4,6 +4,7 @@ export * from './bpf-loader-deprecated';
|
|||
export * from './bpf-loader';
|
||||
export * from './connection';
|
||||
export * from './epoch-schedule';
|
||||
export * from './errors';
|
||||
export * from './fee-calculator';
|
||||
export * from './keypair';
|
||||
export * from './loader';
|
||||
|
@ -15,12 +16,7 @@ export * from './transaction';
|
|||
export * from './validator-info';
|
||||
export * from './vote-account';
|
||||
export * from './sysvar';
|
||||
export * from './errors';
|
||||
export * from './util/borsh-schema';
|
||||
export * from './util/send-and-confirm-transaction';
|
||||
export * from './util/send-and-confirm-raw-transaction';
|
||||
export * from './util/tx-expiry-custom-errors';
|
||||
export * from './util/cluster';
|
||||
export * from './utils';
|
||||
|
||||
/**
|
||||
* There are 1-billion lamports in one SOL
|
||||
|
|
|
@ -4,8 +4,8 @@ import * as BufferLayout from '@solana/buffer-layout';
|
|||
import {PublicKey} from './publickey';
|
||||
import {Transaction, PACKET_DATA_SIZE} from './transaction';
|
||||
import {SYSVAR_RENT_PUBKEY} from './sysvar';
|
||||
import {sendAndConfirmTransaction} from './util/send-and-confirm-transaction';
|
||||
import {sleep} from './util/sleep';
|
||||
import {sendAndConfirmTransaction} from './utils/send-and-confirm-transaction';
|
||||
import {sleep} from './utils/sleep';
|
||||
import type {Connection} from './connection';
|
||||
import type {Signer} from './keypair';
|
||||
import {SystemProgram} from './programs/system';
|
||||
|
|
|
@ -6,8 +6,8 @@ import {PublicKey} from '../publickey';
|
|||
import type {Blockhash} from '../blockhash';
|
||||
import * as Layout from '../layout';
|
||||
import {PACKET_DATA_SIZE} from '../transaction/constants';
|
||||
import * as shortvec from '../util/shortvec-encoding';
|
||||
import {toBuffer} from '../util/to-buffer';
|
||||
import * as shortvec from '../utils/shortvec-encoding';
|
||||
import {toBuffer} from '../utils/to-buffer';
|
||||
import {CompiledInstruction, MessageHeader} from './index';
|
||||
|
||||
/**
|
||||
|
|
|
@ -6,7 +6,7 @@ import * as Layout from './layout';
|
|||
import {PublicKey} from './publickey';
|
||||
import type {FeeCalculator} from './fee-calculator';
|
||||
import {FeeCalculatorLayout} from './fee-calculator';
|
||||
import {toBuffer} from './util/to-buffer';
|
||||
import {toBuffer} from './utils/to-buffer';
|
||||
|
||||
/**
|
||||
* See https://github.com/solana-labs/solana/blob/0ea2843ec9cdc517572b8e62c959f41b55cf4453/sdk/src/nonce_state.rs#L29-L32
|
||||
|
|
|
@ -3,7 +3,7 @@ import * as BufferLayout from '@solana/buffer-layout';
|
|||
|
||||
import * as Layout from '../layout';
|
||||
import {PublicKey} from '../publickey';
|
||||
import * as bigintLayout from '../util/bigint';
|
||||
import * as bigintLayout from '../utils/bigint';
|
||||
import {SystemProgram} from './system';
|
||||
import {TransactionInstruction} from '../transaction';
|
||||
import {decodeData, encodeData, IInstructionInputData} from '../instruction';
|
||||
|
|
|
@ -8,7 +8,7 @@ import {
|
|||
} from '../instruction';
|
||||
import {PublicKey} from '../publickey';
|
||||
import {TransactionInstruction} from '../transaction';
|
||||
import {u64} from '../util/bigint';
|
||||
import {u64} from '../utils/bigint';
|
||||
|
||||
/**
|
||||
* Compute Budget Instruction class
|
||||
|
|
|
@ -5,7 +5,7 @@ import nacl from 'tweetnacl';
|
|||
import {Keypair} from '../keypair';
|
||||
import {PublicKey} from '../publickey';
|
||||
import {TransactionInstruction} from '../transaction';
|
||||
import assert from '../util/assert';
|
||||
import assert from '../utils/assert';
|
||||
|
||||
const PRIVATE_KEY_BYTES = 64;
|
||||
const PUBLIC_KEY_BYTES = 32;
|
||||
|
|
|
@ -5,8 +5,8 @@ import sha3 from 'js-sha3';
|
|||
|
||||
import {PublicKey} from '../publickey';
|
||||
import {TransactionInstruction} from '../transaction';
|
||||
import assert from '../util/assert';
|
||||
import {toBuffer} from '../util/to-buffer';
|
||||
import assert from '../utils/assert';
|
||||
import {toBuffer} from '../utils/to-buffer';
|
||||
|
||||
const {publicKeyCreate, ecdsaSign} = secp256k1;
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ import {
|
|||
SYSVAR_STAKE_HISTORY_PUBKEY,
|
||||
} from '../sysvar';
|
||||
import {Transaction, TransactionInstruction} from '../transaction';
|
||||
import {toBuffer} from '../util/to-buffer';
|
||||
import {toBuffer} from '../utils/to-buffer';
|
||||
|
||||
/**
|
||||
* Address of the stake config account which configures the rate
|
||||
|
|
|
@ -11,8 +11,8 @@ import {NONCE_ACCOUNT_LENGTH} from '../nonce-account';
|
|||
import {PublicKey} from '../publickey';
|
||||
import {SYSVAR_RECENT_BLOCKHASHES_PUBKEY, SYSVAR_RENT_PUBKEY} from '../sysvar';
|
||||
import {Transaction, TransactionInstruction} from '../transaction';
|
||||
import {toBuffer} from '../util/to-buffer';
|
||||
import {u64} from '../util/bigint';
|
||||
import {toBuffer} from '../utils/to-buffer';
|
||||
import {u64} from '../utils/bigint';
|
||||
|
||||
/**
|
||||
* Create account system transaction params
|
||||
|
|
|
@ -11,7 +11,7 @@ import {PublicKey} from '../publickey';
|
|||
import {SystemProgram} from './system';
|
||||
import {SYSVAR_CLOCK_PUBKEY, SYSVAR_RENT_PUBKEY} from '../sysvar';
|
||||
import {Transaction, TransactionInstruction} from '../transaction';
|
||||
import {toBuffer} from '../util/to-buffer';
|
||||
import {toBuffer} from '../utils/to-buffer';
|
||||
|
||||
/**
|
||||
* Vote account info
|
||||
|
|
|
@ -4,8 +4,8 @@ import {Buffer} from 'buffer';
|
|||
import nacl from 'tweetnacl';
|
||||
import {sha256} from '@ethersproject/sha2';
|
||||
|
||||
import {Struct, SOLANA_SCHEMA} from './util/borsh-schema';
|
||||
import {toBuffer} from './util/to-buffer';
|
||||
import {Struct, SOLANA_SCHEMA} from './utils/borsh-schema';
|
||||
import {toBuffer} from './utils/to-buffer';
|
||||
|
||||
/**
|
||||
* Maximum length of derived pubkey seed
|
||||
|
|
|
@ -1,2 +1,3 @@
|
|||
export * from './constants';
|
||||
export * from './expiry-custom-errors';
|
||||
export * from './legacy';
|
||||
|
|
|
@ -6,9 +6,9 @@ import {PACKET_DATA_SIZE, SIGNATURE_LENGTH_IN_BYTES} from './constants';
|
|||
import {Connection} from '../connection';
|
||||
import {Message} from '../message';
|
||||
import {PublicKey} from '../publickey';
|
||||
import * as shortvec from '../util/shortvec-encoding';
|
||||
import {toBuffer} from '../util/to-buffer';
|
||||
import invariant from '../util/assert';
|
||||
import * as shortvec from '../utils/shortvec-encoding';
|
||||
import {toBuffer} from '../utils/to-buffer';
|
||||
import invariant from '../utils/assert';
|
||||
import type {Signer} from '../keypair';
|
||||
import type {Blockhash} from '../blockhash';
|
||||
import type {CompiledInstruction} from '../message';
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
export * from './borsh-schema';
|
||||
export * from './cluster';
|
||||
export * from './send-and-confirm-raw-transaction';
|
||||
export * from './send-and-confirm-transaction';
|
|
@ -7,7 +7,7 @@ import {
|
|||
} from 'superstruct';
|
||||
|
||||
import * as Layout from './layout';
|
||||
import * as shortvec from './util/shortvec-encoding';
|
||||
import * as shortvec from './utils/shortvec-encoding';
|
||||
import {PublicKey} from './publickey';
|
||||
|
||||
export const VALIDATOR_INFO_KEY = new PublicKey(
|
||||
|
|
|
@ -3,7 +3,7 @@ import type {Buffer} from 'buffer';
|
|||
|
||||
import * as Layout from './layout';
|
||||
import {PublicKey} from './publickey';
|
||||
import {toBuffer} from './util/to-buffer';
|
||||
import {toBuffer} from './utils/to-buffer';
|
||||
|
||||
export const VOTE_PROGRAM_ID = new PublicKey(
|
||||
'Vote111111111111111111111111111111111111111',
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import {expect} from 'chai';
|
||||
|
||||
import {AgentManager, DESTROY_TIMEOUT_MS} from '../src/agent-manager';
|
||||
import {sleep} from '../src/util/sleep';
|
||||
import {sleep} from '../src/utils/sleep';
|
||||
|
||||
describe('AgentManager', () => {
|
||||
it('works', async () => {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import {expect} from 'chai';
|
||||
|
||||
import {clusterApiUrl} from '../src/util/cluster';
|
||||
import {clusterApiUrl} from '../src/utils/cluster';
|
||||
|
||||
describe('Cluster Util', () => {
|
||||
it('invalid', () => {
|
||||
|
|
|
@ -19,7 +19,7 @@ import {
|
|||
Keypair,
|
||||
Message,
|
||||
} from '../src';
|
||||
import invariant from '../src/util/assert';
|
||||
import invariant from '../src/utils/assert';
|
||||
import {MOCK_PORT, url} from './url';
|
||||
import {
|
||||
AccountInfo,
|
||||
|
@ -35,7 +35,7 @@ import {
|
|||
SignatureResult,
|
||||
SlotInfo,
|
||||
} from '../src/connection';
|
||||
import {sleep} from '../src/util/sleep';
|
||||
import {sleep} from '../src/utils/sleep';
|
||||
import {
|
||||
helpers,
|
||||
mockErrorMessage,
|
||||
|
@ -49,16 +49,17 @@ import {
|
|||
restoreRpcWebSocket,
|
||||
mockRpcMessage,
|
||||
} from './mocks/rpc-websockets';
|
||||
import {TransactionInstruction, TransactionSignature} from '../src/transaction';
|
||||
import {
|
||||
TransactionInstruction,
|
||||
TransactionSignature,
|
||||
TransactionExpiredBlockheightExceededError,
|
||||
TransactionExpiredTimeoutError,
|
||||
} from '../src/transaction';
|
||||
import type {
|
||||
SignatureStatus,
|
||||
TransactionError,
|
||||
KeyedAccountInfo,
|
||||
} from '../src/connection';
|
||||
import {
|
||||
TransactionExpiredBlockheightExceededError,
|
||||
TransactionExpiredTimeoutError,
|
||||
} from '../src/util/tx-expiry-custom-errors';
|
||||
|
||||
use(chaiAsPromised);
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ import * as mockttp from 'mockttp';
|
|||
|
||||
import {mockRpcMessage} from './rpc-websockets';
|
||||
import {Connection, PublicKey, Transaction, Signer} from '../../src';
|
||||
import invariant from '../../src/util/assert';
|
||||
import invariant from '../../src/utils/assert';
|
||||
import type {Commitment, HttpHeaders, RpcParams} from '../../src/connection';
|
||||
|
||||
export const mockServer: mockttp.Mockttp | undefined =
|
||||
|
|
|
@ -9,7 +9,7 @@ import {
|
|||
Connection,
|
||||
sendAndConfirmTransaction,
|
||||
} from '../../src';
|
||||
import {sleep} from '../../src/util/sleep';
|
||||
import {sleep} from '../../src/utils/sleep';
|
||||
import {helpers} from '../mocks/rpc-http';
|
||||
import {url} from '../url';
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@ import {
|
|||
LAMPORTS_PER_SOL,
|
||||
} from '../../src';
|
||||
import {NONCE_ACCOUNT_LENGTH} from '../../src/nonce-account';
|
||||
import {sleep} from '../../src/util/sleep';
|
||||
import {sleep} from '../../src/utils/sleep';
|
||||
import {helpers} from '../mocks/rpc-http';
|
||||
import {url} from '../url';
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import {expect} from 'chai';
|
||||
|
||||
import {decodeLength, encodeLength} from '../src/util/shortvec-encoding';
|
||||
import {decodeLength, encodeLength} from '../src/utils/shortvec-encoding';
|
||||
|
||||
function checkDecodedArray(array: Array<number>, expectedValue: number) {
|
||||
expect(decodeLength(array)).to.eq(expectedValue);
|
||||
|
|
|
@ -8,7 +8,7 @@ import {
|
|||
SystemProgram,
|
||||
LAMPORTS_PER_SOL,
|
||||
} from '../src';
|
||||
import invariant from '../src/util/assert';
|
||||
import invariant from '../src/utils/assert';
|
||||
import {MOCK_PORT, url} from './url';
|
||||
import {helpers, mockRpcResponse, mockServer} from './mocks/rpc-http';
|
||||
import {stubRpcWebSocket, restoreRpcWebSocket} from './mocks/rpc-websockets';
|
||||
|
|
|
@ -9,8 +9,8 @@ import {PublicKey} from '../src/publickey';
|
|||
import {Transaction, TransactionInstruction} from '../src/transaction';
|
||||
import {StakeProgram, SystemProgram} from '../src/programs';
|
||||
import {Message} from '../src/message';
|
||||
import invariant from '../src/util/assert';
|
||||
import {toBuffer} from '../src/util/to-buffer';
|
||||
import invariant from '../src/utils/assert';
|
||||
import {toBuffer} from '../src/utils/to-buffer';
|
||||
import {helpers} from './mocks/rpc-http';
|
||||
import {url} from './url';
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ import chaiAsPromised from 'chai-as-promised';
|
|||
|
||||
import {Connection} from '../src';
|
||||
import {url, wsUrl} from './url';
|
||||
import {sleep} from '../src/util/sleep';
|
||||
import {sleep} from '../src/utils/sleep';
|
||||
|
||||
use(chaiAsPromised);
|
||||
|
||||
|
|
Loading…
Reference in New Issue