update multiple subgraph datasources integration test

Author: incrypto32

tests/integration-tests/multiple-subgraph-datasources/schema.graphql

@@ -2,4 +2,5 @@ type AggregatedData @entity {
   id: ID!
   sourceA: String
   sourceB: String
+  first: String!
 }

tests/integration-tests/multiple-subgraph-datasources/src/mapping.ts

@@ -1,24 +1,26 @@
-import { dataSource, EntityTrigger } from '@graphprotocol/graph-ts'
+import { dataSource, EntityTrigger, log } from '@graphprotocol/graph-ts'
 import { AggregatedData } from '../generated/schema'
-import { SourceAData } from '../generated/subgraph-QmU35YwAsv59gJxhejp3qqUrSFMaoBXuskNLX7wJHNUzyA'
-import { SourceBData } from '../generated/subgraph-QmXjHeC7j5iWF49oEngV3tqFrHvb4NhkFpAdJYVJ1SFPNk'
+import { SourceAData } from '../generated/subgraph-QmcYeEnoRzLgrwwW1StY7wTAGSS8Qt5G78RYAHHyLJWYBy'
+import { SourceBData } from '../generated/subgraph-QmetPUZD9SNGjdpkgefBGe8uWEcLYxggVaixkYKd22AKr6'
 
 export function handleSourceAData(data: EntityTrigger<SourceAData>): void {
-  let aggregated = AggregatedData.load('1')
+  let aggregated = AggregatedData.load(data.data.id)
   if (!aggregated) {
-    aggregated = new AggregatedData('1')
+    aggregated = new AggregatedData(data.data.id)
     aggregated.sourceA = data.data.data
+    aggregated.first = 'sourceA'
   } else {
     aggregated.sourceA = data.data.data
   }
   aggregated.save()
 }
 
 export function handleSourceBData(data: EntityTrigger<SourceBData>): void {
-  let aggregated = AggregatedData.load('1')
+  let aggregated = AggregatedData.load(data.data.id)
   if (!aggregated) {
-    aggregated = new AggregatedData('1')
+    aggregated = new AggregatedData(data.data.id)
     aggregated.sourceB = data.data.data
+    aggregated.first = 'sourceB'
   } else {
     aggregated.sourceB = data.data.data
   }

tests/integration-tests/multiple-subgraph-datasources/subgraph.yaml

@@ -6,7 +6,7 @@ dataSources:
     name: SourceA
     network: test
     source:
-      address: 'QmU35YwAsv59gJxhejp3qqUrSFMaoBXuskNLX7wJHNUzyA'
+      address: 'QmcYeEnoRzLgrwwW1StY7wTAGSS8Qt5G78RYAHHyLJWYBy'
       startBlock: 0
     mapping:
       apiVersion: 0.0.7
@@ -22,7 +22,7 @@ dataSources:
     name: SourceB
     network: test
     source:
-      address: 'QmXjHeC7j5iWF49oEngV3tqFrHvb4NhkFpAdJYVJ1SFPNk'
+      address: 'QmetPUZD9SNGjdpkgefBGe8uWEcLYxggVaixkYKd22AKr6'
       startBlock: 0
     mapping:
       apiVersion: 0.0.7

tests/integration-tests/source-subgraph-a/schema.graphql

@@ -1,5 +1,5 @@
 type SourceAData @entity {
   id: ID!
   data: String!
-  timestamp: BigInt!
+  blockNumber: BigInt!
 } 

tests/integration-tests/source-subgraph-a/src/mapping.ts

@@ -2,8 +2,8 @@ import { ethereum } from '@graphprotocol/graph-ts'
 import { SourceAData } from '../generated/schema'
 
 export function handleBlock(block: ethereum.Block): void {
-  let entity = new SourceAData('1')
+  let entity = new SourceAData(block.number.toString())
   entity.data = 'from source A'
-  entity.timestamp = block.timestamp
+  entity.blockNumber = block.number
   entity.save()
 } 

tests/integration-tests/source-subgraph-b/src/mapping.ts

@@ -2,7 +2,7 @@ import { ethereum } from '@graphprotocol/graph-ts'
 import { SourceBData } from '../generated/schema'
 
 export function handleBlock(block: ethereum.Block): void {
-  let entity = new SourceBData('1')
+  let entity = new SourceBData(block.number.toString())
   entity.data = 'from source B'
   entity.blockNumber = block.number
   entity.save()

tests/tests/integration_tests.rs

@@ -103,16 +103,9 @@ impl TestCase {
     where
         T: Future<Output = Result<(), anyhow::Error>> + Send + 'static,
     {
-        fn force_boxed<T>(f: fn(TestContext) -> T) -> TestFn
-        where
-            T: Future<Output = Result<(), anyhow::Error>> + Send + 'static,
-        {
-            Box::new(move |ctx| Box::pin(f(ctx)))
-        }
-
         Self {
             name: name.to_string(),
-            test: force_boxed(test),
+            test: Box::new(move |ctx| Box::pin(test(ctx))),
             source_subgraph: None,
         }
     }
@@ -125,18 +118,9 @@ impl TestCase {
     where
         T: Future<Output = Result<(), anyhow::Error>> + Send + 'static,
     {
-        fn force_boxed<T>(f: fn(TestContext) -> T) -> TestFn
-        where
-            T: Future<Output = Result<(), anyhow::Error>> + Send + 'static,
-        {
-            Box::new(move |ctx| Box::pin(f(ctx)))
-        }
-
-        Self {
-            name: name.to_string(),
-            test: force_boxed(test),
-            source_subgraph: Some(source_subgraph.to_string()),
-        }
+        let mut test_case = Self::new(name, test);
+        test_case.source_subgraph = Some(source_subgraph.to_string());
+        test_case
     }
 
     fn new_with_multiple_source_subgraphs<T>(
@@ -147,18 +131,9 @@ impl TestCase {
     where
         T: Future<Output = Result<(), anyhow::Error>> + Send + 'static,
     {
-        fn force_boxed<T>(f: fn(TestContext) -> T) -> TestFn
-        where
-            T: Future<Output = Result<(), anyhow::Error>> + Send + 'static,
-        {
-            Box::new(move |ctx| Box::pin(f(ctx)))
-        }
-
-        Self {
-            name: name.to_string(),
-            test: force_boxed(test),
-            source_subgraph: Some(source_subgraphs.join(",")),
-        }
+        let mut test_case = Self::new(name, test);
+        test_case.source_subgraph = Some(source_subgraphs.join(","));
+        test_case
     }
 
     async fn deploy_and_wait(
@@ -966,17 +941,18 @@ async fn test_multiple_subgraph_datasources(ctx: TestContext) -> anyhow::Result<
     let exp = json!({
         "aggregatedDatas": [
             {
-                "id": "1",
+                "id": "0",
                 "sourceA": "from source A",
                 "sourceB": "from source B",
-            }
+                "first": "sourceA"
+            },
         ]
     });
 
     query_succeeds(
         "should aggregate data from multiple sources",
         &subgraph,
-        "{ aggregatedDatas(first: 1) { id sourceA sourceB } }",
+        "{ aggregatedDatas(first: 1) { id sourceA sourceB first } }",
         exp,
     )
     .await?;