Merge pull request #1963 from demergent-labs/caller_property_tests

caller and id property tests
demergent-labs · Aug 7, 2024 · e8a2e20 · e8a2e20
2 parents 64119c5 + 25d3484
commit e8a2e20
Show file tree

Hide file tree

Showing 24 changed files with 13,139 additions and 9 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -255,7 +255,9 @@ jobs:
                     "tests/end_to_end/http_server/sqlite_drizzle",
                     "tests/end_to_end/http_server/sqlite_typeorm",
                     "tests/end_to_end/http_server/tfjs",
-                    "tests/end_to_end/http_server/web_assembly"
+                    "tests/end_to_end/http_server/web_assembly",
+                    "tests/property/ic_api/caller",
+                    "tests/property/ic_api/id"
                   ]
                   END
                   )

diff --git a/src/lib/stable/execute_with_candid_serde.ts b/src/lib/stable/execute_with_candid_serde.ts
@@ -1,7 +1,7 @@
 import { IDL, JsonValue } from '@dfinity/candid';
 
 import { handleUncaughtError } from './error';
-import { reply } from './ic_apis';
+import { reply, trap } from './ic_apis';
 
 type CanisterMethodMode =
     | 'query'
@@ -20,9 +20,13 @@ export async function executeAndReplyWithCandidSerde(
     returnIdlType: IDL.Type | undefined,
     manual: boolean
 ): Promise<void> {
-    const decodedArgs = decodeArgs(mode, args, paramIdlTypes);
-    const unencodedResult = await getUnencodedResult(decodedArgs, callback);
-    encodeResultAndReply(mode, manual, unencodedResult, returnIdlType);
+    try {
+        const decodedArgs = decodeArgs(mode, args, paramIdlTypes);
+        const unencodedResult = await getUnencodedResult(decodedArgs, callback);
+        encodeResultAndReply(mode, manual, unencodedResult, returnIdlType);
+    } catch (error: any) {
+        trap(error.toString());
+    }
 }
 
 function decodeArgs(

diff --git a/src/lib/stable/ic_apis/caller.ts b/src/lib/stable/ic_apis/caller.ts
@@ -1,8 +1,8 @@
 import { Principal } from '../';
 
 /**
- * Returns the caller of the current call
- * @returns the caller of the current call
+ * Returns the principal of the caller of the current call
+ * @returns the principal of the caller of the current call
  */
 export function caller(): Principal {
     if (globalThis._azleIc === undefined) {

diff --git a/src/lib/stable/ic_apis/id.ts b/src/lib/stable/ic_apis/id.ts
@@ -1,8 +1,8 @@
 import { Principal } from '..';
 
 /**
- * Gets the id of this canister
- * @returns the canister id
+ * Returns the canister's id as a principal
+ * @returns the canister's id as a principal
  */
 export function id(): Principal {
     if (globalThis._azleIc === undefined) {

diff --git a/tests/property/ic_api/caller/.gitignore b/tests/property/ic_api/caller/.gitignore
@@ -0,0 +1,4 @@
+.azle
+.dfx
+dfx_generated
+node_modules
diff --git a/tests/property/ic_api/caller/dfx.json b/tests/property/ic_api/caller/dfx.json
@@ -0,0 +1,13 @@
+{
+    "canisters": {
+        "canister": {
+            "type": "azle",
+            "main": "src/index.ts",
+            "candid_gen": "automatic",
+            "declarations": {
+                "output": "test/dfx_generated/canister",
+                "node_compatibility": true
+            }
+        }
+    }
+}
diff --git a/tests/property/ic_api/caller/jest.config.js b/tests/property/ic_api/caller/jest.config.js
@@ -0,0 +1,10 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+    preset: 'ts-jest',
+    testEnvironment: 'node',
+    transform: {
+        '^.+\\.ts$': ['ts-jest', { isolatedModules: true }],
+        '^.+\\.js$': 'ts-jest'
+    },
+    transformIgnorePatterns: ['/node_modules/(?!(azle)/)'] // Make sure azle is transformed
+};