update tests; fix test module

Author: iurimatias

lib/contracts/code_generator.js

@@ -27,7 +27,7 @@ class CodeGenerator {
     });
 
     this.events.setCommandHandler('abi-contracts-vanila', function(cb) {
-      let vanillaContractsABI = self.generateContracts(false, true);
+      let vanillaContractsABI = self.generateContracts(false, true, false);
       let contractsJSON = self.generateContractsJSON();
 
       cb(vanillaContractsABI, contractsJSON);
@@ -168,11 +168,24 @@ result += "\n";
     return result;
   }
 
-  generateContracts(useEmbarkJS, isDeployment) {
+  generateContracts(useEmbarkJS, isDeployment, useLoader) {
     let self = this;
     let result = "\n";
     let contractsPlugins;
 
+    if (useLoader === false) {
+      let result;
+
+      for (let className in this.contractsManager.contracts) {
+        let contract = this.contractsManager.contracts[className];
+        let abi = JSON.stringify(contract.abiDefinition);
+        result += "\n" + className + "Abi = " + abi + ";";
+        result += "\n" + className + "Contract = web3.eth.contract(" + className + "Abi);";
+        result += "\n" + className + " = " + className + "Contract.at('" + contract.deployedAddress + "');";
+      }
+      return result;
+    }
+
     let mainContext = "";
     if (isDeployment) {
       mainContext = "__mainContext.";
@@ -287,7 +300,7 @@ result += "\n";
     let result = "";
 
     result += this.generateProvider(options.deployment);
-    result += this.generateContracts(options.useEmbarkJS, options.deployment);
+    result += this.generateContracts(options.useEmbarkJS, options.deployment, true);
     result += this.generateStorageInitialization(options.useEmbarkJS);
     result += this.generateCommunicationInitialization(options.useEmbarkJS);
 

lib/contracts/contracts.js

@@ -12,7 +12,11 @@ class ContractsManager {
     this.contracts = {};
     this.logger = options.logger;
     this.plugins = options.plugins;
-    this.solcVersion = options.contractsConfig.versions.solc;
+    if (!options.contractsConfig.versions) {
+      this.solcVersion = "0.4.11";
+    } else {
+      this.solcVersion = options.contractsConfig.versions.solc;
+    }
 
     this.contractDependencies = {};
   }

lib/contracts/deploy.js

@@ -82,7 +82,7 @@ class Deploy {
         if (contract.onDeploy !== undefined) {
           self.logger.info('executing onDeploy commands');
           let codeGenerator = new CodeGenerator({contractsManager: self.contractsManager});
-          let code = codeGenerator.generateContracts(false, true);
+          let code = codeGenerator.generateContracts(false, true, true);
           let cmds = contract.onDeploy.join(';\n');
 
           RunCode.doEval(code + "\n" + cmds, self.web3);

lib/core/config.js

@@ -257,7 +257,7 @@ Config.prototype.loadFiles = function(files) {
           //readFiles.push(new File({filename: 'web3-' + web3Version + '.js', type: 'custom', resolver: function(callback) {
           readFiles.push(new File({filename: 'web3.js', type: 'custom', resolver: function(callback) {
             if (web3Version === "1.0.0-beta") {
-              callback(fs.readFileSync(fs.embarkPath('js/web3-1.0.min.js')).toString());
+              return callback(fs.readFileSync(fs.embarkPath('js/web3-1.0.min.js')).toString());
             } else {
               let npm = new Npm({logger: self.logger});
               npm.getPackageVersion('web3', web3Version, 'dist/web3.min.js', true, function(web3Content) {

lib/core/events.js

@@ -7,25 +7,36 @@ function warnIfLegacy(eventName) {
   }
 }
 
+function log(eventType, eventName) {
+  if (['end', 'prefinish', 'error', 'new', 'demo', 'block', 'version'].indexOf(eventName) >= 0) {
+    return;
+  }
+  //console.log(eventType, eventName);
+}
+
 const _on         = EventEmitter.prototype.on;
 const _setHandler = EventEmitter.prototype.setHandler;
 
 EventEmitter.prototype.on = function(requestName, cb) {
+  log("listening to event: ", requestName);
   warnIfLegacy(requestName);
   return _on.call(this, requestName, cb);
 };
 
 EventEmitter.prototype.setHandler = function(requestName, cb) {
+  log("setting handler for: ", requestName);
   warnIfLegacy(requestName);
   return _setHandler.call(this, requestName, cb);
 };
 
 EventEmitter.prototype.request = function(requestName, cb) {
+  log("requesting: ", requestName);
   warnIfLegacy(requestName);
   return this.emit('request:' + requestName, cb);
 };
 
 EventEmitter.prototype.setCommandHandler = function(requestName, cb) {
+  log("setting command handler for: ", requestName);
   return this.on('request:' + requestName, function(_cb) {
     cb.call(this, _cb);
   });

lib/core/test.js

@@ -11,6 +11,7 @@ var Config = require('./config.js');
 var RunCode = require('./runCode.js');
 var TestLogger = require('./test_logger.js');
 var web3;
+var __mainContext;
 
 var getSimulator = function() {
   try {
@@ -62,18 +63,33 @@ Test.prototype.deployAll = function(contractsConfig, cb) {
       },
       function startServices(callback) {
         //{abiType: 'contracts', embarkJS: false}
-        self.engine.startService("abi");
+        self.engine.startService("codeGenerator");
         self.engine.startService("deployment", {
           web3: self.web3,
           trackContracts: false
         });
         callback();
       },
       function deploy(callback) {
-        self.engine.events.setHandler('abi-contracts-vanila', function(vanillaABI) {
-          callback(null, vanillaABI);
+        //self.engine.events.setHandler('abi-contracts-vanila', function(vanillaABI) {
+        //elf.engine.events.on('abi-contracts-vanila', function(vanillaABI) {
+        self.engine.events.on('code-generator-ready', function () {
+          self.engine.events.request('abi-contracts-vanila', function(vanillaABI) {
+            console.log("got abi-contracts-vanila request");
+            callback(null, vanillaABI);
+          });
+          //self.engine.events.on('abi-contracts-vanila', function(vanillaABI) {
+          //  console.log("got abi-contracts-vanila");
+          //  callback(null, vanillaABI);
+          //});
+          //self.engine.events.request('abi', function(vanillaABI) {
+          //  console.log("got abi");
+          //  callback(null, vanillaABI);
+          //});
         });
+
         self.engine.deployManager.deployContracts(function(err, result) {
+          console.log("deployed contracts");
           if (err) {
             console.log(err);
             callback(err);