Fix tests

Author: schmidsi

examples/basic-event-handlers/build/subgraph.yaml

@@ -1,4 +1,4 @@
-specVersion: 0.0.2
+specVersion: 0.0.5
 description: Gravatar for Ethereum
 repository: https://github.com/graphprotocol/example-subgraph
 schema:
@@ -8,11 +8,11 @@ dataSources:
     name: Gravity
     network: test
     source:
-      address: "0xCfEB869F69431e42cdB54A4F4f105C19C080A601"
+      address: '0xCfEB869F69431e42cdB54A4F4f105C19C080A601'
       abi: Gravity
     mapping:
       kind: ethereum/events
-      apiVersion: 0.0.5
+      apiVersion: 0.0.7
       language: wasm/assemblyscript
       entities:
         - Gravatar

examples/basic-event-handlers/subgraph.yaml

@@ -1,4 +1,4 @@
-specVersion: 0.0.2
+specVersion: 0.0.5
 description: Gravatar for Ethereum
 repository: https://github.com/graphprotocol/example-subgraph
 schema:
@@ -12,7 +12,7 @@ dataSources:
       abi: Gravity
     mapping:
       kind: ethereum/events
-      apiVersion: 0.0.5
+      apiVersion: 0.0.7
       language: wasm/assemblyscript
       entities:
         - Gravatar

examples/example-subgraph/dist/subgraph.yaml

@@ -1,4 +1,4 @@
-specVersion: 0.0.1
+specVersion: 0.0.5
 description: example of a subgraph
 repository: 'https://github.com/graphprotocol/graph-cli.git'
 schema:
@@ -12,7 +12,7 @@ dataSources:
       abi: ExampleContract
     mapping:
       kind: ethereum/events
-      apiVersion: 0.0.5
+      apiVersion: 0.0.7
       language: wasm/assemblyscript
       file: ExampleSubgraph/ExampleSubgraph.wasm
       entities:

examples/example-subgraph/subgraph.yaml

@@ -1,5 +1,5 @@
-specVersion: 0.0.2
-description: "example of a subgraph"
+specVersion: 0.0.5
+description: 'example of a subgraph'
 repository: https://github.com/graphprotocol/graph-cli.git
 schema:
   file: ./schema.graphql
@@ -12,7 +12,7 @@ dataSources:
       abi: ExampleContract
     mapping:
       kind: ethereum/events
-      apiVersion: 0.0.5
+      apiVersion: 0.0.7
       language: wasm/assemblyscript
       file: ./src/mapping.ts
       entities:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.35.0",
+  "version": "0.35.0-best-practices",
   "license": "(Apache-2.0 OR MIT)",
   "description": "CLI for building for and deploying to The Graph",
   "dependencies": {

src/protocols/ethereum/scaffold/manifest.js

@@ -8,7 +8,7 @@ const source = ({ contract, contractName }) => `
 
 const mapping = ({ abi, contractName }) => `
       kind: ethereum/events
-      apiVersion: 0.0.5
+      apiVersion: 0.0.7
       language: wasm/assemblyscript
       entities:
         ${abiEvents(abi)

src/scaffold/cosmos.test.js

@@ -7,17 +7,15 @@ const protocol = new Protocol('cosmos')
 const scaffoldOptions = {
   protocol,
   network: 'cosmoshub-4',
-  contractName: 'CosmosHub'
+  contractName: 'CosmosHub',
 }
 
 const scaffold = new Scaffold(scaffoldOptions)
 
 describe('Cosmos subgraph scaffolding', () => {
   test('Manifest', () => {
-    expect(
-      scaffold.generateManifest(),
-    ).toEqual(`\
-specVersion: 0.0.1
+    expect(scaffold.generateManifest()).toEqual(`\
+specVersion: 0.0.5
 schema:
   file: ./schema.graphql
 dataSources:

src/scaffold/index.js

@@ -3,17 +3,13 @@ const pkginfo = require('pkginfo')(module)
 const { strings } = require('gluegun')
 
 const GRAPH_CLI_VERSION = process.env.GRAPH_CLI_TESTS
-  // JSON.stringify should remove this key, we will install the local
-  // graph-cli for the tests using `npm link` instead of fetching from npm.
-  ? undefined
-  // For scaffolding real subgraphs
-  : `${module.exports.version}`
-
-const {
-  abiEvents,
-  generateEventType,
-  generateExampleEntityType,
-} = require('./schema')
+  ? // JSON.stringify should remove this key, we will install the local
+    // graph-cli for the tests using `npm link` instead of fetching from npm.
+    undefined
+  : // For scaffolding real subgraphs
+    `${module.exports.version}`
+
+const { abiEvents, generateEventType, generateExampleEntityType } = require('./schema')
 const { generateEventIndexingHandlers } = require('./mapping')
 const { generateTestsFiles } = require('./tests')
 const { getSubgraphBasename } = require('../command-helpers/subgraph')
@@ -38,24 +34,23 @@ module.exports = class Scaffold {
         scripts: {
           codegen: 'graph codegen',
           build: 'graph build',
-          deploy:
-            `graph deploy ` +
-            `--node ${this.node} ` +
-            this.subgraphName,
+          deploy: `graph deploy ` + `--node ${this.node} ` + this.subgraphName,
           'create-local': `graph create --node http://localhost:8020/ ${this.subgraphName}`,
           'remove-local': `graph remove --node http://localhost:8020/ ${this.subgraphName}`,
           'deploy-local':
             `graph deploy ` +
             `--node http://localhost:8020/ ` +
             `--ipfs http://localhost:5001 ` +
             this.subgraphName,
-          'test': 'graph test',
+          test: 'graph test',
         },
         dependencies: {
           '@graphprotocol/graph-cli': GRAPH_CLI_VERSION,
           '@graphprotocol/graph-ts': `0.28.1`,
         },
-        devDependencies: this.protocol.hasEvents() ? { 'matchstick-as': `0.5.0`} : undefined,
+        devDependencies: this.protocol.hasEvents()
+          ? { 'matchstick-as': `0.5.0` }
+          : undefined,
       }),
       { parser: 'json' },
     )
@@ -64,8 +59,9 @@ module.exports = class Scaffold {
   generateManifest() {
     const protocolManifest = this.protocol.getManifestScaffold()
 
-    return prettier.format(`
-specVersion: 0.0.1
+    return prettier.format(
+      `
+specVersion: 0.0.5
 schema:
   file: ./schema.graphql
 dataSources:
@@ -81,16 +77,11 @@ dataSources:
 
   generateSchema() {
     const hasEvents = this.protocol.hasEvents()
-    const events = hasEvents
-      ? abiEvents(this.abi).toJS()
-      : []
+    const events = hasEvents ? abiEvents(this.abi).toJS() : []
 
     return prettier.format(
       hasEvents && this.indexEvents
-        ? events.map(
-            event => generateEventType(event, this.protocol.name)
-          )
-            .join('\n\n')
+        ? events.map(event => generateEventType(event, this.protocol.name)).join('\n\n')
         : generateExampleEntityType(this.protocol, events),
       {
         parser: 'graphql',
@@ -110,18 +101,13 @@ dataSources:
 
   generateMapping() {
     const hasEvents = this.protocol.hasEvents()
-    const events = hasEvents
-      ? abiEvents(this.abi).toJS()
-      : []
+    const events = hasEvents ? abiEvents(this.abi).toJS() : []
 
     const protocolMapping = this.protocol.getMappingScaffold()
 
     return prettier.format(
       hasEvents && this.indexEvents
-        ? generateEventIndexingHandlers(
-            events,
-            this.contractName,
-          )
+        ? generateEventIndexingHandlers(events, this.contractName)
         : protocolMapping.generatePlaceholderHandlers({
             ...this,
             events,
@@ -133,21 +119,19 @@ dataSources:
   generateABIs() {
     return this.protocol.hasABIs()
       ? {
-        [`${this.contractName}.json`]: prettier.format(JSON.stringify(this.abi.data), {
-          parser: 'json',
-        }),
-      }
+          [`${this.contractName}.json`]: prettier.format(JSON.stringify(this.abi.data), {
+            parser: 'json',
+          }),
+        }
       : undefined
   }
 
   generateTests() {
     const hasEvents = this.protocol.hasEvents()
-    const events = hasEvents
-      ? abiEvents(this.abi).toJS()
-      : []
+    const events = hasEvents ? abiEvents(this.abi).toJS() : []
 
     return events.length > 0
-      ?  generateTestsFiles(this.contractName, events, this.indexEvents)
+      ? generateTestsFiles(this.contractName, events, this.indexEvents)
       : undefined
   }
 

src/scaffold/near.test.js

@@ -8,17 +8,15 @@ const scaffoldOptions = {
   protocol,
   contract: 'abc.def.near',
   network: 'near-mainnet',
-  contractName: 'Contract'
+  contractName: 'Contract',
 }
 
 const scaffold = new Scaffold(scaffoldOptions)
 
 describe('NEAR subgraph scaffolding', () => {
   test('Manifest', () => {
-    expect(
-      scaffold.generateManifest(),
-    ).toEqual(`\
-specVersion: 0.0.1
+    expect(scaffold.generateManifest()).toEqual(`\
+specVersion: 0.0.5
 schema:
   file: ./schema.graphql
 dataSources: