gnd: (WIP) tentative fix for integration test failure

Still need to clean up the Manifest.subgraph_sources vs data_sources mess

Eventually fixup 'gnd: Extract shared manifest and watch modules'

Author: lutter

gnd/src/manifest.rs

@@ -69,8 +69,9 @@ pub struct SubgraphSource {
 
 impl Manifest {
     /// Returns the total count of all data sources (regular + subgraph).
+    /// Note: Subgraph data sources are included in `data_sources`.
     pub fn total_source_count(&self) -> usize {
-        self.data_sources.len() + self.subgraph_sources.len()
+        self.data_sources.len()
     }
 }
 
@@ -141,7 +142,7 @@ pub fn load_manifest(path: &Path) -> Result<Manifest> {
                 .unwrap_or("ethereum/contract");
 
             if kind == "subgraph" {
-                // Subgraph data source - extract the name and IPFS address
+                // Subgraph data source - extract for codegen
                 let name = ds
                     .get("name")
                     .and_then(|n| n.as_str())
@@ -158,6 +159,10 @@ pub fn load_manifest(path: &Path) -> Result<Manifest> {
                         address: address.to_string(),
                     });
                 }
+                // Also include in data_sources for the build command
+                if let Some(parsed) = parse_data_source(ds, kind) {
+                    data_sources.push(parsed);
+                }
             } else {
                 // Regular data source (ethereum/contract, etc.)
                 if let Some(parsed) = parse_data_source(ds, kind) {
@@ -448,8 +453,11 @@ dataSources:
         fs::write(&manifest_path, manifest_content).unwrap();
 
         let manifest = load_manifest(&manifest_path).unwrap();
-        assert_eq!(manifest.data_sources.len(), 1);
-        assert_eq!(manifest.data_sources[0].name, "Token");
+        // Subgraph sources are included in both data_sources and subgraph_sources
+        assert_eq!(manifest.data_sources.len(), 2);
+        assert_eq!(manifest.data_sources[0].name, "SourceSubgraph");
+        assert_eq!(manifest.data_sources[0].kind, "subgraph");
+        assert_eq!(manifest.data_sources[1].name, "Token");
         assert_eq!(manifest.subgraph_sources.len(), 1);
         assert_eq!(manifest.subgraph_sources[0].name, "SourceSubgraph");
         assert_eq!(manifest.subgraph_sources[0].address, "QmSourceHash123");