Merge pull request #21 from m-Peter/add-bridge-tests

Fix testing aliases in flow.json config file and update tests
onflow · Mar 20, 2024 · 930e741 · 930e741
2 parents cd204d3 + 943d935
commit 930e741
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 130 deletions.
diff --git a/.github/workflows/cadence_test.yml b/.github/workflows/cadence_test.yml
@@ -19,7 +19,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-go-
       - name: Install Flow CLI
-        run: sh -ci "$(curl -fsSL https://raw.githubusercontent.com/onflow/flow-cli/master/install.sh)" -- v1.12.0-cadence-v1.0.0-M8-2
+        run: sh -ci "$(curl -fsSL https://raw.githubusercontent.com/onflow/flow-cli/master/install.sh)" -- v1.15.0-cadence-v1.0.0-preview.12
       - name: Flow CLI Version
         run: flow version
       - name: Update PATH

diff --git a/cadence/tests/flow_evm_bridge_tests.cdc b/cadence/tests/flow_evm_bridge_tests.cdc
diff --git a/cadence/tests/serialize_nft_tests.cdc b/cadence/tests/serialize_nft_tests.cdc
@@ -14,52 +14,19 @@ access(all) var mintedBlockHeight: UInt64 = 0
 access(all)
 fun setup() {
     var err = Test.deployContract(
-        name: "ViewResolver",
-        path: "../contracts/standards/ViewResolver.cdc",
-        arguments: []
-    )
-    Test.expect(err, Test.beNil())
-    err = Test.deployContract(
-        name: "Burner",
-        path: "../contracts/standards/Burner.cdc",
-        arguments: []
-    )
-    err = Test.deployContract(
-        name: "FungibleToken",
-        path: "../contracts/standards/FungibleToken.cdc",
-        arguments: []
-    )
-    Test.expect(err, Test.beNil())
-    err = Test.deployContract(
-        name: "NonFungibleToken",
-        path: "../contracts/standards/NonFungibleToken.cdc",
-        arguments: []
-    )
-    Test.expect(err, Test.beNil())
-    err = Test.deployContract(
-        name: "MetadataViews",
-        path: "../contracts/standards/MetadataViews.cdc",
-        arguments: []
-    )
-    Test.expect(err, Test.beNil())
-    err = Test.deployContract(
-        name: "FungibleTokenMetadataViews",
-        path: "../contracts/standards/FungibleTokenMetadataViews.cdc",
-        arguments: []
-    )
-    Test.expect(err, Test.beNil())
-    err = Test.deployContract(
         name: "ExampleNFT",
         path: "../contracts/example-assets/ExampleNFT.cdc",
         arguments: []
     )
     Test.expect(err, Test.beNil())
+
     err = Test.deployContract(
         name: "Serialize",
         path: "../contracts/utils/Serialize.cdc",
         arguments: []
     )
     Test.expect(err, Test.beNil())
+
     err = Test.deployContract(
         name: "SerializeNFT",
         path: "../contracts/utils/SerializeNFT.cdc",

diff --git a/cadence/tests/serialize_tests.cdc b/cadence/tests/serialize_tests.cdc
@@ -11,35 +11,6 @@ let alice = Test.createAccount()
 access(all)
 fun setup() {
     var err = Test.deployContract(
-        name: "ViewResolver",
-        path: "../contracts/standards/ViewResolver.cdc",
-        arguments: []
-    )
-    Test.expect(err, Test.beNil())
-    err = Test.deployContract(
-        name: "Burner",
-        path: "../contracts/standards/Burner.cdc",
-        arguments: []
-    )
-    err = Test.deployContract(
-        name: "FungibleToken",
-        path: "../contracts/standards/FungibleToken.cdc",
-        arguments: []
-    )
-    Test.expect(err, Test.beNil())
-    err = Test.deployContract(
-        name: "NonFungibleToken",
-        path: "../contracts/standards/NonFungibleToken.cdc",
-        arguments: []
-    )
-    Test.expect(err, Test.beNil())
-    err = Test.deployContract(
-        name: "MetadataViews",
-        path: "../contracts/standards/MetadataViews.cdc",
-        arguments: []
-    )
-    Test.expect(err, Test.beNil())
-    err = Test.deployContract(
         name: "Serialize",
         path: "../contracts/utils/Serialize.cdc",
         arguments: []

diff --git a/flow.json b/flow.json
@@ -16,8 +16,7 @@
 			"source": "./cadence/contracts/standards/Burner.cdc",
 			"aliases": {
 				"emulator": "ee82856bf20e2aa6",
-				"previewnet": "b6763b4399a888c8",
-				"testing": "0000000000000007"
+				"previewnet": "b6763b4399a888c8"
 			}
 		},
 		"CrossVMNFT": {
@@ -91,7 +90,6 @@
 				"emulator": "ee82856bf20e2aa6",
 				"mainnet": "f233dcee88fe0abe",
 				"previewnet": "a0225e7000ac82a9",
-				"testing": "0000000000000007",
 				"testnet": "9a0766d93b6608b7"
 			}
 		},
@@ -101,7 +99,6 @@
 				"emulator": "f8d6e0586b0a20c7",
 				"mainnet": "f233dcee88fe0abe",
 				"previewnet": "a0225e7000ac82a9",
-				"testing": "0000000000000007",
 				"testnet": "9a0766d93b6608b7"
 			}
 		},
@@ -129,7 +126,6 @@
 				"emulator": "f8d6e0586b0a20c7",
 				"mainnet": "1d7e57aa55817448",
 				"previewnet": "b6763b4399a888c8",
-				"testing": "0000000000000007",
 				"testnet": "631e88ae7f1d7c20"
 			}
 		},
@@ -139,7 +135,6 @@
 				"emulator": "f8d6e0586b0a20c7",
 				"mainnet": "1d7e57aa55817448",
 				"previewnet": "b6763b4399a888c8",
-				"testing": "0000000000000007",
 				"testnet": "631e88ae7f1d7c20"
 			}
 		},
@@ -175,7 +170,6 @@
 				"emulator": "f8d6e0586b0a20c7",
 				"mainnet": "1d7e57aa55817448",
 				"previewnet": "b6763b4399a888c8",
-				"testing": "0000000000000007",
 				"testnet": "631e88ae7f1d7c20"
 			}
 		}