update ClaimStakeRewardFactory

boscohyun · Aug 22, 2023 · 06d47b8 · 06d47b8
1 parent 838f0f8
commit 06d47b8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.Lib9c.Tests/Action/Factory/ClaimStakeRewardFactoryTest.cs b/.Lib9c.Tests/Action/Factory/ClaimStakeRewardFactoryTest.cs
@@ -49,7 +49,9 @@ public static IEnumerable<object[]> GetAllClaimStakeRewardV1()
         [InlineData(ClaimStakeReward4.ObsoleteBlockIndex + 1, typeof(ClaimStakeReward5))]
         [InlineData(ClaimStakeReward5.ObsoleteBlockIndex, typeof(ClaimStakeReward5))]
         [InlineData(ClaimStakeReward5.ObsoleteBlockIndex + 1, typeof(ClaimStakeReward6))]
-        [InlineData(long.MaxValue, typeof(ClaimStakeReward6))]
+        [InlineData(ClaimStakeReward6.ObsoleteBlockIndex, typeof(ClaimStakeReward6))]
+        [InlineData(ClaimStakeReward6.ObsoleteBlockIndex + 1, typeof(ClaimStakeReward))]
+        [InlineData(long.MaxValue, typeof(ClaimStakeReward))]
         public void Create_ByBlockIndex_Success(
             long blockIndex,
             Type type)

diff --git a/Lib9c/Action/Factory/ClaimStakeRewardFactory.cs b/Lib9c/Action/Factory/ClaimStakeRewardFactory.cs
@@ -11,6 +11,11 @@ public static IClaimStakeReward CreateByBlockIndex(
             long blockIndex,
             Address avatarAddress)
         {
+            if (blockIndex > ClaimStakeReward6.ObsoleteBlockIndex)
+            {
+                return new ClaimStakeReward(avatarAddress);
+            }
+
             if (blockIndex > ClaimStakeReward5.ObsoleteBlockIndex)
             {
                 return new ClaimStakeReward6(avatarAddress);
@@ -48,6 +53,7 @@ public static IClaimStakeReward CreateByVersion(
             4 => new ClaimStakeReward4(avatarAddress),
             5 => new ClaimStakeReward5(avatarAddress),
             6 => new ClaimStakeReward6(avatarAddress),
+            7 => new ClaimStakeReward(avatarAddress),
             _ => throw new ArgumentOutOfRangeException(
                 $"Invalid version: {version}"),
         };