Merge pull request #25 from dragonchain/sc-test-bug-fixes

Smart Contract test bug fixes

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 5.4.3
+
+- **Feature:**
+  - Update dragonchain_mock_webserver docker image version
+- **Bugs:**
+  - Path must not start with a slash or os.path.join will discard anything before it
+
 ## 5.4.1
 
 - **Bugs:**

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dctl",
-  "version": "5.4.2",
+  "version": "5.4.3",
   "description": "Get your Dragonchain out of it's shell.",
   "author": "Dragonchain, Inc. <[email protected]>",
   "license": "Apache-2.0",

src/dctl-contract-test.js

@@ -26,13 +26,21 @@ program
       const networkName = 'dragonchain-webserver';
       const config = await getConfig(testRoot);
       createDockerNetwork(networkName);
+
       startWebserver(localEnv, networkName, localHeap);
+      await delay(1000); // Allow the server some time to start up
+
       const contractRunShell = await runContract(image, payload, networkName, config.startCommand, localEnv, localSecrets);
       await handleContractOutput(contractRunShell.stdout, localHeap);
     }
   })
   .parse(process.argv);
 
+
+function delay(time) {
+  return new Promise(resolve => setTimeout(resolve, time));
+}
+
 /**
  * stringifyIfObject
  * Stringify an object if we need to to match the output of python on dragonchain
@@ -132,7 +140,7 @@ function startWebserver(localEnv, networkName, localHeap) {
     -l env=dragonchain_test_env \
     -p 8080:8080 \
     --env-file ${localEnv} \
-    docker.io/dragonchain/dragonchain_mock_webserver:0.0.2`;
+    docker.io/dragonchain/dragonchain_mock_webserver:0.0.3`;
   shell.exec(command, { silent: true });
 }
 /**

webserver/dragonchain/lib/smart_contracts.py

@@ -35,5 +35,4 @@ def heap_get_v1(contract_id: str, path: str) -> str:
     # Remove any potential extra '/' characters at the beginning of the string
     while path.startswith("/"):
         path = path[1:]
-    storage_key = f"/{path}"
-    return disk.get(key=storage_key).decode("utf-8")
+    return disk.get(key=path).decode("utf-8")

webserver/requirements.txt

@@ -1 +1 @@
-Flask==1.1.1
+Flask==2.1.0