codegen: Move missing ethereum specific ABI code to protocols folder

Author: evaporei

src/protocols/ethereum/abi.js

@@ -2,7 +2,7 @@ const fs = require('fs-extra')
 const immutable = require('immutable')
 const path = require('path')
 
-const AbiCodeGenerator = require('../../codegen/abi')
+const AbiCodeGenerator = require('./codegen/abi')
 
 const TUPLE_ARRAY_PATTERN = /^tuple\[([0-9]*)\]$/
 

src/codegen/abi.js renamed to src/protocols/ethereum/codegen/abi.js

@@ -1,9 +1,9 @@
 const immutable = require('immutable')
 
-const tsCodegen = require('./typescript')
-const typesCodegen = require('./types')
-const util = require('./util')
-const ABI = require('../protocols/ethereum/abi')
+const tsCodegen = require('../../../codegen/typescript')
+const typesCodegen = require('../../../codegen/types')
+const util = require('../../../codegen/util')
+const ABI = require('../abi')
 
 module.exports = class AbiCodeGenerator {
   constructor(abi) {
@@ -48,7 +48,7 @@ module.exports = class AbiCodeGenerator {
       setName: (fn, name) => fn.set('_alias', name),
     })
 
-    return callFunctions
+    callFunctions = callFunctions
       .map(fn => {
         let fnAlias = fn.get('_alias')
         let fnClassName = `${fnAlias.charAt(0).toUpperCase()}${fnAlias.slice(1)}Call`
@@ -141,6 +141,8 @@ module.exports = class AbiCodeGenerator {
         )
         return [klass, inputsClass, outputsClass, ...tupleClasses]
       })
+
+    return callFunctions
       .reduce(
         // flatten the array
         (array, classes) => array.concat(classes),
@@ -156,7 +158,7 @@ module.exports = class AbiCodeGenerator {
       setName: (event, name) => event.set('_alias', name),
     })
 
-    return events
+    events = events
       .map(event => {
         let eventClassName = event.get('_alias')
         let tupleClasses = []
@@ -209,6 +211,8 @@ module.exports = class AbiCodeGenerator {
         )
         return [klass, paramsClass, ...tupleClasses]
       })
+
+    return events
       .reduce(
         // flatten the array
         (array, classes) => array.concat(classes),

src/codegen/abi.test.js renamed to src/protocols/ethereum/codegen/abi.test.js

@@ -2,8 +2,8 @@ const fs = require('fs-extra')
 const path = require('path')
 const immutable = require('immutable')
 
-const ABI = require('../protocols/ethereum/abi')
-const ts = require('./typescript')
+const ABI = require('../abi')
+const ts = require('../../../codegen/typescript')
 const AbiCodeGenerator = require('./abi')
 
 let tempdir

src/scaffold.js

@@ -7,7 +7,7 @@ const { getSubgraphBasename } = require('./command-helpers/subgraph')
 const { step } = require('./command-helpers/spinner')
 const { ascTypeForEthereum, valueTypeForAsc } = require('./codegen/types')
 const ABI = require('./protocols/ethereum/abi')
-const AbiCodeGenerator = require('./codegen/abi')
+const AbiCodeGenerator = require('./protocols/ethereum/codegen/abi')
 const util = require('./codegen/util')
 
 const abiEvents = abi =>