Merge pull request #50 from solana-developers/simplify-naming

Simplify naming. This is just doing a before/after test.

src/index.test.ts

@@ -205,13 +205,11 @@ describe("initializeKeypair", () => {
       envVariableName: keypairVariableName,
     };
 
-    const signerFirstLoad = await initializeKeypair(connection, options);
+    const userBefore = await initializeKeypair(connection, options);
 
     // Check balance
-    const firstBalanceLoad = await connection.getBalance(
-      signerFirstLoad.publicKey,
-    );
-    assert.ok(firstBalanceLoad > 0);
+    const balanceBefore = await connection.getBalance(userBefore.publicKey);
+    assert.ok(balanceBefore > 0);
 
     // Check that the environment variable was created
     dotenv.config({ path: envFileName });
@@ -221,19 +219,17 @@ describe("initializeKeypair", () => {
     }
 
     // Now reload the environment and check it matches our test keypair
-    const signerSecondLoad = await initializeKeypair(connection, options);
+    const userAfter = await initializeKeypair(connection, options);
 
     // Check the keypair is the same
-    assert.ok(signerFirstLoad.publicKey.equals(signerSecondLoad.publicKey));
+    assert.ok(userBefore.publicKey.equals(userAfter.publicKey));
 
     // Check balance has not changed
-    const secondBalanceLoad = await connection.getBalance(
-      signerSecondLoad.publicKey,
-    );
-    assert.equal(firstBalanceLoad, secondBalanceLoad);
+    const balanceAfter = await connection.getBalance(userAfter.publicKey);
+    assert.equal(balanceBefore, balanceAfter);
 
     // Check there is a secret key
-    assert.ok(signerSecondLoad.secretKey);
+    assert.ok(userAfter.secretKey);
 
     await deleteFile(envFileName);
   });

src/lib/airdrop.ts

@@ -6,6 +6,9 @@ const DEFAULT_AIRDROP_AMOUNT = 1 * LAMPORTS_PER_SOL;
 const DEFAULT_MINIMUM_BALANCE = 0.5 * LAMPORTS_PER_SOL;
 const DEFAULT_ENV_KEYPAIR_VARIABLE_NAME = "PRIVATE_KEY";
 
+// TODO: honestly initializeKeypair is a bit vague
+// we can probably give this a better name,
+// just not sure what yet
 export const initializeKeypair = async (
   connection: Connection,
   options?: InitializeKeypairOptions,