skip built-in contract imports

onflow · Sep 5, 2024 · 6aebe72 · 6aebe72
1 parent 475cf28
commit 6aebe72
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 48 deletions.
diff --git a/internal/v1_1/generator.go b/internal/v1_1/generator.go
@@ -170,6 +170,13 @@ func (g Generator) processDependencies(ctx context.Context, program *ast.Program
 	// fill in dependence information
 	g.template.Data.Dependencies = make([]Dependency, 0)
 	for _, imp := range imports {
+
+		// Built-in contracts imports are represented with identifier location
+		_, isBuiltInContract := imp.Location.(common.IdentifierLocation)
+		if isBuiltInContract {
+			continue
+		}
+
 		contractName := imp.Location.String()
 		networks, err := g.generateDependenceInfo(ctx, contractName)
 		if err != nil {

diff --git a/internal/v1_1/generator_test.go b/internal/v1_1/generator_test.go
@@ -97,23 +97,6 @@ func TestValidImports(t *testing.T) {
 				},
 			},
 		},
-		{
-			Contract: "Joe",
-			Networks: []Network{
-				{
-					Network: "testnet",
-					Address: "0x0000000000000003",
-				},
-				{
-					Network: "mainnet",
-					Address: "0x0000000000000003",
-				},
-				{
-					Network: "emulator",
-					Address: "0x0000000000000003",
-				},
-			},
-		},
 	}
 
 	generator := Generator{
@@ -122,9 +105,9 @@ func TestValidImports(t *testing.T) {
 
 	assert := assert.New(t)
 	code := `
-	import Alice
-	import "Bob"
-	import Joe from 0x0000000000000003
+	import "Alice"
+	import Bob from 0x0000000000000002
+	import Joe
 
 	access(all)
 	fun main(): Void {}

diff --git a/internal/v1_1/testdata/TestValidImports.golden b/internal/v1_1/testdata/TestValidImports.golden
@@ -1,13 +1,13 @@
-{
+`{
     "f_type": "InteractionTemplate",
     "f_version": "1.1.0",
-    "id": "7a7046a0687195fa5a5dd3838fbb9a707e2b9f699e56eac9999b5cfea02b3d09",
+    "id": "585d2dd4fc3523ba140fbe0f798c07f1d4c3792aaed72a3b0d7c32c23a6457e7",
     "data": {
         "type": "script",
         "interface": "",
         "messages": null,
         "cadence": {
-            "body": "\n\timport Alice\n\timport \"Bob\"\n\timport \"Joe\"\n\n\taccess(all)\n\tfun main(): Void {}\n",
+            "body": "\n\timport \"Alice\"\n\timport \"Bob\"\n\timport Joe\n\n\taccess(all)\n\tfun main(): Void {}\n",
             "network_pins": []
         },
         "dependencies": [
@@ -58,30 +58,6 @@
                         ]
                     }
                 ]
-            },
-            {
-                "contracts": [
-                    {
-                        "contract": "Joe",
-                        "networks": [
-                            {
-                                "network": "testnet",
-                                "address": "0x0000000000000003",
-                                "dependency_pin_block_height": 0
-                            },
-                            {
-                                "network": "mainnet",
-                                "address": "0x0000000000000003",
-                                "dependency_pin_block_height": 0
-                            },
-                            {
-                                "network": "emulator",
-                                "address": "0x0000000000000003",
-                                "dependency_pin_block_height": 0
-                            }
-                        ]
-                    }
-                ]
             }
         ],
         "parameters": null,
@@ -92,4 +68,4 @@
             "messages": []
         }
     }
-}
+}`