refactor: Expose guild actions

planetarium · Dec 19, 2024 · 6ed6fcf · 6ed6fcf
1 parent 34d6d26
commit 6ed6fcf
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 31 deletions.
diff --git a/Lib9c/Action/Guild/BanGuildMember.cs b/Lib9c/Action/Guild/BanGuildMember.cs
@@ -9,8 +9,7 @@
 
 namespace Nekoyume.Action.Guild
 {
-    // TODO(GUILD-FEATURE): Enable again when Guild features are enabled.
-    // [ActionType(TypeIdentifier)]
+    [ActionType(TypeIdentifier)]
     public class BanGuildMember : ActionBase
     {
         public const string TypeIdentifier = "ban_guild_member";

diff --git a/Lib9c/Action/Guild/JoinGuild.cs b/Lib9c/Action/Guild/JoinGuild.cs
@@ -9,8 +9,7 @@
 
 namespace Nekoyume.Action.Guild
 {
-    // TODO(GUILD-FEATURE): Enable again when Guild features are enabled.
-    // [ActionType(TypeIdentifier)]
+    [ActionType(TypeIdentifier)]
     public class JoinGuild : ActionBase
     {
         public const string TypeIdentifier = "join_guild";

diff --git a/Lib9c/Action/Guild/MakeGuild.cs b/Lib9c/Action/Guild/MakeGuild.cs
@@ -6,7 +6,9 @@
 using Nekoyume.Extensions;
 using Nekoyume.Model.Guild;
 using Nekoyume.Module.Guild;
+using Nekoyume.Module.ValidatorDelegation;
 using Nekoyume.TypedAddress;
+using Nekoyume.ValidatorDelegation;
 
 namespace Nekoyume.Action.Guild
 {
@@ -44,32 +46,18 @@ rawValues is not Dictionary values ||
             ValidatorAddress = new Address(rawValidatorAddress);
         }
 
-        // TODO: Replace this with ExecutePublic when to deliver features to users.
         public override IWorld Execute(IActionContext context)
-        {
-            var world = ExecutePublic(context);
-
-            if (context.Signer != GuildConfig.PlanetariumGuildOwner)
-            {
-                throw new InvalidOperationException(
-                    $"This action is not allowed for {context.Signer}.");
-            }
-
-            return world;
-        }
-
-        public IWorld ExecutePublic(IActionContext context)
         {
             GasTracer.UseGas(1);
 
             var world = context.PreviousState;
             var random = context.GetRandom();
-
             var repository = new GuildRepository(world, context);
             var guildAddress = new GuildAddress(random.GenerateAddress());
             var validatorAddress = ValidatorAddress;
 
             repository.MakeGuild(guildAddress, validatorAddress);
+
             return repository.World;
         }
     }

diff --git a/Lib9c/Action/Guild/MoveGuild.cs b/Lib9c/Action/Guild/MoveGuild.cs
@@ -9,8 +9,7 @@
 
 namespace Nekoyume.Action.Guild
 {
-    // TODO(GUILD-FEATURE): Enable again when Guild features are enabled.
-    // [ActionType(TypeIdentifier)]
+    [ActionType(TypeIdentifier)]
     public class MoveGuild : ActionBase
     {
         public const string TypeIdentifier = "move_guild";

diff --git a/Lib9c/Action/Guild/QuitGuild.cs b/Lib9c/Action/Guild/QuitGuild.cs
@@ -8,8 +8,7 @@
 
 namespace Nekoyume.Action.Guild
 {
-    // TODO(GUILD-FEATURE): Enable again when Guild features are enabled.
-    // [ActionType(TypeIdentifier)]
+    [ActionType(TypeIdentifier)]
     public class QuitGuild : ActionBase
     {
         public const string TypeIdentifier = "quit_guild";
@@ -36,7 +35,6 @@ public override IWorld Execute(IActionContext context)
             var repository = new GuildRepository(world, context);
             var signer = context.GetAgentAddress();
 
-            // TODO: Do something to return 'Power' token;
             repository.LeaveGuild(signer);
 
             return repository.World;

diff --git a/Lib9c/Action/Guild/RemoveGuild.cs b/Lib9c/Action/Guild/RemoveGuild.cs
@@ -11,8 +11,7 @@ namespace Nekoyume.Action.Guild
     /// <summary>
     /// An action to remove the guild.
     /// </summary>
-    // TODO(GUILD-FEATURE): Enable again when Guild features are enabled.
-    // [ActionType(TypeIdentifier)]
+    [ActionType(TypeIdentifier)]
     public class RemoveGuild : ActionBase
     {
         public const string TypeIdentifier = "remove_guild";
@@ -38,7 +37,6 @@ public override IWorld Execute(IActionContext context)
             var world = context.PreviousState;
             var repository = new GuildRepository(world, context);
 
-            // TODO: Do something to return 'Power' token;
             repository.RemoveGuild();
             return repository.World;
         }

diff --git a/Lib9c/Action/Guild/UnbanGuildMember.cs b/Lib9c/Action/Guild/UnbanGuildMember.cs
@@ -10,8 +10,7 @@
 
 namespace Nekoyume.Action.Guild
 {
-    // TODO(GUILD-FEATURE): Enable again when Guild features are enabled.
-    // [ActionType(TypeIdentifier)]
+    [ActionType(TypeIdentifier)]
     public class UnbanGuildMember : ActionBase
     {
         public const string TypeIdentifier = "unban_guild_member";

diff --git a/Lib9c/Model/Guild/GuildRejoinCooldown.cs b/Lib9c/Model/Guild/GuildRejoinCooldown.cs
@@ -16,7 +16,7 @@ public GuildRejoinCooldown(AgentAddress agentAddress, long quitHeight)
         }
 
         public GuildRejoinCooldown(AgentAddress agentAddress, IValue bencoded)
-            : this(agentAddress, ((Integer)bencoded))
+            : this(agentAddress, (Integer)bencoded)
         {
         }
 
@@ -40,7 +40,7 @@ public long Cooldown(long currentHeight)
         }
 
         public bool Equals(GuildRejoinCooldown? other)
-        { 
+        {
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
             return AgentAddress.Equals(other.AgentAddress)