remove engine dependency; use api

This commit is contained in:
Iuri Matias 2018-07-30 14:33:01 -04:00
parent 3a15804fda
commit 77dd5b4944
2 changed files with 108 additions and 76 deletions

View File

@ -24,6 +24,10 @@ class ContractsManager {
cb(self.compileError, self.listContracts()); cb(self.compileError, self.listContracts());
}); });
self.events.setCommandHandler('contracts:dependencies', (cb) => {
cb(self.compileError, self.contractDependencies);
});
self.events.setCommandHandler("contracts:contract", (contractName, cb) => { self.events.setCommandHandler("contracts:contract", (contractName, cb) => {
cb(self.getContract(contractName)); cb(self.getContract(contractName));
}); });

View File

@ -1,3 +1,4 @@
const async = require('async');
const Viz = require('viz.js'); const Viz = require('viz.js');
const fs = require('fs'); const fs = require('fs');
@ -13,36 +14,52 @@ class GraphGenerator {
} }
generate(options) { generate(options) {
const self = this;
let id = 0; let id = 0;
let contractString = ""; let contractString = "";
let relationshipString = ""; let relationshipString = "";
let idMapping = {}; let idMapping = {};
let contractInheritance = {}; let contractInheritance = {};
let contracts = {};
let contractsDependencies = {};
for (let contract in this.engine.contractsManager.contracts) { async.waterfall([
if(options.skipUndeployed && !this.engine.contractsManager.contracts[contract].deploy) continue; function getContractList(next) {
self.events.request('contracts:list', (err, _contracts) => {
contracts = _contracts;
next();
});
},
function getContractsDependencies(next) {
self.events.request('contracts:dependencies', (err, _contractsDependencies) => {
contractsDependencies = _contractsDependencies;
next();
});
},
function (next) {
for (let contract of contracts) {
if (options.skipUndeployed && !contract.deploy) continue;
id++; id++;
idMapping[contract] = id; idMapping[contract.className] = id;
let contractLabel = ""; let contractLabel = "";
contractLabel += `${contract}`; contractLabel += `${contract.className}`;
let tooltip = contract; let tooltip = contract.className;
if(this.engine.contractsManager.contracts[contract].instanceOf !== undefined && if (contract.instanceOf !== undefined && contracts[contract.instanceOf] !== undefined) {
this.engine.contractsManager.contracts[this.engine.contractsManager.contracts[contract].instanceOf] !== undefined){ contractInheritance[contract.className] = contract.instanceOf;
contractInheritance[contract] = this.engine.contractsManager.contracts[contract].instanceOf; contractLabel += ": " + contract.instanceOf;
contractLabel += ": " + this.engine.contractsManager.contracts[contract].instanceOf; tooltip += " instance of " + contract.instanceOf;
tooltip += " instance of " + this.engine.contractsManager.contracts[contract].instanceOf;
} else { } else {
if(!(options.skipFunctions === true && options.skipEvents === true)) contractLabel += "|"; if (!(options.skipFunctions === true && options.skipEvents === true)) contractLabel += "|";
for(let i = 0; i < this.engine.contractsManager.contracts[contract].abiDefinition.length; i++){ for (let i = 0; i < contract.abiDefinition.length; i++) {
let abiDef = this.engine.contractsManager.contracts[contract].abiDefinition[i]; let abiDef = contract.abiDefinition[i];
if(abiDef.type == 'event' && options.skipEvents) continue; if (abiDef.type == 'event' && options.skipEvents) continue;
if(['constructor', 'fallback'].indexOf(abiDef.type) > -1 && options.skipFunctions) continue; if (['constructor', 'fallback'].indexOf(abiDef.type) > -1 && options.skipFunctions) continue;
switch(abiDef.type){ switch(abiDef.type){
case 'fallback': case 'fallback':
@ -66,41 +83,49 @@ class GraphGenerator {
} }
} }
let fHashes = this.engine.contractsManager.contracts[contract].functionHashes; let fHashes = contract.functionHashes;
if(fHashes != {} && fHashes != undefined && !options.skipFunctions){ if (fHashes != {} && fHashes != undefined && !options.skipFunctions){
for(let method in this.engine.contractsManager.contracts[contract].functionHashes){ for (let method in contract.functionHashes){
contractLabel += method + '\\l'; contractLabel += method + '\\l';
} }
} }
} }
let others = ''; let others = '';
if(!this.engine.contractsManager.contracts[contract].deploy){ if (!contract.deploy){
others = 'fontcolor="#c3c3c3", color="#a0a0a0"'; others = 'fontcolor="#c3c3c3", color="#a0a0a0"';
tooltip += " (not deployed)"; tooltip += " (not deployed)";
} }
contractString += `${id}[label = "{${contractLabel}}", tooltip="${tooltip}", fillcolor=gray95, ${others}]\n`; contractString += `${id}[label = "{${contractLabel}}", tooltip="${tooltip}", fillcolor=gray95, ${others}]\n`;
} }
next();
for (let c in this.engine.contractsManager.contractDependencies){ },
let contractDependencies = Array.from(new Set(this.engine.contractsManager.contractDependencies[c])); function (next) {
for (let c in contractsDependencies) {
let contractDependencies = Array.from(new Set(contractsDependencies[c]));
contractDependencies.forEach((d) => { contractDependencies.forEach((d) => {
if(idMapping[c] !== undefined && idMapping[d] !== undefined){ if (idMapping[c] !== undefined && idMapping[d] !== undefined) {
if((options.skipUndeployed && this.engine.contractsManager.contracts[c].deploy && this.engine.contractsManager.contracts[d].deploy) || !options.skipUndeployed){ if ((options.skipUndeployed && contracts[c].deploy && contracts[d].deploy) || !options.skipUndeployed) {
relationshipString += `${idMapping[d]}->${idMapping[c]}[constraint=true, arrowtail=diamond, tooltip="${c} uses ${d}"]\n`; relationshipString += `${idMapping[d]}->${idMapping[c]}[constraint=true, arrowtail=diamond, tooltip="${c} uses ${d}"]\n`;
} }
} }
}); });
} }
next();
},
function (next) {
for (let c in contractInheritance){ for (let c in contractInheritance){
if(options.skipUndeployed && !this.engine.contractsManager.contracts[contractInheritance[c]].deploy) continue; if(options.skipUndeployed && !contracts[contractInheritance[c]].deploy) continue;
relationshipString += `${idMapping[contractInheritance[c]]}->${idMapping[c]}[tooltip="${c} instance of ${contractInheritance[c]}"]\n`; relationshipString += `${idMapping[contractInheritance[c]]}->${idMapping[c]}[tooltip="${c} instance of ${contractInheritance[c]}"]\n`;
} }
console.log("-----");
console.log(relationshipString);
console.log("-----");
next();
},
function (next) {
let dot = ` let dot = `
digraph Contracts { digraph Contracts {
node[shape=record,style=filled] node[shape=record,style=filled]
@ -109,15 +134,18 @@ class GraphGenerator {
${relationshipString} ${relationshipString}
}`; }`;
console.log(dot);
let svg = Viz(dot); let svg = Viz(dot);
let filename = "diagram.svg"; let filename = "diagram.svg";
fs.writeFileSync(filename, svg, (err) => { fs.writeFileSync(filename, svg, (err) => {
if (err) throw err; if (err) throw err;
next();
});
}
], function(_err, _result) {
}); });
} }
} }