Make address, passphrase and secret in the tests configurable

joojis · joojis · commit d59d96f47108 · 2018-09-13T09:59:10.000+09:00
diff --git a/examples/get-balance.js b/examples/get-balance.js
@@ -5,8 +5,12 @@ var sdk = new SDK({
     server: SERVER_URL
 });
 
+var ACCOUNT_ADDRESS =
+    process.env.ACCOUNT_ADDRESS ||
+    "tccqzn9jjm3j6qg69smd7cn0eup4w7z2yu9my9a2k78";
+
 sdk.rpc.chain
-    .getBalance("tccqzn9jjm3j6qg69smd7cn0eup4w7z2yu9my9a2k78")
+    .getBalance(ACCOUNT_ADDRESS)
     .then(function(balance) {
         // the balance is a U256 instance at this moment.
         // Use toString() to print it out.
diff --git a/examples/import-test-account.js b/examples/import-test-account.js
@@ -5,10 +5,13 @@ var sdk = new SDK({
     server: SERVER_URL
 });
 
-var secret = "ede1d4ccb4ec9a8bbbae9a13db3f4a7b56ea04189be86ac3a6a439d9a0a1addd";
-var passphrase = "satoshi";
+var ACCOUNT_SECRET =
+    process.env.ACCOUNT_SECRET ||
+    "ede1d4ccb4ec9a8bbbae9a13db3f4a7b56ea04189be86ac3a6a439d9a0a1addd";
+var ACCOUNT_PASSPHRASE = process.env.ACCOUNT_PASSPHRASE || "satoshi";
+
 sdk.rpc.account
-    .importRaw(secret, passphrase)
+    .importRaw(ACCOUNT_SECRET, ACCOUNT_PASSPHRASE)
     .then(function(account) {
         console.log(account); // tccqzn9jjm3j6qg69smd7cn0eup4w7z2yu9my9a2k78
     })
diff --git a/examples/mint-and-burn.js b/examples/mint-and-burn.js
@@ -5,6 +5,11 @@ const sdk = new SDK({
     server: SERVER_URL
 });
 
+const ACCOUNT_ADDRESS =
+    process.env.ACCOUNT_ADDRESS ||
+    "tccqzn9jjm3j6qg69smd7cn0eup4w7z2yu9my9a2k78";
+const ACCOUNT_PASSPHRASE = "satoshi";
+
 (async () => {
     const aliceAddress = await sdk.key.createAssetTransferAddress({
         type: "P2PKHBurn"
@@ -36,8 +41,8 @@ const sdk = new SDK({
         transactions: [mintTx, transferTx]
     });
     await sdk.rpc.chain.sendParcel(parcel, {
-        account: "tccqzn9jjm3j6qg69smd7cn0eup4w7z2yu9my9a2k78",
-        passphrase: "satoshi"
+        account: ACCOUNT_ADDRESS,
+        passphrase: ACCOUNT_PASSPHRASE
     });
 
     const mintTxInvoice = await sdk.rpc.chain.getTransactionInvoice(
diff --git a/examples/mint-and-transfer.js b/examples/mint-and-transfer.js
@@ -5,6 +5,11 @@ const sdk = new SDK({
     server: SERVER_URL
 });
 
+var ACCOUNT_ADDRESS =
+    process.env.ACCOUNT_ADDRESS ||
+    "tccqzn9jjm3j6qg69smd7cn0eup4w7z2yu9my9a2k78";
+var ACCOUNT_PASSPHRASE = process.env.ACCOUNT_PASSPHRASE || "satoshi";
+
 (async () => {
     const aliceAddress = await sdk.key.createAssetTransferAddress();
     const bobAddress =
@@ -50,8 +55,8 @@ const sdk = new SDK({
         transactions: [mintTx, transferTx]
     });
     await sdk.rpc.chain.sendParcel(parcel, {
-        account: "tccqzn9jjm3j6qg69smd7cn0eup4w7z2yu9my9a2k78",
-        passphrase: "satoshi"
+        account: ACCOUNT_ADDRESS,
+        passphrase: ACCOUNT_PASSPHRASE
     });
 
     const mintTxInvoice = await sdk.rpc.chain.getTransactionInvoice(
diff --git a/examples/mint-asset.js b/examples/mint-asset.js
@@ -5,6 +5,11 @@ var sdk = new SDK({
     server: SERVER_URL
 });
 
+var ACCOUNT_ADDRESS =
+    process.env.ACCOUNT_ADDRESS ||
+    "tccqzn9jjm3j6qg69smd7cn0eup4w7z2yu9my9a2k78";
+var ACCOUNT_PASSPHRASE = process.env.ACCOUNT_PASSPHRASE || "satoshi";
+
 // If you want to know how to create an address, see the example "Create an
 // asset transfer address".
 var address =
@@ -31,8 +36,8 @@ var parcel = sdk.core.createAssetTransactionGroupParcel({
 });
 sdk.rpc.chain
     .sendParcel(parcel, {
-        account: "tccqzn9jjm3j6qg69smd7cn0eup4w7z2yu9my9a2k78",
-        passphrase: "satoshi"
+        account: ACCOUNT_ADDRESS,
+        passphrase: ACCOUNT_PASSPHRASE
     })
     .then(function(parcelHash) {
         // Get the invoice of the parcel.
diff --git a/examples/send-parcel.js b/examples/send-parcel.js
@@ -5,15 +5,20 @@ var sdk = new SDK({
     server: SERVER_URL
 });
 
+var ACCOUNT_ADDRESS =
+    process.env.ACCOUNT_ADDRESS ||
+    "tccqzn9jjm3j6qg69smd7cn0eup4w7z2yu9my9a2k78";
+var ACCOUNT_PASSPHRASE = process.env.ACCOUNT_PASSPHRASE || "satoshi";
+
 var parcel = sdk.core.createPaymentParcel({
     recipient: "tccqruq09sfgax77nj4gukjcuq69uzeyv0jcs7vzngg",
     amount: 10000
 });
 
 sdk.rpc.chain
     .sendParcel(parcel, {
-        account: "tccqzn9jjm3j6qg69smd7cn0eup4w7z2yu9my9a2k78",
-        passphrase: "satoshi"
+        account: ACCOUNT_ADDRESS,
+        passphrase: ACCOUNT_PASSPHRASE
         // fee and nonce are optional
     })
     .then(function(parcelHash) {
diff --git a/examples/send-signed-parcel.js b/examples/send-signed-parcel.js
@@ -5,21 +5,24 @@ var sdk = new SDK({
     server: SERVER_URL
 });
 
+var ACCOUNT_SECRET =
+    process.env.ACCOUNT_SECRET ||
+    "ede1d4ccb4ec9a8bbbae9a13db3f4a7b56ea04189be86ac3a6a439d9a0a1addd";
+var ACCOUNT_ADDRESS =
+    process.env.ACCOUNT_ADDRESS ||
+    "tccqzn9jjm3j6qg69smd7cn0eup4w7z2yu9my9a2k78";
+
 var parcel = sdk.core.createPaymentParcel({
     recipient: "tccqruq09sfgax77nj4gukjcuq69uzeyv0jcs7vzngg",
     amount: 10000
 });
 
-var account = "tccqzn9jjm3j6qg69smd7cn0eup4w7z2yu9my9a2k78";
-var accountSecret =
-    "ede1d4ccb4ec9a8bbbae9a13db3f4a7b56ea04189be86ac3a6a439d9a0a1addd";
-
 sdk.rpc.chain
-    .getNonce(account)
+    .getNonce(ACCOUNT_ADDRESS)
     .then(function(nonce) {
         return sdk.rpc.chain.sendSignedParcel(
             parcel.sign({
-                secret: accountSecret,
+                secret: ACCOUNT_SECRET,
                 fee: 10,
                 nonce: nonce
             })
diff --git a/examples/set-regular-key.js b/examples/set-regular-key.js
@@ -5,8 +5,11 @@ const sdk = new SDK({
     server: SERVER_URL
 });
 
-const masterSecret =
+var ACCOUNT_SECRET =
+    process.env.ACCOUNT_SECRET ||
     "ede1d4ccb4ec9a8bbbae9a13db3f4a7b56ea04189be86ac3a6a439d9a0a1addd";
+
+const masterSecret = ACCOUNT_SECRET;
 const masterAccountId = SDK.util.getAccountIdFromPrivate(masterSecret);
 const masterAddress = sdk.key.classes.PlatformAddress.fromAccountId(
     masterAccountId
diff --git a/integration_tests/Network.spec.ts b/integration_tests/Network.spec.ts
@@ -1,11 +1,10 @@
 import { SDK } from "../";
+import { SERVER_URL } from "./helper";
 
 describe("network", () => {
     let sdk: SDK;
 
     beforeAll(async () => {
-        const SERVER_URL =
-            process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080";
         sdk = new SDK({ server: SERVER_URL });
     });
 
diff --git a/integration_tests/Rpc.spec.ts b/integration_tests/Rpc.spec.ts
@@ -16,6 +16,13 @@ import {
     signEcdsa
 } from "../lib/utils";
 
+import {
+    ACCOUNT_ADDRESS,
+    ACCOUNT_ID,
+    ACCOUNT_SECRET,
+    SERVER_URL
+} from "./helper";
+
 // FIXME:
 const ERROR = {
     VERIFICATION_FAILED: {
@@ -88,14 +95,11 @@ describe("rpc", () => {
     const { Block, H512, U256 } = SDK.Core.classes;
     const invalidHash =
         "0x0000000000000000000000000000000000000000000000000000000000000000";
-    const signerSecret =
-        "ede1d4ccb4ec9a8bbbae9a13db3f4a7b56ea04189be86ac3a6a439d9a0a1addd";
-    const signerAccount = "0xa6594b7196808d161b6fb137e781abbc251385d9";
-    const signerAddress = "tccqzn9jjm3j6qg69smd7cn0eup4w7z2yu9my9a2k78";
+    const signerSecret = ACCOUNT_SECRET;
+    const signerAccount = ACCOUNT_ID;
+    const signerAddress = ACCOUNT_ADDRESS;
 
     beforeAll(async () => {
-        const SERVER_URL =
-            process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080";
         sdk = new SDK({
             server: SERVER_URL,
             keyStoreType: "memory"
diff --git a/integration_tests/SignedParcel.spec.ts b/integration_tests/SignedParcel.spec.ts
@@ -1,27 +1,28 @@
 import { SDK } from "../";
 
+import {
+    ACCOUNT_ADDRESS,
+    ACCOUNT_ID,
+    ACCOUNT_SECRET,
+    SERVER_URL
+} from "./helper";
+
 test("getSignerAccountId", async () => {
     const sdk = new SDK({
-        server: process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080"
+        server: SERVER_URL
     });
-    const secret =
-        "ede1d4ccb4ec9a8bbbae9a13db3f4a7b56ea04189be86ac3a6a439d9a0a1addd";
-    const accountId = sdk.util.getAccountIdFromPrivate(secret);
-    const accountAddress = sdk.key.classes.PlatformAddress.fromAccountId(
-        accountId
-    );
-    const nonce = await sdk.rpc.chain.getNonce(accountAddress);
+    const nonce = await sdk.rpc.chain.getNonce(ACCOUNT_ADDRESS);
     const parcelToSend = sdk.core
         .createPaymentParcel({
             amount: 10,
-            recipient: accountAddress
+            recipient: ACCOUNT_ADDRESS
         })
         .sign({
-            secret,
+            secret: ACCOUNT_SECRET,
             fee: 10,
             nonce
         });
     const parcelHash = await sdk.rpc.chain.sendSignedParcel(parcelToSend);
     const parcelReceived = await sdk.rpc.chain.getParcel(parcelHash);
-    expect(parcelReceived.getSignerAccountId().value).toEqual(accountId);
+    expect(parcelReceived.getSignerAccountId().value).toEqual(ACCOUNT_ID);
 });
diff --git a/integration_tests/Transaction.spec.ts b/integration_tests/Transaction.spec.ts
@@ -1,7 +1,7 @@
 import { SDK } from "..";
-import { mintAsset, sendTransactions } from "./helper";
 
-const SERVER_URL = process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080";
+import { mintAsset, sendTransactions, SERVER_URL } from "./helper";
+
 const sdk = new SDK({ server: SERVER_URL, keyStoreType: "memory" });
 const { H256, AssetTransactionGroup } = SDK.Core.classes;
 
diff --git a/integration_tests/examples.spec.ts b/integration_tests/examples.spec.ts
@@ -1,5 +1,5 @@
-import { readFileSync, writeFileSync, unlinkSync } from "fs";
 import { execFile } from "child_process";
+import { readFileSync, unlinkSync, writeFileSync } from "fs";
 
 describe("examples", () => {
     beforeAll(done => {
diff --git a/integration_tests/helper.ts b/integration_tests/helper.ts
@@ -1,26 +1,27 @@
 import { SDK } from "../";
-import { KeyStore } from "../lib/key/KeyStore";
-import { MemoryKeyStore } from "../lib/key/MemoryKeyStore";
 
-const SERVER_URL = process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080";
-const sdk = new SDK({ server: SERVER_URL });
+export const SERVER_URL =
+    process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080";
+export const sdk = new SDK({ server: SERVER_URL, keyStoreType: "memory" });
 
-const secret =
+export const ACCOUNT_SECRET =
+    process.env.ACCOUNT_SECRET ||
     "ede1d4ccb4ec9a8bbbae9a13db3f4a7b56ea04189be86ac3a6a439d9a0a1addd";
-const accountId = sdk.util.getAccountIdFromPrivate(secret);
-const address = sdk.key.classes.PlatformAddress.fromAccountId(accountId);
+export const ACCOUNT_ID =
+    process.env.ACCOUNT_ID ||
+    sdk.util.getAccountIdFromPrivate(ACCOUNT_SECRET).toString(); // "0xa6594b7196808d161b6fb137e781abbc251385d9"
+export const ACCOUNT_ADDRESS =
+    process.env.ACCOUNT_ADDRESS ||
+    sdk.key.classes.PlatformAddress.fromAccountId(ACCOUNT_ID).toString(); // "tccqzn9jjm3j6qg69smd7cn0eup4w7z2yu9my9a2k78"
+export const ACCOUNT_PASSPHRASE = process.env.ACCOUNT_PASSPHRASE || "satoshi";
 
-export const createKeyStore = async (): Promise<KeyStore> => {
-    return new MemoryKeyStore();
-};
-
-export const sendTransactions = async ({ transactions }) => {
+export const sendTransactions = async ({ transactions }: any) => {
     const parcel = sdk.core.createAssetTransactionGroupParcel({
         transactions
     });
     const signedParcel = parcel.sign({
-        secret,
-        nonce: await sdk.rpc.chain.getNonce(address),
+        secret: ACCOUNT_SECRET,
+        nonce: await sdk.rpc.chain.getNonce(ACCOUNT_ADDRESS),
         fee: 10
     });
     const parcelHash = await sdk.rpc.chain.sendSignedParcel(signedParcel);
@@ -34,7 +35,7 @@ export const mintAsset = async ({
     amount,
     lockScriptHash,
     registrar
-}) => {
+}: any) => {
     const assetScheme = sdk.core.createAssetScheme({
         shardId: 0,
         worldId: 0,
@@ -57,17 +58,17 @@ export const mintAsset = async ({
 
 export const payment = async (params?: { inc_nonce?: number }) => {
     const { inc_nonce = 0 } = params || {};
-    let nonce = await sdk.rpc.chain.getNonce(address);
+    let nonce = await sdk.rpc.chain.getNonce(ACCOUNT_ADDRESS);
     for (let i = 0; i < inc_nonce; i++) {
         nonce = nonce.increase();
     }
     const p = sdk.core
         .createPaymentParcel({
             amount: 10,
-            recipient: address
+            recipient: ACCOUNT_ADDRESS
         })
         .sign({
-            secret,
+            secret: ACCOUNT_SECRET,
             fee: 10,
             nonce
         });
diff --git a/integration_tests/sendSignedParcel.spec.ts b/integration_tests/sendSignedParcel.spec.ts
@@ -1,12 +1,11 @@
 import { SDK } from "../";
 
-const SERVER_URL = process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080";
+import { ACCOUNT_ADDRESS, ACCOUNT_SECRET, SERVER_URL } from "./helper";
+
 const sdk = new SDK({ server: SERVER_URL });
 
-const secret =
-    "ede1d4ccb4ec9a8bbbae9a13db3f4a7b56ea04189be86ac3a6a439d9a0a1addd";
-const accountId = SDK.util.getAccountIdFromPrivate(secret);
-const address = sdk.key.classes.PlatformAddress.fromAccountId(accountId);
+const secret = ACCOUNT_SECRET;
+const address = ACCOUNT_ADDRESS;
 
 test("sendSignedParcel", async () => {
     const nonce = await sdk.rpc.chain.getNonce(address);
diff --git a/integration_tests/setRegularKey.spec.ts b/integration_tests/setRegularKey.spec.ts
@@ -1,16 +1,13 @@
 import { SDK } from "../";
 
+import { ACCOUNT_ADDRESS, ACCOUNT_SECRET, SERVER_URL } from "./helper";
+
 const U256 = SDK.Core.classes.U256;
 
-const SERVER_URL = process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080";
 const sdk = new SDK({ server: SERVER_URL });
 
-const masterSecret =
-    "ede1d4ccb4ec9a8bbbae9a13db3f4a7b56ea04189be86ac3a6a439d9a0a1addd";
-const masterAccountId = SDK.util.getAccountIdFromPrivate(masterSecret);
-const masterAddress = sdk.key.classes.PlatformAddress.fromAccountId(
-    masterAccountId
-);
+const masterSecret = ACCOUNT_SECRET;
+const masterAddress = ACCOUNT_ADDRESS;
 
 const regularSecret = SDK.util.generatePrivateKey();
 const regularPublic = SDK.util.getPublicFromPrivate(regularSecret);
diff --git a/integration_tests/shareSecret.spec.ts b/integration_tests/shareSecret.spec.ts
@@ -1,6 +1,7 @@
 import { SDK } from "../";
 
-const SERVER_URL = process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080";
+import { SERVER_URL } from "./helper";
+
 const sdk = new SDK({ server: SERVER_URL });
 
 test("shareSecret", async () => {
diff --git a/integration_tests/useRegistrar.spec.ts b/integration_tests/useRegistrar.spec.ts
