Quickfix/config path update (#42)

* Fix flow.json path to private key on service account

* Bump version

* Refactor init usage with new props

* Update flow.json file

* Ensure that fallback value is used

* Pass additional values as object

Author: Maksim Daunarovich

dev-test/interaction.test.js

@@ -1,5 +1,5 @@
 import path from "path";
-import * as types from "@onflow/types"
+import * as types from "@onflow/types";
 import {
   emulator,
   init,
@@ -18,7 +18,7 @@ describe("interactions - sendTransaction", () => {
   beforeEach(async () => {
     const basePath = path.resolve(__dirname, "./cadence");
     const port = 8080;
-    await init(basePath, port);
+    await init(basePath, { port });
     return emulator.start(port, false);
   });
 
@@ -68,9 +68,7 @@ describe("interactions - sendTransaction", () => {
           }
         }
       `;
-      const args = [
-        [42, types.Int]
-      ]
+      const args = [[42, types.Int]];
       return sendTransaction({ code, args });
     });
   });
@@ -85,8 +83,8 @@ describe("interactions - sendTransaction", () => {
       `;
       const args = [
         [42, 1337, types.Int],
-        ["Hello, Cadence", types.String]
-      ]
+        ["Hello, Cadence", types.String],
+      ];
       return sendTransaction({ code, args });
     });
   });
@@ -99,7 +97,7 @@ describe("interactions - sendTransaction", () => {
           }
         }
       `;
-      const args = [ 42, 1337, "Hello, Cadence"]
+      const args = [42, 1337, "Hello, Cadence"];
 
       return sendTransaction({ code, args });
     });
@@ -110,7 +108,7 @@ describe("interactions - executeScript", () => {
   beforeEach(async () => {
     const basePath = path.resolve(__dirname, "./cadence");
     const port = 8080;
-    await init(basePath, port);
+    await init(basePath, { port });
     return emulator.start(port, false);
   });
 

flow.json

@@ -14,7 +14,7 @@
 	"accounts": {
 		"emulator-account": {
 			"address": "f8d6e0586b0a20c7",
-			"keys": "48a1f554aeebf6bf9fe0d7b5139b79d080700b073ee77909973ea0b2f6fbc902"
+			"key": "f9cd76bf71c3371c76743ff22a0a1ee6657c63c46c62bd86a20266471fe0ea70"
 		}
 	},
 	"deployments": {}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "flow-js-testing",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "description": "This package will expose a set of utility methods, to allow Cadence code testing with libraries like Jest",
   "scripts": {
     "build": "microbundle",

src/config.js

@@ -45,7 +45,11 @@ export const get = (scope, path, fallback) => {
  * @param fallback - fallback value to be used if env and conf are absent.
  */
 export const set = (key, env, conf, fallback) => {
-  config().put(key, env || get(flowConfig(), conf, fallback));
+  let value = get(flowConfig(), conf, fallback);
+  if (!value) {
+    value = fallback;
+  }
+  config().put(key, value);
 };
 
 /**

src/init.js

@@ -23,10 +23,14 @@ import { config } from "@onflow/config";
  * Inits framework variables, storing private key of service account and base path
  * where Cadence files are stored.
  * @param {string} basePath - path to the folder with Cadence files to be tested.
- * @param {number} port - port to use for accessAPI
+ * @param {number} [props.port] - port to use for accessAPI
+ * @param {number} [props.pkey] - private key to use for service account in case of collisions
  */
-export const init = async (basePath, port = 8080) => {
-  set("PRIVATE_KEY", process.env.PK, "accounts/emulator-account/keys");
+export const init = async (basePath, props = {}) => {
+  const { port = 8080 } = props;
+  const { pkey = "48a1f554aeebf6bf9fe0d7b5b79d080700b073ee77909973ea0b2f6fbc902" } = props;
+
+  set("PRIVATE_KEY", process.env.PK, "accounts/emulator-account/key", pkey);
   set(
     "SERVICE_ADDRESS",
     process.env.SERVICE_ADDRESS,