Merge pull request #346 from Thetta/dev2

dev2 -> dev
Thetta · Sep 28, 2018 · ef393f4 · ef393f4
2 parents 90e26c6 + ed54c59
commit ef393f4
Showing 1 changed file with 54 additions and 47 deletions.
diff --git a/scripts/migrateLibs.js b/scripts/migrateLibs.js
@@ -1,57 +1,64 @@
-function migrateLibs (artifacts, additionalContracts, deployer, network, accounts) {
-
-     return deployer.then(async () => {      
-          var UtilsLib = artifacts.require("./UtilsLib");
-          var GenericCallerLib = artifacts.require("./GenericCallerLib");
-          var VotingLib = artifacts.require("./VotingLib");
-          var DaoBaseLib = artifacts.require("./DaoBaseLib");
-
-          async function linkIfExist(contractName){
-               try {
-                    await deployer.link(UtilsLib, artifacts.require(contractName));
-                    await deployer.link(VotingLib, artifacts.require(contractName));
-                    await deployer.link(GenericCallerLib, artifacts.require(contractName));
-                    await deployer.link(DaoBaseLib, artifacts.require(contractName));
-               } catch(error) {}
+async function linkContractsWithLibrary(deployer, artifacts, lib, contractNames) {
+     for(let contractName of contractNames) {
+          try {
+               await deployer.link(lib, artifacts.require(contractName));
+          } catch(error) {
+               console.log('Not linked:', contractName);
           }
+     }  
+}
 
-          await deployer.deploy(UtilsLib);
-          await deployer.link(UtilsLib, VotingLib);
-          await deployer.deploy(VotingLib);
-          await deployer.link(VotingLib, GenericCallerLib);
-          await deployer.deploy(GenericCallerLib);
-          await deployer.deploy(DaoBaseLib);
+let thettaContracts = [ 
+  "./DaoBase",
+  "./DaoBaseAuto",
+  "./DaoBaseImpersonated",
+  "./DaoBaseMock",
+  "./DaoBaseWithUnpackers",
+  "./DaoBaseWithUnpackersMock", 
+  "./DaoStorage",
+  "./GenericCaller",
+  "./MoneyflowAuto",
+  "./StdDaoToken",
+  "./Voting",
+  "./VotingLib",
+  "./GenericCallerLib"
+]
 
-          contractsArr = [ "./DaoBaseImpersonated"
-                         , "./DaoBaseWithUnpackers"
-                         , "./GenericCaller"
-                         , "./VotingLib"
-                         , "./DaoBaseAuto"
-                         , "./DaoBaseWithUnpackersMock"
-                         , "./DaoBaseMock"
-                         , "./DaoStorage"
-                         , "./StdDaoToken"
-                         , "./Voting"
-                         , "./GenericCallerLib"
-                         , "./GenericCaller"
-                         , "./MoneyflowAuto"
-                         , "./DaoBaseAuto"
-                         , "./GenericCaller"
-                         , "./MoneyflowAuto"
-                         , "./DaoBaseAuto"
-                         , "./DaoBase"
-                         , "./DaoBaseWithUnpackers"
-                         , "./DaoBaseWithUnpackersMock"
-                         , "./DaoBaseMock"
-                         ]
+function migrateLibs (artifacts, additionalContracts, deployer, network, accounts) {
+     return deployer.then(async () => {    
+          let contractsArr = thettaContracts.concat(additionalContracts);
+
+          try {
+               let UtilsLib = artifacts.require("./UtilsLib");
+               await deployer.deploy(UtilsLib);
+               await linkContractsWithLibrary(deployer, artifacts, UtilsLib, contractsArr);
+          } catch(error) {
+               console.log('Thetta.UtilsLib is not deployed');
+          }
 
-          contractsArr = contractsArr.concat(additionalContracts);
+          try {
+               let VotingLib = artifacts.require("./VotingLib");
+               await deployer.deploy(VotingLib);
+               await linkContractsWithLibrary(deployer, artifacts, VotingLib, contractsArr);
+          } catch(error) {
+               console.log('Thetta.VotingLib is not deployed');
+          }
 
-          for(let contract of contractsArr){
-               await linkIfExist(contract);
+          try {
+               let GenericCallerLib = artifacts.require("./GenericCallerLib");
+               await deployer.deploy(GenericCallerLib);
+               await linkContractsWithLibrary(deployer, artifacts, GenericCallerLib, contractsArr);
+          } catch(error) {
+               console.log('Thetta.GenericCallerLib is not deployed');
           }
 
-
+          try {
+               let DaoBaseLib = artifacts.require("./DaoBaseLib");
+               await deployer.deploy(DaoBaseLib);
+               await linkContractsWithLibrary(deployer, artifacts, DaoBaseLib, contractsArr);
+          } catch(error) {
+               console.log('Thetta.DaoBaseLib is not deployed');
+          }          
      });
 };