Skip to content

Commit 2dc1941

Browse files
committed
rename ABIGenerator (very old legacy reasons) to more apropriate CodeGenerator
1 parent 42aa072 commit 2dc1941

File tree

6 files changed

+20
-22
lines changed

6 files changed

+20
-22
lines changed

lib/contracts/abi.js renamed to lib/contracts/code_generator.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
class ABIGenerator {
1+
class CodeGenerator {
22
constructor(options) {
33
this.blockchainConfig = options.blockchainConfig || {};
44
this.contractsConfig = options.contractsConfig || {};
@@ -245,4 +245,4 @@ class ABIGenerator {
245245
}
246246
}
247247

248-
module.exports = ABIGenerator;
248+
module.exports = CodeGenerator;

lib/contracts/deploy.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ let async = require('async');
33
let RunCode = require('../core/runCode.js');
44

55
let DeployTracker = require('./deploy_tracker.js');
6-
let ABIGenerator = require('./abi.js');
6+
let CodeGenerator = require('./code_generator.js');
77

88
class Deploy {
99
constructor(options) {
@@ -81,11 +81,11 @@ class Deploy {
8181

8282
if (contract.onDeploy !== undefined) {
8383
self.logger.info('executing onDeploy commands');
84-
let abiGenerator = new ABIGenerator({contractsManager: self.contractsManager});
85-
let abi = abiGenerator.generateContracts(false);
84+
let codeGenerator = new CodeGenerator({contractsManager: self.contractsManager});
85+
let code = codeGenerator.generateContracts(false);
8686
let cmds = contract.onDeploy.join(';\n');
8787

88-
RunCode.doEval(abi + "\n" + cmds, self.web3);
88+
RunCode.doEval(code + "\n" + cmds, self.web3);
8989
}
9090

9191
callback();

lib/core/engine.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ let Events = require('./events.js');
44
let Logger = require('./logger.js');
55
let Config = require('./config.js');
66
let DeployManager = require('../contracts/deploy_manager.js');
7-
let ABIGenerator = require('../contracts/abi.js');
7+
let CodeGenerator = require('../contracts/code_generator.js');
88
let ServicesMonitor = require('./services_monitor.js');
99
let Pipeline = require('../pipeline/pipeline.js');
1010
let Server = require('../pipeline/server.js');
@@ -51,7 +51,7 @@ class Engine {
5151

5252
let services = {
5353
"pipeline": this.pipelineService,
54-
"abi": this.abiService,
54+
"codeGenerator": this.codeGeneratorService,
5555
"deployment": this.deploymentService,
5656
"fileWatcher": this.fileWatchService,
5757
"webServer": this.webServerService,
@@ -100,10 +100,10 @@ class Engine {
100100
//});
101101
}
102102

103-
abiService(options) {
103+
codeGeneratorService(options) {
104104
let self = this;
105-
let generateABICode = function (contractsManager) {
106-
let abiGenerator = new ABIGenerator({
105+
let generateCode = function (contractsManager) {
106+
let codeGenerator = new CodeGenerator({
107107
blockchainConfig: self.config.blockchainConfig,
108108
contractsConfig: self.config.contractsConfig,
109109
contractsManager: contractsManager,
@@ -112,12 +112,12 @@ class Engine {
112112
communicationConfig: self.config.communicationConfig,
113113
events: self.events
114114
});
115-
abiGenerator.listenToCommands();
115+
codeGenerator.listenToCommands();
116116

117117
self.events.emit('code-generator-ready');
118118
};
119-
this.events.on('contractsDeployed', generateABICode);
120-
this.events.on('blockchainDisabled', generateABICode);
119+
this.events.on('contractsDeployed', generateCode);
120+
this.events.on('blockchainDisabled', generateCode);
121121
}
122122

123123
deploymentService(options) {

lib/core/test.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ var Embark = require('../index.js');
55

66
var Engine = require('./engine.js');
77

8-
var ABIGenerator = require('../contracts/abi.js');
9-
var ContractsManager = require('../contracts/contracts.js');
108
var Deploy = require('../contracts/deploy.js');
119

1210
var Config = require('./config.js');

lib/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class Embark {
103103
engine.startMonitor();
104104
engine.startService("web3");
105105
engine.startService("pipeline");
106-
engine.startService("abi");
106+
engine.startService("codeGenerator");
107107
engine.startService("deployment");
108108
engine.startService("ipfs");
109109

@@ -158,7 +158,7 @@ class Embark {
158158

159159
engine.startService("web3");
160160
engine.startService("pipeline");
161-
engine.startService("abi");
161+
engine.startService("codeGenerator");
162162
engine.startService("deployment");
163163
callback();
164164
},

test/abi.js renamed to test/code_generator.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)