chore: adapt js

Signed-off-by: Norman <[email protected]>
TERITORI · Dec 29, 2024 · 64f288e · 64f288e
1 parent e247761
commit 64f288e
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 41 deletions.
diff --git a/networks.json b/networks.json
@@ -4522,8 +4522,7 @@
     "modboardsPkgPath": "gno.land/r/teritori/modboards",
     "groupsPkgPath": "gno.land/r/teritori/groups",
     "votingGroupPkgPath": "gno.land/p/teritori/dao_voting_group",
-    "rolesVotingGroupPkgPath": "gno.land/p/teritori/dao_voting_roles",
-    "rolesGroupPkgPath": "gno.land/p/teritori/dao_roles_group",
+    "votingRolesPkgPath": "gno.land/p/teritori/dao_voting_roles",
     "daoProposalSinglePkgPath": "gno.land/p/teritori/dao_proposal_single",
     "profilePkgPath": "gno.land/r/demo/profile",
     "daoInterfacesPkgPath": "gno.land/p/teritori/dao_interfaces",

diff --git a/packages/networks/gno-dev/index.ts b/packages/networks/gno-dev/index.ts
@@ -45,8 +45,7 @@ export const gnoDevNetwork: GnoNetworkInfo = {
   modboardsPkgPath: "gno.land/r/teritori/modboards",
   groupsPkgPath: "gno.land/r/teritori/groups",
   votingGroupPkgPath: "gno.land/p/teritori/dao_voting_group",
-  rolesVotingGroupPkgPath: "gno.land/p/teritori/dao_voting_roles",
-  rolesGroupPkgPath: "gno.land/p/teritori/dao_roles_group",
+  votingRolesPkgPath: "gno.land/p/teritori/dao_voting_roles",
   daoProposalSinglePkgPath: "gno.land/p/teritori/dao_proposal_single",
   profilePkgPath: "gno.land/r/demo/profile",
   daoInterfacesPkgPath: "gno.land/p/teritori/dao_interfaces",

diff --git a/packages/networks/types.ts b/packages/networks/types.ts
@@ -114,8 +114,7 @@ export type GnoNetworkInfo = NetworkInfoBase & {
   socialFeedsPkgPath?: string;
   socialFeedsDAOPkgPath?: string;
   votingGroupPkgPath?: string;
-  rolesVotingGroupPkgPath?: string;
-  rolesGroupPkgPath?: string;
+  votingRolesPkgPath?: string;
   daoProposalSinglePkgPath?: string;
   daoInterfacesPkgPath?: string;
   daoCorePkgPath?: string;

diff --git a/packages/utils/gnodao/generateMembershipDAOSource.ts b/packages/utils/gnodao/generateMembershipDAOSource.ts
@@ -25,20 +25,20 @@ export const generateMembershipDAOSource = (
   
   var (
     daoCore    dao_interfaces.IDAOCore
-    group      *voting_group.VotingGroup
+    voting      *voting_group.VotingGroup
     registered bool
   )
 
   func init() {
     votingModuleFactory := func(core dao_interfaces.IDAOCore) dao_interfaces.IVotingModule {
-      group = voting_group.NewVotingGroup()
+      voting = voting_group.NewVotingGroup()
         ${conf.initialMembers
           .map(
             (member) =>
-              `group.SetMemberPower("${member.address}", ${member.weight})`,
+              `voting.SetMemberPower("${member.address}", ${member.weight})`,
           )
           .join("\n\t")}
-      return group
+      return voting
     }
 
     // TODO: consider using factories that return multiple modules and handlers
@@ -63,7 +63,7 @@ export const generateMembershipDAOSource = (
     
     messageHandlersFactories := []dao_interfaces.MessageHandlerFactory{
       func(core dao_interfaces.IDAOCore) dao_interfaces.MessageHandler {
-        return group.UpdateMembersHandler()
+        return voting.UpdateMembersHandler()
       },
       func(core dao_interfaces.IDAOCore) dao_interfaces.MessageHandler {
         // TODO: add a router to support multiple proposal modules

diff --git a/packages/utils/gnodao/generateRolesDAOSource.ts b/packages/utils/gnodao/generateRolesDAOSource.ts
@@ -15,54 +15,50 @@ export const generateRolesDAOSource = (
     dao_core "${network.daoCorePkgPath}"
     dao_interfaces "${network.daoInterfacesPkgPath}"
     proposal_single "${network.daoProposalSinglePkgPath}"
-    "${network.rolesGroupPkgPath}"
     "${network.daoUtilsPkgPath}"
     "gno.land/p/teritori/jsonutil"
     "${network.profilePkgPath}"
-    voting_group "${network.rolesVotingGroupPkgPath}"
+    voting_roles "${network.votingRolesPkgPath}"
     "${network.daoRegistryPkgPath}"
     "${network.socialFeedsPkgPath}"
     "gno.land/p/demo/json"
   )
   
 var (
 	daoCore    dao_interfaces.IDAOCore
-	group      *voting_group.RolesVotingGroup
-  roles      *dao_roles_group.RolesGroup
+  voting      *voting_roles.VotingRoles
 	registered bool
 )
 
 func init() {
-  roles = dao_roles_group.NewRolesGroup()
-  ${(conf.roles ?? [])
-    .map(
-      (role) =>
-        `roles.NewRoleJSON("${role.name}", "[${(role.resources ?? [])
-          .map(
-            (resource) =>
-              `{\\"resource\\": \\"${resource}\\", \\"power\\": \\"999\\"}`,
-          )
-          .join(", ")}]")`,
-    )
-    .join("\n\t")}
-  ${conf.initialMembers
-    .filter((member) => member.roles.length > 0)
-    .map((member) =>
-      member.roles
-        .map((role) => `roles.GrantRole("${member.address}", "${role}")`)
-        .join("\n\t"),
-    )
-    .join("\n\t")}
-
 	votingModuleFactory := func(core dao_interfaces.IDAOCore) dao_interfaces.IVotingModule {
-		group = voting_group.NewRolesVotingGroup(roles)
+    voting = voting_roles.NewVotingRoles()
+    ${(conf.roles ?? [])
+      .map(
+        (role) =>
+          `voting.NewRoleJSON("${role.name}", "[${(role.resources ?? [])
+            .map(
+              (resource) =>
+                `{\\"resource\\": \\"${resource}\\", \\"power\\": \\"999\\"}`,
+            )
+            .join(", ")}]")`,
+      )
+      .join("\n\t")}
+    ${conf.initialMembers
+      .filter((member) => member.roles.length > 0)
+      .map((member) =>
+        member.roles
+          .map((role) => `voting.GrantRole("${member.address}", "${role}")`)
+          .join("\n\t"),
+      )
+      .join("\n\t")}
       ${conf.initialMembers
         .map(
           (member) =>
-            `group.SetMemberPower("${member.address}", ${member.weight})`,
+            `voting.SetMemberPower("${member.address}", ${member.weight})`,
         )
         .join("\n\t")}
-		return group
+		return voting
 	}
 
 
@@ -88,7 +84,7 @@ func init() {
   
 	messageHandlersFactories := []dao_interfaces.MessageHandlerFactory{
 		func(core dao_interfaces.IDAOCore) dao_interfaces.MessageHandler {
-			return group.UpdateMembersHandler()
+			return voting.UpdateMembersHandler()
 		},
 		func(core dao_interfaces.IDAOCore) dao_interfaces.MessageHandler {
 			// TODO: add a router to support multiple proposal modules
@@ -167,7 +163,7 @@ func init() {
     for i, val := range vals {
       obj := val.MustObject()
       addr := jsonutil.MustAddress(obj["address"])
-      roles := roles.GetMemberRoles(addr)
+      roles := voting.GetMemberRoles(addr)
       rolesJSON := make([]*json.Node, len(roles))
       for j, role := range roles {
         rolesJSON[j] = json.StringNode("", role)