Fix flow parser when no test functions exist

Clarinet.toml

@@ -14,3 +14,24 @@ strict = false
 trusted_sender = false
 trusted_caller = false
 callee_filter = false
+
+[contracts.all-annotations]
+path = "contracts/all-annotations.clar"
+
+[contracts.bad-annotations]
+path = "contracts/bad-annotations.clar"
+
+[contracts.bad-flow]
+path = "contracts/bad-flow.clar"
+
+[contracts.no-annotations]
+path = "contracts/no-annotations.clar"
+
+[contracts.no-flow]
+path = "contracts/no-flow.clar"
+
+[contracts.simple-annotations]
+path = "contracts/simple-annotations.clar"
+
+[contracts.simple-flow]
+path = "contracts/simple-flow.clar"

contracts/all-annotations.clar

@@ -0,0 +1,5 @@
+(define-public (test-all-annotations-1)
+    (ok true))
+
+(define-public (test-all-annotations-2)
+    (ok true))

contracts/bad-annotations.clar

@@ -0,0 +1,2 @@
+(define-public (test-bad-annotations)
+    (ok false))

contracts/bad-flow.clar

@@ -0,0 +1,8 @@
+(define-public (test-bad-flow)
+    (begin
+        (try! (my-test-function))
+        (ok true)))
+
+
+(define-private (my-test-function)
+    (ok true))

contracts/no-flow.clar

@@ -0,0 +1,3 @@
+;; A contract without any flow tests
+(define-public (not-a-test)
+    (ok true))

contracts/simple-annotations.clar

@@ -0,0 +1,2 @@
+(define-public (test-simple-annotations)
+    (ok true))

contracts/simple-flow.clar

@@ -0,0 +1,11 @@
+(define-public (test-simple-flow)
+    (begin
+        (try! (my-test-function))
+        (try! (my-test-function2))
+        (ok true)))
+
+(define-private (my-test-function)
+    (ok true))
+
+(define-private (my-test-function2)
+    (ok true))

deployments/default.simnet-plan.yaml

@@ -45,15 +45,57 @@ genesis:
       balance: "100000000000000"
       sbtc-balance: "1000000000"
   contracts:
+    - genesis
+    - lockup
+    - bns
+    - cost-voting
     - costs
     - pox
+    - costs-2
     - pox-2
+    - costs-3
     - pox-3
     - pox-4
-    - lockup
-    - costs-2
-    - costs-3
-    - cost-voting
-    - bns
+    - signers
+    - signers-voting
+    - costs-4
 plan:
-  batches: []
+  batches:
+    - id: 0
+      transactions:
+        - emulated-contract-publish:
+            contract-name: all-annotations
+            emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
+            path: "contracts\\all-annotations.clar"
+            clarity-version: 1
+        - emulated-contract-publish:
+            contract-name: bad-annotations
+            emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
+            path: "contracts\\bad-annotations.clar"
+            clarity-version: 1
+        - emulated-contract-publish:
+            contract-name: bad-flow
+            emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
+            path: "contracts\\bad-flow.clar"
+            clarity-version: 1
+        - emulated-contract-publish:
+            contract-name: no-annotations
+            emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
+            path: "contracts\\no-annotations.clar"
+            clarity-version: 1
+        - emulated-contract-publish:
+            contract-name: no-flow
+            emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
+            path: "contracts\\no-flow.clar"
+            clarity-version: 1
+        - emulated-contract-publish:
+            contract-name: simple-annotations
+            emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
+            path: "contracts\\simple-annotations.clar"
+            clarity-version: 1
+        - emulated-contract-publish:
+            contract-name: simple-flow
+            emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
+            path: "contracts\\simple-flow.clar"
+            clarity-version: 1
+      epoch: "2.05"

deployments/default.testnet-plan.yaml

@@ -0,0 +1,60 @@
+---
+id: 0
+name: Testnet deployment
+network: testnet
+stacks-node: "https://api.testnet.hiro.so"
+bitcoin-node: "http://blockstack:blockstacksystem@bitcoind.testnet.stacks.co:18332"
+plan:
+  batches:
+    - id: 0
+      transactions:
+        - contract-publish:
+            contract-name: all-annotations
+            expected-sender: ST1K2XGT5RNGT42N49BH936VDF8NXWNZJY0N432CM
+            cost: 1110
+            path: "contracts\\all-annotations.clar"
+            anchor-block-only: true
+            clarity-version: 1
+        - contract-publish:
+            contract-name: bad-annotations
+            expected-sender: ST1K2XGT5RNGT42N49BH936VDF8NXWNZJY0N432CM
+            cost: 540
+            path: "contracts\\bad-annotations.clar"
+            anchor-block-only: true
+            clarity-version: 1
+        - contract-publish:
+            contract-name: bad-flow
+            expected-sender: ST1K2XGT5RNGT42N49BH936VDF8NXWNZJY0N432CM
+            cost: 1510
+            path: "contracts\\bad-flow.clar"
+            anchor-block-only: true
+            clarity-version: 1
+        - contract-publish:
+            contract-name: no-annotations
+            expected-sender: ST1K2XGT5RNGT42N49BH936VDF8NXWNZJY0N432CM
+            cost: 520
+            path: "contracts\\no-annotations.clar"
+            anchor-block-only: true
+            clarity-version: 1
+        - contract-publish:
+            contract-name: no-flow
+            expected-sender: ST1K2XGT5RNGT42N49BH936VDF8NXWNZJY0N432CM
+            cost: 800
+            path: "contracts\\no-flow.clar"
+            anchor-block-only: true
+            clarity-version: 1
+        - contract-publish:
+            contract-name: simple-annotations
+            expected-sender: ST1K2XGT5RNGT42N49BH936VDF8NXWNZJY0N432CM
+            cost: 560
+            path: "contracts\\simple-annotations.clar"
+            anchor-block-only: true
+            clarity-version: 1
+        - contract-publish:
+            contract-name: simple-flow
+            expected-sender: ST1K2XGT5RNGT42N49BH936VDF8NXWNZJY0N432CM
+            cost: 2370
+            path: "contracts\\simple-flow.clar"
+            anchor-block-only: true
+            clarity-version: 1
+      epoch: "2.05"

settings/Mainnet.toml

@@ -4,4 +4,4 @@ stacks_node_rpc_address = "https://api.hiro.so"
 deployment_fee_rate = 10
 
 [accounts.deployer]
-mnemonic = "<YOUR PRIVATE MAINNET MNEMONIC HERE>"
+mnemonic = ""

settings/Testnet.toml

@@ -4,4 +4,4 @@ stacks_node_rpc_address = "https://api.testnet.hiro.so"
 deployment_fee_rate = 10
 
 [accounts.deployer]
-mnemonic = "<YOUR PRIVATE TESTNET MNEMONIC HERE>"
+mnemonic = ""

src/parser/clarity-parser-flow-tests.ts

@@ -81,6 +81,9 @@ export function extractTestAnnotationsAndCalls(
       lastFunctionName = functionName;
     }
   }
+  if (indexStart < 0) {
+    return [functionAnnotations, functionBodies];
+  }
   const lastFunctionBody = contractSource.substring(indexStart + headerLength);
   contractCalls = extractContractCalls(lastFunctionBody, simnet);
   functionBodies[lastFunctionName] = contractCalls;

tests/clarity-parser-flow.test.ts

@@ -74,4 +74,17 @@ describe("verify clarity parser for flow tests", () => {
     });
     expect(callInfos["test-bad-flow"].length).toEqual(1);
   });
+
+  it("should return empty results when no test functions exist", () => {
+    const [annotations, callInfos] = extractTestAnnotationsAndCalls(
+      fs.readFileSync(
+        path.join(__dirname, "./contracts/parser-tests/no-flow.clar"),
+        "utf8"
+      ),
+      simnet
+    );
+
+    expect(annotations).toEqual({});
+    expect(callInfos).toEqual({});
+  });
 });