tests: Update subgraph composition integration tests to work with immutable entities

Author: incrypto32

tests/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   ipfs:
-    image: docker.io/ipfs/kubo:v0.17.0
+    image: docker.io/ipfs/kubo:v0.34.1
     ports:
       - '127.0.0.1:3001:5001'
   postgres:
@@ -20,7 +20,7 @@ services:
       POSTGRES_DB: graph-node
       POSTGRES_INITDB_ARGS: "-E UTF8 --locale=C"
   anvil:
-    image: ghcr.io/foundry-rs/foundry:latest
+    image: ghcr.io/foundry-rs/foundry:stable
     ports:
       - '3021:8545'
     command: "'anvil --host 0.0.0.0 --gas-limit 100000000000 --base-fee 1 --block-time 5 --mnemonic \"test test test test test test test test test test test junk\"'"

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

@@ -1,28 +1,26 @@
 import { dataSource, EntityTrigger, log } from '@graphprotocol/graph-ts'
 import { AggregatedData } from '../generated/schema'
-import { SourceAData } from '../generated/subgraph-QmPWnNsD4m8T9EEF1ec5d8wetFxrMebggLj1efFHzdnZhx'
-import { SourceBData } from '../generated/subgraph-Qma4Rk2D1w6mFiP15ZtHHx7eWkqFR426RWswreLiDanxej'
+import { SourceAData } from '../generated/subgraph-QmYHp1bPEf7EoYBpEtJUpZv1uQHYQfWE4AhvR6frjB1Huj'
+import { SourceBData } from '../generated/subgraph-QmYBEzastJi7bsa722ac78tnZa6xNnV9vvweerY4kVyJtq'
 
-export function handleSourceAData(data: EntityTrigger<SourceAData>): void {
-  let aggregated = AggregatedData.load(data.data.id)
-  if (!aggregated) {
-    aggregated = new AggregatedData(data.data.id)
-    aggregated.sourceA = data.data.data
-    aggregated.first = 'sourceA'
-  } else {
-    aggregated.sourceA = data.data.data
-  }
+
+// We know this handler will run first since its defined first in the manifest
+// So we dont need to check if the Aggregated data exists
+export function handleSourceAData(data: SourceAData): void {
+  let aggregated = new AggregatedData(data.id)
+  aggregated.sourceA = data.data
+  aggregated.first = 'sourceA'
   aggregated.save()
 }
 
-export function handleSourceBData(data: EntityTrigger<SourceBData>): void {
-  let aggregated = AggregatedData.load(data.data.id)
+export function handleSourceBData(data: SourceBData): void {
+  let aggregated = AggregatedData.load(data.id)
   if (!aggregated) {
-    aggregated = new AggregatedData(data.data.id)
-    aggregated.sourceB = data.data.data
+    aggregated = new AggregatedData(data.id)
+    aggregated.sourceB = data.data
     aggregated.first = 'sourceB'
   } else {
-    aggregated.sourceB = data.data.data
+    aggregated.sourceB = data.data
   }
   aggregated.save()
 }

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

@@ -6,7 +6,7 @@ dataSources:
     name: SourceA
     network: test
     source:
-      address: 'QmPWnNsD4m8T9EEF1ec5d8wetFxrMebggLj1efFHzdnZhx'
+      address: 'QmYHp1bPEf7EoYBpEtJUpZv1uQHYQfWE4AhvR6frjB1Huj'
       startBlock: 0
     mapping:
       apiVersion: 0.0.7
@@ -22,7 +22,7 @@ dataSources:
     name: SourceB
     network: test
     source:
-      address: 'Qma4Rk2D1w6mFiP15ZtHHx7eWkqFR426RWswreLiDanxej'
+      address: 'QmYBEzastJi7bsa722ac78tnZa6xNnV9vvweerY4kVyJtq'
       startBlock: 0
     mapping:
       apiVersion: 0.0.7

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

@@ -1,4 +1,4 @@
-type SourceAData @entity {
+type SourceAData @entity(immutable: true) {
   id: ID!
   data: String!
   blockNumber: BigInt!

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

@@ -1,4 +1,4 @@
-type SourceBData @entity {
+type SourceBData @entity(immutable: true) {
   id: ID!
   data: String!
   blockNumber: BigInt!

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

@@ -1,11 +1,10 @@
-type Block @entity {
+type Block @entity(immutable: true) {
   id: ID!
   number: BigInt!
   hash: Bytes!
-  testMessage: String
 }
 
-type Block2 @entity {
+type Block2 @entity(immutable: true) {
   id: ID!
   number: BigInt!
   hash: Bytes!

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

@@ -1,6 +1,5 @@
 import { ethereum, log, store } from '@graphprotocol/graph-ts';
 import { Block, Block2 } from '../generated/schema';
-import { BigInt } from '@graphprotocol/graph-ts';
 
 export function handleBlock(block: ethereum.Block): void {
   log.info('handleBlock {}', [block.number.toString()]);
@@ -21,37 +20,6 @@ export function handleBlock(block: ethereum.Block): void {
   let blockEntity3 = new Block2(id3);
   blockEntity3.number = block.number;
   blockEntity3.hash = block.hash;
+  blockEntity3.testMessage = block.number.toString().concat('-message');
   blockEntity3.save();
-
-  if (block.number.equals(BigInt.fromI32(1))) {
-    let id = 'TEST';
-    let entity = new Block(id);
-    entity.number = block.number;
-    entity.hash = block.hash;
-    entity.testMessage = 'Created at block 1';
-    log.info('Created entity at block 1', []);
-    entity.save();
-  }
-
-  if (block.number.equals(BigInt.fromI32(2))) {
-    let id = 'TEST';
-    let blockEntity1 = Block.load(id);
-    if (blockEntity1) {
-      // Update the block entity
-      blockEntity1.testMessage = 'Updated at block 2';
-      log.info('Updated entity at block 2', []);
-      blockEntity1.save();
-    }
-  }
-
-  if (block.number.equals(BigInt.fromI32(3))) {
-    let id = 'TEST';
-    let blockEntity1 = Block.load(id);
-    if (blockEntity1) {
-      blockEntity1.testMessage = 'Deleted at block 3';
-      log.info('Deleted entity at block 3', []);
-      blockEntity1.save();
-      store.remove('Block', id);
-    }
-  }
 }

tests/integration-tests/subgraph-data-sources/src/mapping.ts

@@ -1,26 +1,26 @@
-import { Entity, log, store, BigInt, EntityTrigger, EntityOp } from '@graphprotocol/graph-ts';
-import { Block } from '../generated/subgraph-QmVz1Pt7NhgCkz4gfavmNrMhojnMT9hW81QDqVjy56ZMUP';
+import { log, store } from '@graphprotocol/graph-ts';
+import { Block, Block2 } from '../generated/subgraph-QmWi3H11QFE2PiWx6WcQkZYZdA5UasaBptUJqGn54MFux5';
 import { MirrorBlock } from '../generated/schema';
 
-export function handleEntity(trigger: EntityTrigger<Block>): void {
-  let blockEntity = trigger.data;
-  let id = blockEntity.id;
+export function handleEntity(block: Block): void {
+  let id = block.id;
 
-  if (trigger.operation === EntityOp.Remove) {
-    log.info('Removing block entity with id: {}', [id]);
-    store.remove('MirrorBlock', id);
-    return;
-  }
+  let blockEntity = loadOrCreateMirrorBlock(id);
+  blockEntity.number = block.number;
+  blockEntity.hash = block.hash;
 
-  let block = loadOrCreateMirrorBlock(id);
-  block.number = blockEntity.number;
-  block.hash = blockEntity.hash;
-  
-  if (blockEntity.testMessage) {
-    block.testMessage = blockEntity.testMessage;
-  }
+  blockEntity.save();
+}
+
+export function handleEntity2(block: Block2): void {
+  let id = block.id;
+
+  let blockEntity = loadOrCreateMirrorBlock(id);
+  blockEntity.number = block.number;
+  blockEntity.hash = block.hash;
+  blockEntity.testMessage = block.testMessage;
 
-  block.save();
+  blockEntity.save();
 }
 
 export function loadOrCreateMirrorBlock(id: string): MirrorBlock {

tests/integration-tests/subgraph-data-sources/subgraph.yaml

@@ -6,7 +6,7 @@ dataSources:
     name: Contract
     network: test
     source:
-      address: 'QmVz1Pt7NhgCkz4gfavmNrMhojnMT9hW81QDqVjy56ZMUP'
+      address: 'QmWi3H11QFE2PiWx6WcQkZYZdA5UasaBptUJqGn54MFux5'
       startBlock: 0
     mapping:
       apiVersion: 0.0.7
@@ -16,6 +16,6 @@ dataSources:
       handlers:
         - handler: handleEntity
           entity: Block
-        - handler: handleEntity
+        - handler: handleEntity2
           entity: Block2
       file: ./src/mapping.ts

tests/tests/integration_tests.rs

@@ -523,79 +523,34 @@ async fn subgraph_data_sources(ctx: TestContext) -> anyhow::Result<()> {
     assert!(subgraph.healthy);
     let expected_response = json!({
         "mirrorBlocks": [
-            { "id": "1-v1", "number": "1" },
-            { "id": "1-v2", "number": "1" },
-            { "id": "1-v3", "number": "1" },
-            { "id": "2-v1", "number": "2" },
-            { "id": "2-v2", "number": "2" },
-            { "id": "2-v3", "number": "2" },
-            { "id": "3-v1", "number": "3" },
-            { "id": "3-v2", "number": "3" },
-            { "id": "3-v3", "number": "3" },
-            { "id": "4-v1", "number": "4" },
-            { "id": "4-v2", "number": "4" },
-            { "id": "4-v3", "number": "4" },
-            { "id": "5-v1", "number": "5" },
-            { "id": "5-v2", "number": "5" },
-            { "id": "5-v3", "number": "5" },
-            { "id": "6-v1", "number": "6" },
-            { "id": "6-v2", "number": "6" },
-            { "id": "6-v3", "number": "6" },
-            { "id": "7-v1", "number": "7" },
-            { "id": "7-v2", "number": "7" },
-            { "id": "7-v3", "number": "7" },
-            { "id": "8-v1", "number": "8" },
-            { "id": "8-v2", "number": "8" },
-            { "id": "8-v3", "number": "8" },
-            { "id": "9-v1", "number": "9" },
-            { "id": "9-v2", "number": "9" },
-            { "id": "9-v3", "number": "9" },
-            { "id": "10-v1", "number": "10" },
-            { "id": "10-v2", "number": "10" },
-            { "id": "10-v3", "number": "10" },
+            { "id": "1-v1", "number": "1", "testMessage": null },
+            { "id": "1-v2", "number": "1", "testMessage": null },
+            { "id": "1-v3", "number": "1", "testMessage": "1-message" },
+            { "id": "2-v1", "number": "2", "testMessage": null },
+            { "id": "2-v2", "number": "2", "testMessage": null },
+            { "id": "2-v3", "number": "2", "testMessage": "2-message" },
+            { "id": "3-v1", "number": "3", "testMessage": null },
+            { "id": "3-v2", "number": "3", "testMessage": null },
+            { "id": "3-v3", "number": "3", "testMessage": "3-message" },
         ]
     });
 
     query_succeeds(
-        "Blocks should be right",
+        "Query all blocks with testMessage",
         &subgraph,
-        "{ mirrorBlocks(where: {number_lte: 10}, orderBy: number) { id, number } }",
+        "{ mirrorBlocks(where: {number_lte: 3}, orderBy: number) { id, number, testMessage } }",
         expected_response,
     )
     .await?;
 
     let expected_response = json!({
-        "mirrorBlock": { "id": "TEST", "number": "1", "testMessage": "Created at block 1" },
+        "mirrorBlock": { "id": "1-v3", "number": "1", "testMessage": "1-message" },
     });
 
     query_succeeds(
-        "Blocks should be right",
+        "Query specific block with testMessage",
         &subgraph,
-        "{ mirrorBlock(id: \"TEST\", block: {number: 1}) { id, number, testMessage } }",
-        expected_response,
-    )
-    .await?;
-
-    let expected_response = json!({
-        "mirrorBlock": { "id": "TEST", "number": "1", "testMessage": "Updated at block 2" },
-    });
-
-    query_succeeds(
-        "Blocks should be right",
-        &subgraph,
-        "{ mirrorBlock(id: \"TEST\", block: {number: 2}) { id, number, testMessage } }",
-        expected_response,
-    )
-    .await?;
-
-    let expected_response = json!({
-        "mirrorBlock": null,
-    });
-
-    query_succeeds(
-        "Blocks should be right",
-        &subgraph,
-        "{ mirrorBlock(id: \"TEST\", block: {number: 3}) { id, number, testMessage } }",
+        "{ mirrorBlock(id: \"1-v3\") { id, number, testMessage } }",
         expected_response,
     )
     .await?;