@@ -2,20 +2,21 @@ const immutable = require('immutable')
2
2
const fs = require ( 'fs' )
3
3
const yaml = require ( 'yaml' )
4
4
const request = require ( 'sync-request' )
5
- const Web3 = require ( 'web3' )
6
- const web3 = new Web3 ( null )
5
+ const Web3EthAbi = require ( 'web3-eth-abi' ) ;
7
6
8
7
const tsCodegen = require ( '../../../codegen/typescript' )
9
8
const typesCodegen = require ( '../../../codegen/types' )
10
9
const util = require ( '../../../codegen/util' )
11
10
11
+ const doFixtureCodegen = fs . existsSync ( './fixtures.yaml' ) ;
12
+
12
13
module . exports = class AbiCodeGenerator {
13
14
constructor ( abi ) {
14
15
this . abi = abi
15
16
}
16
17
17
18
generateModuleImports ( ) {
18
- return [
19
+ let imports = [
19
20
tsCodegen . moduleImports (
20
21
[
21
22
// Ethereum integration
@@ -32,14 +33,21 @@ module.exports = class AbiCodeGenerator {
32
33
'BigInt' ,
33
34
] ,
34
35
'@graphprotocol/graph-ts' ,
35
- ) ,
36
- tsCodegen . moduleImports (
37
- [
38
- 'newMockEvent' ,
39
- ] ,
40
- 'matchstick-as/assembly/index' ,
41
- ) ,
36
+ )
42
37
]
38
+
39
+ if ( doFixtureCodegen ) {
40
+ imports . push (
41
+ tsCodegen . moduleImports (
42
+ [
43
+ 'newMockEvent' ,
44
+ ] ,
45
+ 'matchstick-as/assembly/index' ,
46
+ )
47
+ )
48
+ }
49
+
50
+ return imports
43
51
}
44
52
45
53
generateTypes ( ) {
@@ -227,7 +235,7 @@ module.exports = class AbiCodeGenerator {
227
235
)
228
236
229
237
// Fixture generation
230
- try {
238
+ if ( doFixtureCodegen ) {
231
239
const args = yaml . parse ( fs . readFileSync ( './fixtures.yaml' , 'utf8' ) )
232
240
const blockNumber = args [ 'blockNumber' ]
233
241
const contractAddr = args [ 'contractAddr' ]
@@ -241,7 +249,7 @@ module.exports = class AbiCodeGenerator {
241
249
throw new Error ( body . result )
242
250
}
243
251
244
- let res = web3 . eth . abi . decodeLog (
252
+ let res = Web3EthAbi . decodeLog (
245
253
namesAndTypes ,
246
254
body . result [ 0 ] . data ,
247
255
[ ]
@@ -268,9 +276,6 @@ module.exports = class AbiCodeGenerator {
268
276
` ,
269
277
)
270
278
)
271
- } catch ( e ) {
272
- // no fixtures
273
- console . log ( e )
274
279
}
275
280
276
281
return [ klass , paramsClass , ...tupleClasses ]
0 commit comments