Merge pull request #2318 from planetarium/hotfix/arena-ticket

Validate ticket count

Author: ipdae

.Lib9c.Tests/Action/BattleArenaTest.cs

@@ -1037,6 +1037,37 @@ public void Execute_ValidateDuplicateTicketPurchaseException()
             }));
         }
 
+        [Theory]
+        [InlineData(8, null)]
+        [InlineData(100, null)]
+        [InlineData(0, typeof(ArgumentException))]
+        [InlineData(-1, typeof(ArgumentException))]
+        public void PlainValue(int ticket, Type exc)
+        {
+            BattleArena action = new BattleArena
+            {
+                myAvatarAddress = _avatar1Address,
+                enemyAvatarAddress = _avatar2Address,
+                championshipId = 1,
+                round = 1,
+                ticket = ticket,
+                costumes = new List<Guid>(),
+                equipments = new List<Guid>(),
+                runeInfos = new List<RuneSlotInfo>(),
+            };
+            IValue plainValue = action.PlainValue;
+            BattleArena des = new BattleArena();
+            if (exc is null)
+            {
+                des.LoadPlainValue(plainValue);
+                Assert.Equal(plainValue, des.PlainValue);
+            }
+            else
+            {
+                Assert.Throws(exc, () => des.LoadPlainValue(plainValue));
+            }
+        }
+
         private static (AgentState AgentState, AvatarState AvatarState) GetAgentStateWithAvatarState(
             IReadOnlyDictionary<string, string> sheets,
             TableSheets tableSheets,

Lib9c/Action/BattleArena.cs

@@ -83,14 +83,16 @@ protected override void LoadPlainValueInternal(
             championshipId = plainValue[ChampionshipIdKey].ToInteger();
             round = plainValue[RoundKey].ToInteger();
             ticket = plainValue[TicketKey].ToInteger();
-            costumes = ((List)plainValue[CostumesKey]).Select(e => e.ToGuid()).ToList();
-            equipments = ((List)plainValue[EquipmentsKey]).Select(e => e.ToGuid()).ToList();
-            runeInfos = plainValue[RuneInfos].ToList(x => new RuneSlotInfo((List)x));
+            costumes = ((List) plainValue[CostumesKey]).Select(e => e.ToGuid()).ToList();
+            equipments = ((List) plainValue[EquipmentsKey]).Select(e => e.ToGuid()).ToList();
+            runeInfos = plainValue[RuneInfos].ToList(x => new RuneSlotInfo((List) x));
+            ValidateTicket();
         }
 
         public override IAccount Execute(IActionContext context)
         {
             context.UseGas(1);
+            ValidateTicket();
             var states = context.PreviousState;
             var addressesHex = GetSignerAndOtherAddressesHex(
                 context,
@@ -446,5 +448,13 @@ public override IAccount Execute(IActionContext context)
                     myAvatarAddress.Derive(LegacyInventoryKey),
                     avatarState.inventory.Serialize());
         }
+
+        private void ValidateTicket()
+        {
+            if (ticket <= 0)
+            {
+                throw new ArgumentException("ticket must be greater than 0");
+            }
+        }
     }
 }