feat: use new getSignatureStatuses endpoint and naming

This commit is contained in:
Justin Starry 2020-04-02 01:51:30 +08:00 committed by Michael Vines
parent 057b2861d3
commit 6f363e5221
5 changed files with 16 additions and 16 deletions

2
web3.js/module.d.ts vendored
View File

@ -196,7 +196,7 @@ declare module '@solana/web3.js' {
signature: TransactionSignature, signature: TransactionSignature,
commitment?: Commitment, commitment?: Commitment,
): Promise<RpcResponseAndContext<SignatureStatus | null>>; ): Promise<RpcResponseAndContext<SignatureStatus | null>>;
getSignatureStatusBatch( getSignatureStatuses(
signatures: Array<TransactionSignature>, signatures: Array<TransactionSignature>,
commitment?: Commitment, commitment?: Commitment,
): Promise<RpcResponseAndContext<Array<SignatureStatus | null>>>; ): Promise<RpcResponseAndContext<Array<SignatureStatus | null>>>;

View File

@ -209,7 +209,7 @@ declare module '@solana/web3.js' {
signature: TransactionSignature, signature: TransactionSignature,
commitment: ?Commitment, commitment: ?Commitment,
): Promise<RpcResponseAndContext<SignatureStatus | null>>; ): Promise<RpcResponseAndContext<SignatureStatus | null>>;
getSignatureStatusBatch( getSignatureStatuses(
signatures: Array<TransactionSignature>, signatures: Array<TransactionSignature>,
commitment: ?Commitment, commitment: ?Commitment,
): Promise<RpcResponseAndContext<Array<SignatureStatus | null>>>; ): Promise<RpcResponseAndContext<Array<SignatureStatus | null>>>;

View File

@ -477,9 +477,9 @@ const GetVoteAccounts = jsonRpcResult(
); );
/** /**
* Expected JSON RPC response for the "getSignatureStatus" message * Expected JSON RPC response for the "getSignatureStatuses" message
*/ */
const GetSignatureStatusRpcResult = jsonRpcResultAndContext( const GetSignatureStatusesRpcResult = jsonRpcResultAndContext(
struct.array([ struct.array([
struct.union([ struct.union([
'null', 'null',
@ -1036,7 +1036,7 @@ export class Connection {
signature: TransactionSignature, signature: TransactionSignature,
commitment: ?Commitment, commitment: ?Commitment,
): Promise<RpcResponseAndContext<SignatureStatus | null>> { ): Promise<RpcResponseAndContext<SignatureStatus | null>> {
const {context, value} = await this.getSignatureStatusBatch( const {context, value} = await this.getSignatureStatuses(
[signature], [signature],
commitment, commitment,
); );
@ -1047,13 +1047,13 @@ export class Connection {
/** /**
* Fetch the current status of a signature * Fetch the current status of a signature
*/ */
async getSignatureStatusBatch( async getSignatureStatuses(
signatures: Array<TransactionSignature>, signatures: Array<TransactionSignature>,
commitment: ?Commitment, commitment: ?Commitment,
): Promise<RpcResponseAndContext<Array<SignatureStatus | null>>> { ): Promise<RpcResponseAndContext<Array<SignatureStatus | null>>> {
const args = this._argsWithCommitment([signatures], commitment); const args = this._argsWithCommitment([signatures], commitment);
const unsafeRes = await this._rpcRequest('getSignatureStatus', args); const unsafeRes = await this._rpcRequest('getSignatureStatuses', args);
const res = GetSignatureStatusRpcResult(unsafeRes); const res = GetSignatureStatusesRpcResult(unsafeRes);
if (res.error) { if (res.error) {
throw new Error(res.error.message); throw new Error(res.error.message);
} }

View File

@ -98,7 +98,7 @@ test('get program accounts', async () => {
mockRpc.push([ mockRpc.push([
url, url,
{ {
method: 'getSignatureStatus', method: 'getSignatureStatuses',
params: [ params: [
[ [
'3WE5w4B7v59x6qjyC4FbG2FEKYKQfvsJwqSxNVmtMjT8TQ31hsZieDHcSgqzxiAoTL56n2w5TncjqEKjLhtF4Vk', '3WE5w4B7v59x6qjyC4FbG2FEKYKQfvsJwqSxNVmtMjT8TQ31hsZieDHcSgqzxiAoTL56n2w5TncjqEKjLhtF4Vk',
@ -142,7 +142,7 @@ test('get program accounts', async () => {
mockRpc.push([ mockRpc.push([
url, url,
{ {
method: 'getSignatureStatus', method: 'getSignatureStatuses',
params: [ params: [
[ [
'3WE5w4B7v59x6qjyC4FbG2FEKYKQfvsJwqSxNVmtMjT8TQ31hsZieDHcSgqzxiAoTL56n2w5TncjqEKjLhtF4Vk', '3WE5w4B7v59x6qjyC4FbG2FEKYKQfvsJwqSxNVmtMjT8TQ31hsZieDHcSgqzxiAoTL56n2w5TncjqEKjLhtF4Vk',
@ -496,7 +496,7 @@ test('confirm transaction - error', async () => {
mockRpc.push([ mockRpc.push([
url, url,
{ {
method: 'getSignatureStatus', method: 'getSignatureStatuses',
params: [[badTransactionSignature]], params: [[badTransactionSignature]],
}, },
errorResponse, errorResponse,
@ -887,7 +887,7 @@ test('request airdrop - max commitment', async () => {
mockRpc.push([ mockRpc.push([
url, url,
{ {
method: 'getSignatureStatus', method: 'getSignatureStatuses',
params: [ params: [
[ [
'1WE5w4B7v59x6qjyC4FbG2FEKYKQfvsJwqSxNVmtMjT8TQ31hsZieDHcSgqzxiAoTL56n2w5TncjqEKjLhtF4Vk', '1WE5w4B7v59x6qjyC4FbG2FEKYKQfvsJwqSxNVmtMjT8TQ31hsZieDHcSgqzxiAoTL56n2w5TncjqEKjLhtF4Vk',
@ -1081,7 +1081,7 @@ test('transaction', async () => {
mockRpc.push([ mockRpc.push([
url, url,
{ {
method: 'getSignatureStatus', method: 'getSignatureStatuses',
params: [ params: [
[ [
'3WE5w4B7v59x6qjyC4FbG2FEKYKQfvsJwqSxNVmtMjT8TQ31hsZieDHcSgqzxiAoTL56n2w5TncjqEKjLhtF4Vk', '3WE5w4B7v59x6qjyC4FbG2FEKYKQfvsJwqSxNVmtMjT8TQ31hsZieDHcSgqzxiAoTL56n2w5TncjqEKjLhtF4Vk',
@ -1127,7 +1127,7 @@ test('transaction', async () => {
mockRpc.push([ mockRpc.push([
url, url,
{ {
method: 'getSignatureStatus', method: 'getSignatureStatuses',
params: [ params: [
[ [
'3WE5w4B7v59x6qjyC4FbG2FEKYKQfvsJwqSxNVmtMjT8TQ31hsZieDHcSgqzxiAoTL56n2w5TncjqEKjLhtF4Vk', '3WE5w4B7v59x6qjyC4FbG2FEKYKQfvsJwqSxNVmtMjT8TQ31hsZieDHcSgqzxiAoTL56n2w5TncjqEKjLhtF4Vk',
@ -1155,7 +1155,7 @@ test('transaction', async () => {
]); ]);
const responses = ( const responses = (
await connection.getSignatureStatusBatch([signature, unprocessedSignature]) await connection.getSignatureStatuses([signature, unprocessedSignature])
).value; ).value;
expect(responses.length).toEqual(2); expect(responses.length).toEqual(2);

View File

@ -146,7 +146,7 @@ test('transaction-payer', async () => {
mockRpc.push([ mockRpc.push([
url, url,
{ {
method: 'getSignatureStatus', method: 'getSignatureStatuses',
params: [ params: [
[ [
'3WE5w4B7v59x6qjyC4FbG2FEKYKQfvsJwqSxNVmtMjT8TQ31hsZieDHcSgqzxiAoTL56n2w5TncjqEKjLhtF4Vk', '3WE5w4B7v59x6qjyC4FbG2FEKYKQfvsJwqSxNVmtMjT8TQ31hsZieDHcSgqzxiAoTL56n2w5TncjqEKjLhtF4Vk',