fix remaining failing tests, canister did files are now included auto…

…matically in the canister /candid directory
demergent-labs · Apr 24, 2024 · a4187b1 · a4187b1
1 parent 8eed733
commit a4187b1
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 9 deletions.
diff --git a/examples/composite_queries/dfx.json b/examples/composite_queries/dfx.json
@@ -11,7 +11,6 @@
                 "AZLE_TEST_FETCH"
             ],
             "assets": [
-                [".azle/canister1/canister1.did", "candid/canister1.did"],
                 [".azle/canister2/canister2.did", "candid/canister2.did"],
                 [".azle/canister3/canister3.did", "candid/canister3.did"]
             ],

diff --git a/examples/motoko_examples/whoami/dfx.json b/examples/motoko_examples/whoami/dfx.json
@@ -5,7 +5,6 @@
             "main": "src/index.ts",
             "candid_gen": "automatic",
             "env": ["AZLE_TEST_FETCH"],
-            "assets": [[".azle/whoami/whoami.did", "candid/whoami.did"]],
             "declarations": {
                 "output": "test/dfx_generated/whoami",
                 "node_compatibility": true

diff --git a/examples/rejections/src/rejections/index.ts b/examples/rejections/src/rejections/index.ts
@@ -33,7 +33,7 @@ export default Canister({
         if (process.env.AZLE_TEST_FETCH === 'true') {
             await fetch(`icp://${getSomeCanisterPrincipal()}/accept`, {
                 body: serialize({
-                    candidPath: `/src/some_canister.did`
+                    candidPath: `/candid/some_canister.did`
                 })
             });
         } else {
@@ -47,7 +47,7 @@ export default Canister({
             if (process.env.AZLE_TEST_FETCH === 'true') {
                 await fetch(`icp://rkp4c-7iaaa-aaaaa-aaaca-cai/method`, {
                     body: serialize({
-                        candidPath: `/src/nonexistent.did`
+                        candidPath: `/candid/nonexistent.did`
                     })
                 });
             } else {
@@ -64,7 +64,7 @@ export default Canister({
             if (process.env.AZLE_TEST_FETCH === 'true') {
                 await fetch(`icp://${getSomeCanisterPrincipal()}/reject`, {
                     body: serialize({
-                        candidPath: `/src/some_canister.did`,
+                        candidPath: `/candid/some_canister.did`,
                         args: ['reject']
                     })
                 });
@@ -82,7 +82,7 @@ export default Canister({
             if (process.env.AZLE_TEST_FETCH === 'true') {
                 await fetch(`icp://${getSomeCanisterPrincipal()}/error`, {
                     body: serialize({
-                        candidPath: `/src/some_canister.did`
+                        candidPath: `/candid/some_canister.did`
                     })
                 });
             } else {
@@ -99,7 +99,7 @@ export default Canister({
             if (process.env.AZLE_TEST_FETCH === 'true') {
                 await fetch(`icp://${getSomeCanisterPrincipal()}/reject`, {
                     body: serialize({
-                        candidPath: `/src/some_canister.did`,
+                        candidPath: `/candid/some_canister.did`,
                         args: [message]
                     })
                 });

diff --git a/examples/rejections/test/pretest.ts b/examples/rejections/test/pretest.ts
@@ -10,12 +10,14 @@ async function pretest() {
         stdio: 'inherit'
     });
 
-    execSync(`dfx canister create some_canister`, {
+    execSync(`dfx deploy some_canister`, {
         stdio: 'inherit'
     });
 
     execSync(
-        `SOME_CANISTER_PRINCIPAL=${getCanisterId('some_canister')} dfx deploy`,
+        `SOME_CANISTER_PRINCIPAL=${getCanisterId(
+            'some_canister'
+        )} dfx deploy rejections`,
         {
             stdio: 'inherit'
         }

diff --git a/src/compiler/index.ts b/src/compiler/index.ts
@@ -114,6 +114,8 @@ async function azle() {
                 nativeCompilation
             );
 
+            addCanisterDidToAssets(canisterPath, canisterName, candid);
+
             // This is for the dfx.json candid property
             writeFileSync(candidPath, candid);
 
@@ -156,3 +158,21 @@ function installDfxExtension(stdioType: IOType) {
         stdioType
     );
 }
+
+function addCanisterDidToAssets(
+    canisterPath: string,
+    canisterName: string,
+    candid: string
+) {
+    writeFileSync(
+        join(
+            canisterPath,
+            'canister',
+            'src',
+            'assets',
+            'candid',
+            `${canisterName}.did`
+        ),
+        candid
+    );
+}