near: Change contract 'address' to 'account'

Author: evaporei

manifest-schema.graphql

@@ -37,7 +37,7 @@ type EthereumContractSource {
 }
 
 type NearContractSource {
-  address: String
+  account: String
   startBlock: BigInt
 }
 

src/protocols/ethereum/subgraph.js

@@ -1,7 +1,7 @@
 const immutable = require('immutable')
 const ABI = require('./abi')
 const DataSourcesExtractor = require('../../command-helpers/data-sources')
-const { validateContractAddresses } = require('../../validation')
+const { validateContractValues } = require('../../validation')
 
 module.exports = class EthereumSubgraph {
   constructor(options = {}) {
@@ -75,9 +75,10 @@ ${abiNames
   validateContractAddresses() {
     const ethereumAddressPattern = /^(0x)?[0-9a-fA-F]{40}$/
 
-    return validateContractAddresses(
+    return validateContractValues(
       this.manifest,
       this.protocol,
+      'address',
       address => ethereumAddressPattern.test(address),
       "Must be 40 hexadecimal characters, with an optional '0x' prefix.",
     )

src/protocols/near/subgraph.js

@@ -1,5 +1,5 @@
 const immutable = require('immutable')
-const { validateContractAddresses } = require('../../validation')
+const { validateContractValues } = require('../../validation')
 
 module.exports = class NearSubgraph {
   constructor(options = {}) {
@@ -9,10 +9,10 @@ module.exports = class NearSubgraph {
   }
 
   validateManifest() {
-    return this.validateContractAddresses()
+    return this.validateContractAccounts()
   }
 
-  validateContractAddresses() {
+  validateContractAccounts() {
     // Reference: https://docs.near.org/docs/concepts/account#account-id-rules
     const MINIMUM_ACCOUNT_ID_LENGTH = 2
     const MAXIMUM_ACCOUNT_ID_LENGTH = 64
@@ -21,9 +21,10 @@ module.exports = class NearSubgraph {
       accountId.length <= MAXIMUM_ACCOUNT_ID_LENGTH
     const nearAccountIdPattern = /^(([a-z\d]+[\-_])*[a-z\d]+\.)*([a-z\d]+[\-_])*[a-z\d]+$/
 
-    return validateContractAddresses(
+    return validateContractValues(
       this.manifest,
       this.protocol,
+      'account',
       accountId => validateLength(accountId) && nearAccountIdPattern.test(accountId),
       `Must be between '${MINIMUM_ACCOUNT_ID_LENGTH}' and '${MAXIMUM_ACCOUNT_ID_LENGTH}' characters
 An Account ID consists of Account ID parts separated by '.' (dots)

src/validation/index.js

@@ -1,5 +1,5 @@
 module.exports = {
   validateSchema: require('./schema').validateSchema,
   validateManifest: require('./manifest').validateManifest,
-  validateContractAddresses: require('./manifest').validateContractAddresses,
+  validateContractValues: require('./manifest').validateContractValues,
 }

src/validation/manifest.js

@@ -282,35 +282,35 @@ const validateManifest = (value, type, schema, protocol, { resolveFile }) => {
   return validateDataSourceNetworks(value, protocol)
 }
 
-const validateContractAddresses = (manifest, protocol, validator, errorMessage) =>
+const validateContractValues = (manifest, protocol, fieldName, validator, errorMessage) =>
   manifest
     .get('dataSources')
     .filter(dataSource => protocol.isValidKindName(dataSource.get('kind')))
     .reduce((errors, dataSource, dataSourceIndex) => {
-      let path = ['dataSources', dataSourceIndex, 'source', 'address']
+      let path = ['dataSources', dataSourceIndex, 'source', fieldName]
 
-      // No need to validate if the source has no contract address
-      if (!dataSource.get('source').has('address')) {
+      // No need to validate if the source has no contract field
+      if (!dataSource.get('source').has(fieldName)) {
         return errors
       }
 
-      let address = dataSource.getIn(['source', 'address'])
+      let contractValue = dataSource.getIn(['source', fieldName])
 
-      // Validate whether the address is valid
-      if (validator(address)) {
+      // Validate whether the contract is valid
+      if (validator(contractValue)) {
         return errors
       } else {
         return errors.push(
           immutable.fromJS({
             path,
             message: `\
-Contract address is invalid: ${address}${errorMessage ? `\n${errorMessage}` : ''}`,
+Contract ${fieldName} is invalid: ${contractValue}${errorMessage ? `\n${errorMessage}` : ''}`,
           }),
         )
       }
     }, immutable.List())
 
 module.exports = {
   validateManifest,
-  validateContractAddresses,
+  validateContractValues,
 }

tests/cli/validation/near-is-valid/subgraph.yaml

@@ -7,7 +7,7 @@ dataSources:
   - kind: near
     name: NearSubgraph
     source:
-      address: wnear.flux-dev
+      account: wnear.flux-dev
       startBlock: 1
     mapping:
       apiVersion: 0.0.5