Make network ID in the tests configurable

joojis · joojis · commit df627a60134e · 2018-09-14T13:12:52.000+09:00
diff --git a/examples/create-account-with-keystore.js b/examples/create-account-with-keystore.js
@@ -1,8 +1,8 @@
 var SDK = require("codechain-sdk");
 
-var SERVER_URL = process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080";
 var sdk = new SDK({
-    server: SERVER_URL
+    server: process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080",
+    networkId: process.env.CODECHAIN_NETWORK_ID || "tc"
 });
 
 // createRemoteKeyStore("http://localhost:7007") is also available.
diff --git a/examples/create-account-with-rpc.js b/examples/create-account-with-rpc.js
@@ -1,8 +1,8 @@
 var SDK = require("codechain-sdk");
 
-var SERVER_URL = process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080";
 var sdk = new SDK({
-    server: SERVER_URL
+    server: process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080",
+    networkId: process.env.CODECHAIN_NETWORK_ID || "tc"
 });
 
 sdk.rpc.account
diff --git a/examples/create-asset-transfer-address.js b/examples/create-asset-transfer-address.js
@@ -1,8 +1,8 @@
 var SDK = require("codechain-sdk");
 
-var SERVER_URL = process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080";
 var sdk = new SDK({
-    server: SERVER_URL
+    server: process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080",
+    networkId: process.env.CODECHAIN_NETWORK_ID || "tc"
 });
 
 sdk.key
diff --git a/examples/get-balance.js b/examples/get-balance.js
@@ -1,8 +1,8 @@
 var SDK = require("codechain-sdk");
 
-var SERVER_URL = process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080";
 var sdk = new SDK({
-    server: SERVER_URL
+    server: process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080",
+    networkId: process.env.CODECHAIN_NETWORK_ID || "tc"
 });
 
 var ACCOUNT_ADDRESS =
diff --git a/examples/import-test-account.js b/examples/import-test-account.js
@@ -1,8 +1,8 @@
 var SDK = require("codechain-sdk");
 
-var SERVER_URL = process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080";
 var sdk = new SDK({
-    server: SERVER_URL
+    server: process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080",
+    networkId: process.env.CODECHAIN_NETWORK_ID || "tc"
 });
 
 var ACCOUNT_SECRET =
diff --git a/examples/mint-and-burn.js b/examples/mint-and-burn.js
@@ -1,8 +1,8 @@
 const SDK = require("codechain-sdk");
 
-const SERVER_URL = process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080";
 const sdk = new SDK({
-    server: SERVER_URL
+    server: process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080",
+    networkId: process.env.CODECHAIN_NETWORK_ID || "tc"
 });
 
 const ACCOUNT_ADDRESS =
diff --git a/examples/mint-and-transfer.js b/examples/mint-and-transfer.js
@@ -1,8 +1,8 @@
 const SDK = require("codechain-sdk");
 
-const SERVER_URL = process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080";
 const sdk = new SDK({
-    server: SERVER_URL
+    server: process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080",
+    networkId: process.env.CODECHAIN_NETWORK_ID || "tc"
 });
 
 var ACCOUNT_ADDRESS =
diff --git a/examples/mint-asset.js b/examples/mint-asset.js
@@ -1,8 +1,8 @@
 var SDK = require("codechain-sdk");
 
-var SERVER_URL = process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080";
 var sdk = new SDK({
-    server: SERVER_URL
+    server: process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080",
+    networkId: process.env.CODECHAIN_NETWORK_ID || "tc"
 });
 
 var ACCOUNT_ADDRESS =
diff --git a/examples/send-parcel.js b/examples/send-parcel.js
@@ -1,8 +1,8 @@
 var SDK = require("codechain-sdk");
 
-var SERVER_URL = process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080";
 var sdk = new SDK({
-    server: SERVER_URL
+    server: process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080",
+    networkId: process.env.CODECHAIN_NETWORK_ID || "tc"
 });
 
 var ACCOUNT_ADDRESS =
diff --git a/examples/send-signed-parcel.js b/examples/send-signed-parcel.js
@@ -1,8 +1,8 @@
 var SDK = require("codechain-sdk");
 
-var SERVER_URL = process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080";
 var sdk = new SDK({
-    server: SERVER_URL
+    server: process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080",
+    networkId: process.env.CODECHAIN_NETWORK_ID || "tc"
 });
 
 var ACCOUNT_SECRET =
diff --git a/examples/set-regular-key.js b/examples/set-regular-key.js
@@ -1,8 +1,8 @@
 const SDK = require("codechain-sdk");
 
-const SERVER_URL = process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080";
 const sdk = new SDK({
-    server: SERVER_URL
+    server: process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080",
+    networkId: process.env.CODECHAIN_NETWORK_ID || "tc"
 });
 
 var ACCOUNT_SECRET =
diff --git a/integration_tests/Rpc.spec.ts b/integration_tests/Rpc.spec.ts
@@ -20,6 +20,7 @@ import {
     ACCOUNT_ADDRESS,
     ACCOUNT_ID,
     ACCOUNT_SECRET,
+    CODECHAIN_NETWORK_ID,
     SERVER_URL
 } from "./helper";
 
@@ -102,7 +103,8 @@ describe("rpc", () => {
     beforeAll(async () => {
         sdk = new SDK({
             server: SERVER_URL,
-            keyStoreType: "memory"
+            keyStoreType: "memory",
+            networkId: CODECHAIN_NETWORK_ID
         });
     });
 
@@ -582,7 +584,7 @@ describe("rpc", () => {
             test("Ok", async () => {
                 const account = getAccountIdFromPrivate(randomSecret);
                 const address = PlatformAddress.fromAccountId(account, {
-                    networkId: "tc"
+                    networkId: CODECHAIN_NETWORK_ID
                 });
                 // FIXME: Check that address not exists
                 expect(await sdk.rpc.account.importRaw(randomSecret)).toEqual(
diff --git a/integration_tests/SignedParcel.spec.ts b/integration_tests/SignedParcel.spec.ts
@@ -4,12 +4,14 @@ import {
     ACCOUNT_ADDRESS,
     ACCOUNT_ID,
     ACCOUNT_SECRET,
+    CODECHAIN_NETWORK_ID,
     SERVER_URL
 } from "./helper";
 
 test("getSignerAccountId", async () => {
     const sdk = new SDK({
-        server: SERVER_URL
+        server: SERVER_URL,
+        networkId: CODECHAIN_NETWORK_ID
     });
     const nonce = await sdk.rpc.chain.getNonce(ACCOUNT_ADDRESS);
     const parcelToSend = sdk.core
diff --git a/integration_tests/Transaction.spec.ts b/integration_tests/Transaction.spec.ts
@@ -1,8 +1,17 @@
 import { SDK } from "..";
 
-import { mintAsset, sendTransactions, SERVER_URL } from "./helper";
+import {
+    CODECHAIN_NETWORK_ID,
+    mintAsset,
+    sendTransactions,
+    SERVER_URL
+} from "./helper";
 
-const sdk = new SDK({ server: SERVER_URL, keyStoreType: "memory" });
+const sdk = new SDK({
+    server: SERVER_URL,
+    keyStoreType: "memory",
+    networkId: CODECHAIN_NETWORK_ID
+});
 const { H256, AssetTransactionGroup } = SDK.Core.classes;
 
 test("AssetMintTransaction fromJSON", async () => {
diff --git a/integration_tests/helper.ts b/integration_tests/helper.ts
@@ -1,8 +1,13 @@
 import { SDK } from "../";
 
+export const CODECHAIN_NETWORK_ID = process.env.CODECHAIN_NETWORK_ID || "tc";
 export const SERVER_URL =
     process.env.CODECHAIN_RPC_HTTP || "http://localhost:8080";
-export const sdk = new SDK({ server: SERVER_URL, keyStoreType: "memory" });
+export const sdk = new SDK({
+    server: SERVER_URL,
+    keyStoreType: "memory",
+    networkId: CODECHAIN_NETWORK_ID
+});
 
 export const ACCOUNT_SECRET =
     process.env.ACCOUNT_SECRET ||
diff --git a/integration_tests/setRegularKey.spec.ts b/integration_tests/setRegularKey.spec.ts
@@ -1,10 +1,15 @@
 import { SDK } from "../";
 
-import { ACCOUNT_ADDRESS, ACCOUNT_SECRET, SERVER_URL } from "./helper";
+import {
+    ACCOUNT_ADDRESS,
+    ACCOUNT_SECRET,
+    CODECHAIN_NETWORK_ID,
+    SERVER_URL
+} from "./helper";
 
 const U256 = SDK.Core.classes.U256;
 
-const sdk = new SDK({ server: SERVER_URL });
+const sdk = new SDK({ server: SERVER_URL, networkId: CODECHAIN_NETWORK_ID });
 
 const masterSecret = ACCOUNT_SECRET;
 const masterAddress = ACCOUNT_ADDRESS;
diff --git a/integration_tests/useRegistrar.spec.ts b/integration_tests/useRegistrar.spec.ts
@@ -1,8 +1,17 @@
 import { SDK } from "../";
 
-import { ACCOUNT_ADDRESS, ACCOUNT_SECRET, SERVER_URL } from "./helper";
-
-const sdk = new SDK({ server: SERVER_URL, keyStoreType: "memory" });
+import {
+    ACCOUNT_ADDRESS,
+    ACCOUNT_SECRET,
+    CODECHAIN_NETWORK_ID,
+    SERVER_URL
+} from "./helper";
+
+const sdk = new SDK({
+    server: SERVER_URL,
+    keyStoreType: "memory",
+    networkId: CODECHAIN_NETWORK_ID
+});
 const masterSecret = ACCOUNT_SECRET;
 const masterAddress = ACCOUNT_ADDRESS;
 
