Refactor DPoS actions

.Lib9c.Tests/Action/DPoS/Control/RedelegateCtrlTest.cs

@@ -9,6 +9,7 @@ namespace Lib9c.Tests.Action.DPoS.Control
     using Nekoyume.Action.DPoS.Exception;
     using Nekoyume.Action.DPoS.Misc;
     using Nekoyume.Action.DPoS.Model;
+    using Nekoyume.Action.DPoS.Util;
     using Nekoyume.Module;
     using Xunit;
 

Lib9c/Action/DPoS/Sys/CancelUndelegation.cs → Lib9c/Action/DPoS/CancelUndelegation.cs

@@ -7,9 +7,10 @@
 using Nekoyume.Action.DPoS.Control;
 using Nekoyume.Action.DPoS.Misc;
 using Nekoyume.Action.DPoS.Model;
+using Nekoyume.Action.DPoS.Sys;
 using Nekoyume.Action.DPoS.Util;
 
-namespace Nekoyume.Action.DPoS.Sys
+namespace Nekoyume.Action.DPoS
 {
     /// <summary>
     /// A system action for DPoS that cancel <see cref="Undelegate"/> specified

Lib9c/Action/DPoS/Control/Bond.cs

@@ -6,6 +6,7 @@
 using Nekoyume.Action.DPoS.Exception;
 using Nekoyume.Action.DPoS.Misc;
 using Nekoyume.Action.DPoS.Model;
+using Nekoyume.Action.DPoS.Util;
 using Nekoyume.Module;
 
 namespace Nekoyume.Action.DPoS.Control

Lib9c/Action/DPoS/Control/DelegateCtrl.cs

@@ -7,6 +7,7 @@
 using Nekoyume.Action.DPoS.Exception;
 using Nekoyume.Action.DPoS.Misc;
 using Nekoyume.Action.DPoS.Model;
+using Nekoyume.Action.DPoS.Util;
 using Nekoyume.Module;
 
 namespace Nekoyume.Action.DPoS.Control

Lib9c/Action/DPoS/Control/RedelegateCtrl.cs

@@ -9,6 +9,7 @@
 using Nekoyume.Action.DPoS.Exception;
 using Nekoyume.Action.DPoS.Misc;
 using Nekoyume.Action.DPoS.Model;
+using Nekoyume.Action.DPoS.Util;
 using Nekoyume.Module;
 
 namespace Nekoyume.Action.DPoS.Control

Lib9c/Action/DPoS/Control/UnbondingSetCtrl.cs

@@ -4,6 +4,7 @@
 using Libplanet.Crypto;
 using Nekoyume.Action.DPoS.Misc;
 using Nekoyume.Action.DPoS.Model;
+using Nekoyume.Action.DPoS.Util;
 
 namespace Nekoyume.Action.DPoS.Control
 {

Lib9c/Action/DPoS/Control/UndelegateCtrl.cs

@@ -9,6 +9,7 @@
 using Nekoyume.Action.DPoS.Exception;
 using Nekoyume.Action.DPoS.Misc;
 using Nekoyume.Action.DPoS.Model;
+using Nekoyume.Action.DPoS.Util;
 using Nekoyume.Module;
 
 namespace Nekoyume.Action.DPoS.Control

Lib9c/Action/DPoS/Control/ValidatorCtrl.cs

@@ -7,6 +7,7 @@
 using Nekoyume.Action.DPoS.Exception;
 using Nekoyume.Action.DPoS.Misc;
 using Nekoyume.Action.DPoS.Model;
+using Nekoyume.Action.DPoS.Util;
 using Nekoyume.Module;
 
 namespace Nekoyume.Action.DPoS.Control

Lib9c/Action/DPoS/Control/ValidatorDelegationSetCtrl.cs

@@ -1,7 +1,9 @@
 #nullable enable
 using Libplanet.Action.State;
 using Libplanet.Crypto;
+using Nekoyume.Action.DPoS.Misc;
 using Nekoyume.Action.DPoS.Model;
+using Nekoyume.Action.DPoS.Util;
 
 namespace Nekoyume.Action.DPoS.Control
 {

Lib9c/Action/DPoS/Control/ValidatorPowerIndexCtrl.cs

@@ -6,6 +6,7 @@
 using Nekoyume.Action.DPoS.Exception;
 using Nekoyume.Action.DPoS.Misc;
 using Nekoyume.Action.DPoS.Model;
+using Nekoyume.Action.DPoS.Util;
 using Nekoyume.Module;
 
 namespace Nekoyume.Action.DPoS.Control

Lib9c/Action/DPoS/Control/ValidatorRewardsCtrl.cs

@@ -4,7 +4,9 @@
 using Libplanet.Action.State;
 using Libplanet.Crypto;
 using Libplanet.Types.Assets;
+using Nekoyume.Action.DPoS.Misc;
 using Nekoyume.Action.DPoS.Model;
+using Nekoyume.Action.DPoS.Util;
 
 namespace Nekoyume.Action.DPoS.Control
 {

Lib9c/Action/DPoS/Control/ValidatorSetCtrl.cs

@@ -6,6 +6,7 @@
 using Nekoyume.Action.DPoS.Exception;
 using Nekoyume.Action.DPoS.Misc;
 using Nekoyume.Action.DPoS.Model;
+using Nekoyume.Action.DPoS.Util;
 using Nekoyume.Module;
 
 namespace Nekoyume.Action.DPoS.Control

Lib9c/Action/DPoS/Sys/Delegate.cs → Lib9c/Action/DPoS/Delegate.cs

@@ -8,7 +8,7 @@
 using Nekoyume.Action.DPoS.Misc;
 using Nekoyume.Action.DPoS.Util;
 
-namespace Nekoyume.Action.DPoS.Sys
+namespace Nekoyume.Action.DPoS
 {
     /// <summary>
     /// A system action for DPoS that <see cref="Delegate"/> specified <see cref="Amount"/>

Lib9c/Action/DPoS/Sys/PromoteValidator.cs → Lib9c/Action/DPoS/PromoteValidator.cs

@@ -9,7 +9,7 @@
 using Nekoyume.Action.DPoS.Misc;
 using Nekoyume.Action.DPoS.Util;
 
-namespace Nekoyume.Action.DPoS.Sys
+namespace Nekoyume.Action.DPoS
 {
     /// <summary>
     /// A system action for DPoS that promotes non-validator node to a validator.

Lib9c/Action/DPoS/Sys/Redelegate.cs → Lib9c/Action/DPoS/Redelegate.cs

@@ -8,7 +8,7 @@
 using Nekoyume.Action.DPoS.Misc;
 using Nekoyume.Action.DPoS.Util;
 
-namespace Nekoyume.Action.DPoS.Sys
+namespace Nekoyume.Action.DPoS
 {
     /// <summary>
     /// A system action for DPoS that <see cref="Redelegate"/> specified <see cref="ShareAmount"/>

Lib9c/Action/DPoS/DPoSBeginBlockAction.cs → Lib9c/Action/DPoS/Sys/AllocateReward.cs

@@ -2,22 +2,20 @@
 using Bencodex.Types;
 using Libplanet.Action;
 using Libplanet.Action.State;
-using Nekoyume.Action.DPoS.Control;
 using Nekoyume.Action.DPoS.Misc;
-using Nekoyume.Action.DPoS.Model;
-using Nekoyume.Module;
 
-namespace Nekoyume.Action.DPoS
+namespace Nekoyume.Action.DPoS.Sys
 {
     /// <summary>
-    /// A BeginBlock action for DPoS that updates <see cref="ValidatorSet"/>.
+    /// An action for allocate reward to validators and delegators in previous block.
+    /// Should be executed at the beginning of the block.
     /// </summary>
-    public sealed class DPoSBeginBlockAction : ActionBase
+    public sealed class AllocateReward : ActionBase
     {
         /// <summary>
-        /// Creates a new instance of <see cref="DPoSBeginBlockAction"/>.
+        /// Creates a new instance of <see cref="AllocateReward"/>.
         /// </summary>
-        public DPoSBeginBlockAction()
+        public AllocateReward()
         {
         }
 
@@ -34,11 +32,9 @@ public override void LoadPlainValue(IValue plainValue)
         public override IWorld Execute(IActionContext context)
         {
             var states = context.PreviousState;
-
-            // Allocate reward
             var nativeTokens = ImmutableHashSet.Create(
                 Asset.GovernanceToken, Asset.ConsensusToken, Asset.Share);
-            states = AllocateReward.Execute(
+            states = Control.AllocateReward.Execute(
                 states,
                 context,
                 nativeTokens,

Lib9c/Action/DPoS/DPoSEndBlockAction.cs → Lib9c/Action/DPoS/Sys/UpdateValidators.cs

@@ -1,23 +1,22 @@
-using System.Collections.Immutable;
 using Bencodex.Types;
 using Libplanet.Action;
 using Libplanet.Action.State;
 using Nekoyume.Action.DPoS.Control;
-using Nekoyume.Action.DPoS.Misc;
 using Nekoyume.Action.DPoS.Model;
 using Nekoyume.Module;
 
-namespace Nekoyume.Action.DPoS
+namespace Nekoyume.Action.DPoS.Sys
 {
     /// <summary>
-    /// A EndBlock action for DPoS that updates <see cref="ValidatorSet"/>.
+    /// An action for update validators.
+    /// Should be executed at the end of the block.
     /// </summary>
-    public sealed class DPoSEndBlockAction : ActionBase
+    public sealed class UpdateValidators : ActionBase
     {
         /// <summary>
-        /// Creates a new instance of <see cref="DPoSBeginBlockAction"/>.
+        /// Creates a new instance of <see cref="AllocateReward"/>.
         /// </summary>
-        public DPoSEndBlockAction()
+        public UpdateValidators()
         {
         }
 
@@ -34,8 +33,6 @@ public override void LoadPlainValue(IValue plainValue)
         public override IWorld Execute(IActionContext context)
         {
             var states = context.PreviousState;
-
-            // Update ValidatorSet
             states = ValidatorSetCtrl.Update(states, context);
             ValidatorSet bondedSet;
             (states, bondedSet) = ValidatorSetCtrl.FetchBondedValidatorSet(states);

Lib9c/Action/DPoS/Sys/Undelegate.cs → Lib9c/Action/DPoS/Undelegate.cs

@@ -8,7 +8,7 @@
 using Nekoyume.Action.DPoS.Misc;
 using Nekoyume.Action.DPoS.Util;
 
-namespace Nekoyume.Action.DPoS.Sys
+namespace Nekoyume.Action.DPoS
 {
     /// <summary>
     /// A system action for DPoS that cancels <see cref="Delegate"/> specified

Lib9c/Action/DPoS/DPoSModule.cs → Lib9c/Action/DPoS/Util/DPoSModule.cs

@@ -4,7 +4,7 @@
 using Libplanet.Crypto;
 using Nekoyume.Action.DPoS.Misc;
 
-namespace Nekoyume.Action.DPoS
+namespace Nekoyume.Action.DPoS.Util
 {
     public static class DPoSModule
     {

Lib9c/Action/DPoS/Sys/WithdrawDelegator.cs → Lib9c/Action/DPoS/WithdrawDelegator.cs

@@ -10,7 +10,7 @@
 using Nekoyume.Action.DPoS.Util;
 using Nekoyume.Module;
 
-namespace Nekoyume.Action.DPoS.Sys
+namespace Nekoyume.Action.DPoS
 {
     /// <summary>
     /// A system action for DPoS that withdraws reward tokens from given <see cref="Validator"/>.

Lib9c/Action/DPoS/Sys/WithdrawValidator.cs → Lib9c/Action/DPoS/WithdrawValidator.cs

@@ -8,7 +8,7 @@
 using Nekoyume.Action.DPoS.Model;
 using Nekoyume.Module;
 
-namespace Nekoyume.Action.DPoS.Sys
+namespace Nekoyume.Action.DPoS
 {
     /// <summary>
     /// A system action for DPoS that withdraws commission tokens from <see cref="Validator"/>.