#335: migrations

Thetta · Sep 24, 2018 · f6442f9 · f6442f9
1 parent 70530fa
commit f6442f9
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 84 deletions.
diff --git a/contracts/DaoBase.sol b/contracts/DaoBase.sol
@@ -128,7 +128,7 @@ contract DaoBase is IDaoBase, Ownable {
 	*/
 	function addGroupMember(string _groupName, address _a) public isCanDoOrByOwner(MANAGE_GROUPS) {
 		emit DaoBaseAddGroupMember(_groupName, _a);	
-		require (_groupName.length>0);	
+		require(bytes(_groupName).length>0);	
 		daoStorage.addGroupMember(stringHash(_groupName), _a);
 	}
 

diff --git a/migrations/2_deploy_contracts_libraries.js b/migrations/2_deploy_contracts_libraries.js
@@ -0,0 +1,5 @@
+var migrateLibs = require('../scripts/migrateLibs');
+
+module.exports = function (deployer, network, accounts) {
+	return migrateLibs(artifacts, deployer, network, accounts);
+};
diff --git a/migrations/2_deploy_contracts_utilsLib.js b/migrations/2_deploy_contracts_utilsLib.js
diff --git a/migrations/3_deploy_contracts_votingLib.js b/migrations/3_deploy_contracts_votingLib.js
diff --git a/migrations/4_deploy_contracts_genericCallerLib.js b/migrations/4_deploy_contracts_genericCallerLib.js
diff --git a/migrations/5_deploy_contracts_daoLib.js b/migrations/5_deploy_contracts_daoLib.js
diff --git a/scripts/migrateLibs.js b/scripts/migrateLibs.js
@@ -0,0 +1,29 @@
+function migrateLibs (artifacts, deployer, network, accounts) {
+	var UtilsLib = artifacts.require("./UtilsLib");
+	var DaoBase = artifacts.require("./DaoBase");
+	var DaoBaseImpersonated = artifacts.require("./DaoBaseImpersonated");
+	var DaoBaseWithUnpackers = artifacts.require("./DaoBaseWithUnpackers");
+	var GenericCaller = artifacts.require("./GenericCaller");
+	var GenericCallerLib = artifacts.require("./GenericCallerLib");
+	var MoneyflowAuto = artifacts.require("./MoneyflowAuto");
+	var Voting = artifacts.require("./Voting");
+	var VotingLib = artifacts.require("./VotingLib");
+	var DaoBaseAuto = artifacts.require("./DaoBaseAuto");
+	var DaoBaseWithUnpackersMock = artifacts.require("./DaoBaseWithUnpackersMock");
+	var DaoStorage = artifacts.require("./DaoStorage");
+	var DaoBaseMock = artifacts.require("./DaoBaseMock");
+	var StdDaoToken = artifacts.require("./StdDaoToken");
+	var DaoBaseLib = artifacts.require("./DaoBaseLib");
+
+	return deployer
+		.then(() => deployer.deploy(UtilsLib))
+		.then(() => deployer.link(UtilsLib, [DaoBaseImpersonated, DaoBaseWithUnpackers, GenericCaller, VotingLib, DaoBaseAuto, DaoBaseWithUnpackersMock, DaoBaseMock, DaoStorage, StdDaoToken]))	
+		.then(() => deployer.deploy(VotingLib))
+		.then(() => deployer.link(VotingLib, [GenericCaller, GenericCallerLib, MoneyflowAuto, DaoBaseAuto]))
+		.then(() => deployer.deploy(GenericCallerLib))
+		.then(() => deployer.link(GenericCallerLib, [GenericCaller, MoneyflowAuto, DaoBaseAuto]))
+		.then(() => deployer.deploy(DaoBaseLib))
+		.then(() => deployer.link(DaoBaseLib, [DaoBase, DaoBaseWithUnpackers, DaoBaseWithUnpackersMock, DaoBaseMock]))
+};
+
+module.exports = migrateLibs