feat: remove commitment option from requestAirdrop

2020-06-11 00:10:25 +08:00
parent a9a19e2363
commit 24bb060292
6 changed files with 45 additions and 176 deletions
--- a/web3.js/module.d.ts
+++ b/web3.js/module.d.ts
@@ -281,7 +281,6 @@ declare module '@solana/web3.js' {
    requestAirdrop(
      to: PublicKey,
      amount: number,
-      commitment?: Commitment,
    ): Promise<TransactionSignature>;
    sendTransaction(
      transaction: Transaction,
--- a/web3.js/module.flow.js
+++ b/web3.js/module.flow.js
@@ -294,7 +294,6 @@ declare module '@solana/web3.js' {
    requestAirdrop(
      to: PublicKey,
      amount: number,
-      commitment: ?Commitment,
    ): Promise<TransactionSignature>;
    sendTransaction(
      transaction: Transaction,
--- a/web3.js/src/connection.js
+++ b/web3.js/src/connection.js
@@ -1703,10 +1703,11 @@ export class Connection {
  async requestAirdrop(
    to: PublicKey,
    amount: number,
-    commitment: ?Commitment,
  ): Promise<TransactionSignature> {
-    const args = this._argsWithCommitment([to.toBase58(), amount], commitment);
-    const unsafeRes = await this._rpcRequest('requestAirdrop', args);
+    const unsafeRes = await this._rpcRequest('requestAirdrop', [
+      to.toBase58(),
+      amount,
+    ]);
    const res = RequestAirdropRpcResult(unsafeRes);
    if (res.error) {
      throw new Error(
--- a/web3.js/test/connection.test.js
+++ b/web3.js/test/connection.test.js
@@ -86,11 +86,7 @@ test('get program accounts', async () => {
    url,
    {
      method: 'requestAirdrop',
-      params: [
-        account0.publicKey.toBase58(),
-        LAMPORTS_PER_SOL,
-        {commitment: 'recent'},
-      ],
+      params: [account0.publicKey.toBase58(), LAMPORTS_PER_SOL],
    },
    {
      error: null,
@@ -102,11 +98,7 @@ test('get program accounts', async () => {
    url,
    {
      method: 'requestAirdrop',
-      params: [
-        account1.publicKey.toBase58(),
-        0.5 * LAMPORTS_PER_SOL,
-        {commitment: 'recent'},
-      ],
+      params: [account1.publicKey.toBase58(), 0.5 * LAMPORTS_PER_SOL],
    },
    {
      error: null,
@@ -929,7 +921,7 @@ test('get confirmed transaction', async () => {
    url,
    {
      method: 'requestAirdrop',
-      params: [newAddress.toBase58(), 1, {commitment: 'recent'}],
+      params: [newAddress.toBase58(), 1],
    },
    {
      error: null,
@@ -938,11 +930,7 @@ test('get confirmed transaction', async () => {
    },
  ]);

-  const recentSignature = await connection.requestAirdrop(
-    newAddress,
-    1,
-    'recent',
-  );
+  const recentSignature = await connection.requestAirdrop(newAddress, 1);
  mockRpc.push([
    url,
    {
@@ -1311,11 +1299,7 @@ test('request airdrop', async () => {
    url,
    {
      method: 'requestAirdrop',
-      params: [
-        account.publicKey.toBase58(),
-        minimumAmount + 40,
-        {commitment: 'recent'},
-      ],
+      params: [account.publicKey.toBase58(), minimumAmount + 42],
    },
    {
      error: null,
@@ -1323,18 +1307,42 @@ test('request airdrop', async () => {
        '1WE5w4B7v59x6qjyC4FbG2FEKYKQfvsJwqSxNVmtMjT8TQ31hsZieDHcSgqzxiAoTL56n2w5TncjqEKjLhtF4Vk',
    },
  ]);
+
+  const signature = await connection.requestAirdrop(
+    account.publicKey,
+    minimumAmount + 42,
+  );
+
  mockRpc.push([
    url,
    {
-      method: 'requestAirdrop',
-      params: [account.publicKey.toBase58(), 2, {commitment: 'recent'}],
+      method: 'getSignatureStatuses',
+      params: [
+        [
+          '1WE5w4B7v59x6qjyC4FbG2FEKYKQfvsJwqSxNVmtMjT8TQ31hsZieDHcSgqzxiAoTL56n2w5TncjqEKjLhtF4Vk',
+        ],
+      ],
    },
    {
      error: null,
-      result:
-        '2WE5w4B7v59x6qjyC4FbG2FEKYKQfvsJwqSxNVmtMjT8TQ31hsZieDHcSgqzxiAoTL56n2w5TncjqEKjLhtF4Vk',
+      result: {
+        context: {
+          slot: 11,
+        },
+        value: [
+          {
+            slot: 0,
+            confirmations: null,
+            status: {Ok: null},
+            err: null,
+          },
+        ],
+      },
    },
  ]);
+
+  await connection.confirmTransaction(signature, 0);
+
  mockRpc.push([
    url,
    {
@@ -1352,9 +1360,6 @@ test('request airdrop', async () => {
    },
  ]);

-  await connection.requestAirdrop(account.publicKey, minimumAmount + 40);
-  await connection.requestAirdrop(account.publicKey, 2);
-
  const balance = await connection.getBalance(account.publicKey);
  expect(balance).toBe(minimumAmount + 42);

@@ -1390,109 +1395,6 @@ test('request airdrop', async () => {
  expect(accountInfo.owner).toEqual(SystemProgram.programId);
 });

-// expected to take around 20s
-test('request airdrop - max commitment', async () => {
-  const account = new Account();
-  const connection = new Connection(url, 'max');
-
-  mockRpc.push([
-    url,
-    {
-      method: 'getMinimumBalanceForRentExemption',
-      params: [0, {commitment: 'recent'}],
-    },
-    {
-      error: null,
-      result: 50,
-    },
-  ]);
-
-  const minimumAmount = await connection.getMinimumBalanceForRentExemption(
-    0,
-    'recent',
-  );
-
-  mockRpc.push([
-    url,
-    {
-      method: 'requestAirdrop',
-      params: [
-        account.publicKey.toBase58(),
-        minimumAmount + 40,
-        {commitment: 'max'},
-      ],
-    },
-    {
-      error: null,
-      result:
-        '1WE5w4B7v59x6qjyC4FbG2FEKYKQfvsJwqSxNVmtMjT8TQ31hsZieDHcSgqzxiAoTL56n2w5TncjqEKjLhtF4Vk',
-    },
-  ]);
-  mockRpc.push([
-    url,
-    {
-      method: 'getBalance',
-      params: [account.publicKey.toBase58(), {commitment: 'max'}],
-    },
-    {
-      error: null,
-      result: {
-        context: {
-          slot: 11,
-        },
-        value: minimumAmount + 40,
-      },
-    },
-  ]);
-
-  const signature = await connection.requestAirdrop(
-    account.publicKey,
-    minimumAmount + 40,
-  );
-  const balance = await connection.getBalance(account.publicKey);
-  expect(balance).toBe(minimumAmount + 40);
-
-  mockRpc.push([
-    url,
-    {
-      method: 'getSignatureStatuses',
-      params: [
-        [
-          '1WE5w4B7v59x6qjyC4FbG2FEKYKQfvsJwqSxNVmtMjT8TQ31hsZieDHcSgqzxiAoTL56n2w5TncjqEKjLhtF4Vk',
-        ],
-      ],
-    },
-    {
-      error: null,
-      result: {
-        context: {
-          slot: 11,
-        },
-        value: [
-          {
-            slot: 0,
-            confirmations: null,
-            status: {Ok: null},
-            err: null,
-          },
-        ],
-      },
-    },
-  ]);
-
-  const {value} = await connection.getSignatureStatus(signature);
-  if (value === null) {
-    expect(value).not.toBeNull();
-    return;
-  }
-
-  // Signature should be finalized and therefore confirmations should be null
-  if (value.confirmations !== null) {
-    expect(value.confirmations).toBeNull();
-    return;
-  }
-});
-
 test('transaction failure', async () => {
  const account = new Account();
  const connection = new Connection(url, 'recent');
@@ -1518,11 +1420,7 @@ test('transaction failure', async () => {
    url,
    {
      method: 'requestAirdrop',
-      params: [
-        account.publicKey.toBase58(),
-        minimumAmount + 100010,
-        {commitment: 'recent'},
-      ],
+      params: [account.publicKey.toBase58(), minimumAmount + 100010],
    },
    {
      error: null,
@@ -1724,11 +1622,7 @@ test('transaction', async () => {
    url,
    {
      method: 'requestAirdrop',
-      params: [
-        accountFrom.publicKey.toBase58(),
-        minimumAmount + 100010,
-        {commitment: 'recent'},
-      ],
+      params: [accountFrom.publicKey.toBase58(), minimumAmount + 100010],
    },
    {
      error: null,
@@ -1764,11 +1658,7 @@ test('transaction', async () => {
    url,
    {
      method: 'requestAirdrop',
-      params: [
-        accountTo.publicKey.toBase58(),
-        minimumAmount + 21,
-        {commitment: 'recent'},
-      ],
+      params: [accountTo.publicKey.toBase58(), minimumAmount + 21],
    },
    {
      error: null,
--- a/web3.js/test/nonce.test.js
+++ b/web3.js/test/nonce.test.js
@@ -49,11 +49,7 @@ test('create and query nonce account', async () => {
    url,
    {
      method: 'requestAirdrop',
-      params: [
-        from.publicKey.toBase58(),
-        minimumAmount * 2,
-        {commitment: 'recent'},
-      ],
+      params: [from.publicKey.toBase58(), minimumAmount * 2],
    },
    {
      error: null,
@@ -168,11 +164,7 @@ test('create and query nonce account with seed', async () => {
    url,
    {
      method: 'requestAirdrop',
-      params: [
-        from.publicKey.toBase58(),
-        minimumAmount * 2,
-        {commitment: 'recent'},
-      ],
+      params: [from.publicKey.toBase58(), minimumAmount * 2],
    },
    {
      error: null,
--- a/web3.js/test/transaction-payer.test.js
+++ b/web3.js/test/transaction-payer.test.js
@@ -36,11 +36,7 @@ test('transaction-payer', async () => {
    url,
    {
      method: 'requestAirdrop',
-      params: [
-        accountPayer.publicKey.toBase58(),
-        LAMPORTS_PER_SOL,
-        {commitment: 'recent'},
-      ],
+      params: [accountPayer.publicKey.toBase58(), LAMPORTS_PER_SOL],
    },
    {
      error: null,
@@ -54,11 +50,7 @@ test('transaction-payer', async () => {
    url,
    {
      method: 'requestAirdrop',
-      params: [
-        accountFrom.publicKey.toBase58(),
-        minimumAmount + 12,
-        {commitment: 'recent'},
-      ],
+      params: [accountFrom.publicKey.toBase58(), minimumAmount + 12],
    },
    {
      error: null,
@@ -72,11 +64,7 @@ test('transaction-payer', async () => {
    url,
    {
      method: 'requestAirdrop',
-      params: [
-        accountTo.publicKey.toBase58(),
-        minimumAmount + 21,
-        {commitment: 'recent'},
-      ],
+      params: [accountTo.publicKey.toBase58(), minimumAmount + 21],
    },
    {
      error: null,