rebase fixes
This commit is contained in:
parent
7532562e28
commit
5c5715d480
|
@ -1,4 +1,3 @@
|
|||
/*global web3*/
|
||||
let toposort = require('toposort');
|
||||
let async = require('async');
|
||||
const cloneDeep = require('clone-deep');
|
||||
|
@ -405,43 +404,6 @@ class ContractsManager {
|
|||
}
|
||||
}
|
||||
callback();
|
||||
},
|
||||
function setDependencyCount(callback) {
|
||||
let className;
|
||||
|
||||
function getDependencyCount(contractName, cycleDetector) {
|
||||
if (!self.contracts[contractName]) {
|
||||
return 0;
|
||||
}
|
||||
if (self.contracts[contractName].dependencyCount || self.contracts[contractName].dependencyCount === 0) {
|
||||
// Already have that count
|
||||
return self.contracts[contractName].dependencyCount;
|
||||
}
|
||||
if (!self.contractDependencies[contractName] || !self.contractDependencies[contractName].length) {
|
||||
self.contracts[contractName].dependencyCount = 0;
|
||||
return 0;
|
||||
}
|
||||
let total = self.contractDependencies[contractName].length;
|
||||
self.contractDependencies[contractName].some(dependencyName => {
|
||||
if (cycleDetector.indexOf(dependencyName) > -1) {
|
||||
// We are in a cycle because of the dependency, set both to Infinity
|
||||
self.contracts[dependencyName].dependencyCount = Infinity;
|
||||
total = Infinity;
|
||||
return true;
|
||||
}
|
||||
cycleDetector.push(dependencyName);
|
||||
total += getDependencyCount(dependencyName, cycleDetector);
|
||||
});
|
||||
self.contracts[contractName].dependencyCount = total;
|
||||
return total;
|
||||
}
|
||||
|
||||
let cycleDetector;
|
||||
for (className in self.contracts) {
|
||||
cycleDetector = [];
|
||||
getDependencyCount(className, cycleDetector);
|
||||
}
|
||||
callback();
|
||||
}
|
||||
], function (err) {
|
||||
if (err) {
|
||||
|
|
Loading…
Reference in New Issue