fix: use correct annotation object

Author: friedger

example/tests/my-contract_test.clar

@@ -7,6 +7,7 @@
   )
 )
 
+;; @caller 'ST000000000000000000002AMW42H
 (define-public (test-a-times-b2)
   (begin
     (asserts! (is-eq (ok u108) (contract-call? .my-contract a-times-b u9 u12))

src/clarunit-generator.ts

@@ -56,10 +56,10 @@ export function generateUnitTests(simnet: Simnet) {
             delete functionAnnotations.prepare;
 
           // handle caller address for this test
-          const callerAddress = functionAnnotations.caller
-            ? annotations.caller[0] === "'"
-              ? `${(annotations.caller as string).substring(1)}`
-              : accounts.get(annotations.caller)!
+          const callerAddress = functionAnnotations.caller && typeof functionAnnotations.caller === "string"
+            ? functionAnnotations.caller[0] === "'"
+              ? `${(functionAnnotations.caller as string).substring(1)}`
+              : accounts.get(functionAnnotations.caller)!
             : accounts.get("deployer")!;
 
           if (functionAnnotations.prepare) {

tests/clarity-parser-flow.test.ts

@@ -53,6 +53,14 @@ describe("verify clarity parser for flow tests", () => {
         functionName: "allow-contract-caller",
       },
     });
+    expect(callInfos["test-simple-flow"][3]).toEqual({
+      callAnnotations: { caller: "'ST000000000000000000002AMW42H" },
+      callInfo: {
+        args: [],
+        contractName: "",
+        functionName: "my-test-function",
+      },
+    });
   });
 
   it("should parse flow test with bad annotations", () => {

tests/clarity-parser.test.ts

@@ -46,6 +46,10 @@ describe("verify clarity parser", () => {
       "mine-before": "20",
       name: "all annotation test 2",
     });
+
+    expect(result["test-all-annotations-3"]).toEqual({
+      caller: "'ST000000000000000000002AMW42H",
+    });
   });
 
   it("should parse with bad annotations", () => {

tests/contracts/parser-tests/all-annotations.clar

@@ -10,4 +10,8 @@
 ;; @mine-before 20
 ;; @caller wallet_2
 (define-public (test-all-annotations-2)
+    (ok true))
+
+;; @caller 'ST000000000000000000002AMW42H
+(define-public (test-all-annotations-3)
     (ok true))

tests/contracts/parser-tests/simple-flow.clar

@@ -7,6 +7,8 @@
         (try! (my-test-function2))
         ;; @caller wallet_1
         (unwrap! (contract-call? 'ST000000000000000000002AMW42H.pox-4 allow-contract-caller .pox4-self-service-multi none) (err "allow-contract-caller failed"))
+        ;; @caller 'ST000000000000000000002AMW42H
+        (try! (my-test-function))
         (ok true)))
 
 (define-public (my-test-function)