Merge pull request #14 from casper-ecosystem/fix/event-stream-changes

event stream related fixes

Author: hoffmannjan

.gitignore

@@ -1,3 +1,3 @@
-.env
+.env*
 dist/
 node_modules/

package.json

@@ -1,6 +1,6 @@
 {
   "name": "casper-cep47-js-client",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -23,7 +23,7 @@
     "typescript": "^3.3.3"
   },
   "dependencies": {
-    "casper-js-sdk": "2.4.0",
+    "casper-js-sdk": "2.4.1",
     "ts-results": "^3.3.0"
   }
 }

src/cep47-client.ts

@@ -506,8 +506,8 @@ class CEP47Client {
     });
 
     if (deployHash !== null) {
-      return deployHash;
       this.addPendingDeploy(CEP47Events.TransferToken, deployHash);
+      return deployHash;
     } else {
       throw Error("Invalid Deploy");
     }
@@ -544,7 +544,11 @@ class CEP47Client {
     eventNames: CEP47Events[],
     callback: (
       eventName: CEP47Events,
-      deployStatus: { deployHash: string; success: boolean, error: string | null },
+      deployStatus: {
+        deployHash: string;
+        success: boolean;
+        error: string | null;
+      },
       result: any | null
     ) => void
   ): any {
@@ -579,8 +583,7 @@ class CEP47Client {
           {
             deployHash,
             error:
-              value.body.DeployProcessed.execution_result.Failure.effect
-                .error_message,
+              value.body.DeployProcessed.execution_result.Failure.error_message,
             success: false,
           },
           null
@@ -618,7 +621,11 @@ class CEP47Client {
         }, []);
 
         cep47Events.forEach((d: any) =>
-          callback(d.name, { deployHash, error: null, success: true }, d.clValue)
+          callback(
+            d.name,
+            { deployHash, error: null, success: true },
+            d.clValue
+          )
         );
       }
 

test/install.ts

@@ -45,7 +45,13 @@ const test = async () => {
   );
 
   const installDeployHash = await cep47.install(
-        KEYS, TOKEN_NAME!, TOKEN_SYMBOL!, TOKEN_META!, INSTALL_PAYMENT_AMOUNT!, WASM_PATH!);
+    KEYS,
+    TOKEN_NAME!,
+    TOKEN_SYMBOL!,
+    TOKEN_META!,
+    INSTALL_PAYMENT_AMOUNT!,
+    WASM_PATH!
+  );
 
   console.log(`... Contract installation deployHash: ${installDeployHash}`);
 
@@ -58,7 +64,10 @@ const test = async () => {
   console.log(`... Account Info: `);
   console.log(JSON.stringify(accountInfo, null, 2));
 
-  const contractHash = await utils.getAccountNamedKeyValue(accountInfo, `${TOKEN_NAME!}_contract`);
+  const contractHash = await utils.getAccountNamedKeyValue(
+    accountInfo,
+    `${TOKEN_NAME!}_contract`
+  );
 
   console.log(`... Contract Hash: ${contractHash}`);
 };

test/installed.ts

@@ -135,7 +135,7 @@ const test = async () => {
     KEYS,
     KEYS.publicKey,
     new Map([["name", "copied"]]),
-    ["A1", "A2", "A3", "A4", "A5"],
+    ["A6", "A7", "A8", "A9", "A10"],
     5,
     MINT_COPIES_PAYMENT_AMOUNT!
   );