Update Cadence tests to latest API features and include them in `unit…

…-tests` workflow (#22) * Update Cadence tests to latest API features and include them in unit-tests workflow * Run Cadence tests in separate job * Add Cadence tests for scoped providers * Replace JS testing with Cadence testing framework * Update unit testing workflow to use setup-go@v4 action Co-authored-by: Bjarte S. Karlsen <bjarte@bjartek.org> --------- Co-authored-by: Bjarte S. Karlsen <bjarte@bjartek.org>
green-goo-dao · Nov 6, 2023 · c10ce02 · c10ce02
1 parent 19935dd
commit c10ce02
Show file tree

Hide file tree

Showing 30 changed files with 792 additions and 556 deletions.
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -6,17 +6,17 @@ on:
     branches: [main]
 jobs:
   tests:
+    name: Flow CLI Tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: ^16
-      - name: Install flow cli
-        run: sh -ci "$(curl -fsSL https://storage.googleapis.com/flow-cli/install.sh)"
-      - name: Start flow emulator
-        run: nohup flow emulator &
-      - name: Install dependencies
-        run: npm ci
-      - name: Run tests
-        run: npm test -- --runInBand
+    - uses: actions/checkout@v3
+      with:
+        submodules: "true"
+    - name: Set up Go
+      uses: actions/setup-go@v4
+      with:
+        go-version: 1.20
+    - name: Install Flow CLI
+      run: sh -ci "$(curl -fsSL https://raw.githubusercontent.com/onflow/flow-cli/master/install.sh)" -- v1.5.0
+    - name: Run tests
+      run: flow test --cover --covercode="contracts" test/*_test.cdc
diff --git a/cadence/contracts/AddressUtils.cdc b/cadence/contracts/AddressUtils.cdc
@@ -1,4 +1,4 @@
-import StringUtils from "StringUtils"
+import "StringUtils"
 
 pub contract AddressUtils {
 
@@ -94,7 +94,7 @@ pub contract AddressUtils {
     }
 
     pub fun getNetworkFromAddress(_ input: AnyStruct): String? {
-        for network in ["MAINNET", "TESTNET", "EMULATOR"]{
+        for network in ["MAINNET", "TESTNET", "EMULATOR"] {
             if self.isValidAddress(input, forNetwork: network){
                 return network
             }
@@ -103,7 +103,11 @@ pub contract AddressUtils {
     }
 
     pub fun currentNetwork(): String {
-        return self.getNetworkFromAddress(self.account.address)!
+        if let network = self.getNetworkFromAddress(self.account.address) {
+            return network!
+        }
+
+        panic("unknown network!")
     }
 
 }
diff --git a/cadence/contracts/ScopedFTProviders.cdc b/cadence/contracts/ScopedFTProviders.cdc
@@ -1,5 +1,5 @@
-import FungibleToken from "./FungibleToken.cdc"
-import StringUtils from "./StringUtils.cdc"
+import "FungibleToken"
+import "StringUtils"
 
 // ScopedFTProviders
 //

diff --git a/cadence/contracts/ScopedNFTProviders.cdc b/cadence/contracts/ScopedNFTProviders.cdc
@@ -1,5 +1,5 @@
-import NonFungibleToken from "./NonFungibleToken.cdc"
-import StringUtils from "./StringUtils.cdc"
+import "NonFungibleToken"
+import "StringUtils"
 
 // ScopedNFTProviders
 //

diff --git a/cadence/contracts/StringUtils.cdc b/cadence/contracts/StringUtils.cdc
@@ -1,4 +1,4 @@
-import ArrayUtils from "ArrayUtils"
+import "ArrayUtils"
 
 pub contract StringUtils {
 

diff --git a/cadence/scripts/address_utils_get_current_network.cdc b/cadence/scripts/address_utils_get_current_network.cdc
diff --git a/cadence/scripts/address_utils_get_network_from_address.cdc b/cadence/scripts/address_utils_get_network_from_address.cdc
diff --git a/cadence/scripts/address_utils_is_valid_address.cdc b/cadence/scripts/address_utils_is_valid_address.cdc
diff --git a/cadence/scripts/address_utils_parse_address.cdc b/cadence/scripts/address_utils_parse_address.cdc
diff --git a/cadence/scripts/address_utils_parse_uint64.cdc b/cadence/scripts/address_utils_parse_uint64.cdc
diff --git a/cadence/scripts/address_utils_without_prefix.cdc b/cadence/scripts/address_utils_without_prefix.cdc
diff --git a/cadence/scripts/string_utils_contains.cdc b/cadence/scripts/string_utils_contains.cdc
diff --git a/cadence/scripts/string_utils_count.cdc b/cadence/scripts/string_utils_count.cdc
diff --git a/cadence/scripts/string_utils_explode.cdc b/cadence/scripts/string_utils_explode.cdc
diff --git a/cadence/scripts/string_utils_format.cdc b/cadence/scripts/string_utils_format.cdc
diff --git a/cadence/scripts/string_utils_has_prefix.cdc b/cadence/scripts/string_utils_has_prefix.cdc
diff --git a/cadence/scripts/string_utils_has_suffix.cdc b/cadence/scripts/string_utils_has_suffix.cdc
diff --git a/cadence/scripts/string_utils_index.cdc b/cadence/scripts/string_utils_index.cdc
diff --git a/cadence/scripts/string_utils_join.cdc b/cadence/scripts/string_utils_join.cdc
diff --git a/cadence/scripts/string_utils_replace_all.cdc b/cadence/scripts/string_utils_replace_all.cdc
diff --git a/cadence/scripts/string_utils_split.cdc b/cadence/scripts/string_utils_split.cdc
diff --git a/cadence/scripts/string_utils_substring_until.cdc b/cadence/scripts/string_utils_substring_until.cdc
diff --git a/cadence/scripts/string_utils_trim.cdc b/cadence/scripts/string_utils_trim.cdc