Fix missing await before callMethod

uuosio · Nov 29, 2022 · fd774eb · fd774eb
1 parent 369acf9
commit fd774eb
Show file tree

Hide file tree

Showing 5 changed files with 672 additions and 20 deletions.
diff --git a/.github/workflows/pr-any.yml b/.github/workflows/pr-any.yml
@@ -2,7 +2,7 @@ name: PR
 on:
   pull_request:
   push:
-    branches: [ master ]
+    branches: [ master, debugging ]
     tags:
       - "v*.*.*"
 
@@ -41,6 +41,8 @@ jobs:
         run: |
           yarn install --immutable | grep -v 'YN0013'
           PYTHON_SHARED_LIB_PATH=${{ env.pythonLocation }}/lib/libpython3.9.so yarn ${{ matrix.step }}
+      - name: Setup upterm session
+        uses: lhotari/action-upterm@v1
       - name: publish chaintester & as-contract & as-chain
         if: ${{ startsWith(github.ref, 'refs/tags/') && matrix.os == 'ubuntu-20.04' }}
         run:

diff --git a/ts-packages/chaintester/README.md b/ts-packages/chaintester/README.md
@@ -8,14 +8,13 @@ it('test hello', async () => {
     let tester = new ChainTester();
     await tester.init();
     try {
-        let ret = await tester.deployContract("hello", "./assembly/target/counter.wasm", "./assembly/target/counter.abi");
-        expect(ret.except).toBeUndefined();
+        await tester.deployContract("hello", "./assembly/target/counter.wasm", "./assembly/target/counter.abi");
 
-        ret = await tester.pushAction("hello", "inc", {}, {"hello": "active"});
-        expect(ret.except).toBeUndefined();
+        await tester.pushAction("hello", "inc", {}, {"hello": "active"});
+        await tester.produceBlock();
+
+        await tester.pushAction("hello", "inc", {}, {"hello": "active"});
         await tester.produceBlock();
-        ret = await tester.pushAction("hello", "inc", {}, {"hello": "active"});
-        expect(ret.except).toBeUndefined();
     } finally {
         await tester.free();
     }

diff --git a/ts-packages/chaintester/package.json b/ts-packages/chaintester/package.json
@@ -34,8 +34,8 @@
   "devDependencies": {
     "@types/jest": "^28.1.6",
     "@types/node": "^18.7.1",
-    "jest": "^28.1.3",
-    "ts-jest": "^28.0.7",
+    "jest": "^29.3.1",
+    "ts-jest": "^29.0.3",
     "typescript": "^4.7.4"
   }
 }
diff --git a/ts-packages/chaintester/src/index.ts b/ts-packages/chaintester/src/index.ts
@@ -25,6 +25,14 @@ interface PushTransactionReturn {
     elapsed: number;
 }
 
+class ChainException extends Error {
+    json: object;
+    constructor(ret: object) {
+        super(JSON.stringify(ret, null, 2));
+        this.json = ret
+    }
+}
+
 export class ChainTester {
     id: number;
     initialize: Promise<number>;
@@ -103,7 +111,7 @@ export class ChainTester {
     }
 
     async createAccount(creator: string, account: string, owner_key: string, active_key: string, ram_bytes: number = 5 * 1024 * 1024, stake_net: number = 0, stake_cpu: number = 0) {
-        let ret = this.callMethod('create_account', {
+        let ret = await this.callMethod('create_account', {
                 id: this.id,
                 creator,
                 account,
@@ -117,7 +125,7 @@ export class ChainTester {
 
         let except = ret['except'];
         if (except) {
-            throw new Error(except);
+            throw new ChainException(ret);
         }
 
         return new Promise((resolve) => {
@@ -137,7 +145,7 @@ export class ChainTester {
         });
         let except = ret['except'];
         if (except) {
-            throw new Error(JSON.stringify(except, null, 2));
+            throw new ChainException(ret);
         }
 
         return new Promise((resolve) => {
@@ -146,7 +154,7 @@ export class ChainTester {
     }
 
     async pushAction(account: string, action: string, args: object, permissions: object): Promise<PushTransactionReturn> {
-        let ret = this.callMethod('push_action', {
+        let ret = await this.callMethod('push_action', {
             id: this.id,
             account: account,
             action: action,
@@ -156,7 +164,7 @@ export class ChainTester {
 
         let except = ret['except'];
         if (except) {
-            throw new Error(except);
+            throw new ChainException(ret);
         }
 
         return new Promise((resolve) => {
@@ -165,14 +173,14 @@ export class ChainTester {
     }
 
     async pushActions(actions: Action[]): Promise<PushTransactionReturn>{
-        let ret = this.callMethod('push_actions', {
+        let ret = await this.callMethod('push_actions', {
             id: this.id,
             actions: JSON.stringify(actions),
         });
 
         let except = ret['except'];
         if (except) {
-            throw new Error(except);
+            throw new ChainException(ret);
         }
 
         return new Promise((resolve) => {