diff --git a/backend/app/Savor22b.Tests/Action/CancelFoodActionTests.cs b/backend/app/Savor22b.Tests/Action/CancelFoodActionTests.cs index 15365852..b7d0fdf9 100644 --- a/backend/app/Savor22b.Tests/Action/CancelFoodActionTests.cs +++ b/backend/app/Savor22b.Tests/Action/CancelFoodActionTests.cs @@ -58,7 +58,7 @@ public class CancelFoodActionTests : ActionTests RootState beforeRootState = new RootState( beforeInventoryState, - new DungeonState(), + new UserDungeonState(), new VillageState(new HouseState(1, 1, 1, beforeKitchenState)) ); diff --git a/backend/app/Savor22b.Tests/Action/CreateFoodActionTests.cs b/backend/app/Savor22b.Tests/Action/CreateFoodActionTests.cs index 496cb46e..0aebea20 100644 --- a/backend/app/Savor22b.Tests/Action/CreateFoodActionTests.cs +++ b/backend/app/Savor22b.Tests/Action/CreateFoodActionTests.cs @@ -176,7 +176,7 @@ ImmutableList FoodIDList RootState rootState = new RootState( inventoryState, - new DungeonState(), + new UserDungeonState(), new VillageState(new HouseState(1, 1, 1, resultKitchenState)) ); diff --git a/backend/app/Savor22b.Tests/Action/HarvestingSeedActionTests.cs b/backend/app/Savor22b.Tests/Action/HarvestingSeedActionTests.cs index aa27e255..f440eff2 100644 --- a/backend/app/Savor22b.Tests/Action/HarvestingSeedActionTests.cs +++ b/backend/app/Savor22b.Tests/Action/HarvestingSeedActionTests.cs @@ -8,10 +8,7 @@ namespace Savor22b.Tests.Action; public class HarvestingSeedActionTests : ActionTests { - - public HarvestingSeedActionTests() - { - } + public HarvestingSeedActionTests() { } [Fact] public void Execute_Success_Normal() @@ -19,41 +16,31 @@ public void Execute_Success_Normal() IAccountStateDelta beforeState = new DummyState(); RootState beforeRootState = new RootState( new InventoryState(), - new DungeonState(), - new VillageState( - new HouseState( - 1, 1, 1, new KitchenState() - ) - ) + new UserDungeonState(), + new VillageState(new HouseState(1, 1, 1, new KitchenState())) ); - beforeRootState.VillageState!.UpdateHouseFieldState(0, new HouseFieldState( - Guid.NewGuid(), - 1, - 1, - 5 - )); - - beforeState = beforeState.SetState( - SignerAddress(), - beforeRootState.Serialize() + beforeRootState.VillageState!.UpdateHouseFieldState( + 0, + new HouseFieldState(Guid.NewGuid(), 1, 1, 5) ); + beforeState = beforeState.SetState(SignerAddress(), beforeRootState.Serialize()); + var random = new DummyRandom(1); - HarvestingSeedAction action = new HarvestingSeedAction( - 0, - Guid.NewGuid() + HarvestingSeedAction action = new HarvestingSeedAction(0, Guid.NewGuid()); + + IAccountStateDelta state = action.Execute( + new DummyActionContext + { + PreviousStates = beforeState, + Signer = SignerAddress(), + Random = random, + Rehearsal = false, + BlockIndex = 6, + } ); - IAccountStateDelta state = action.Execute(new DummyActionContext - { - PreviousStates = beforeState, - Signer = SignerAddress(), - Random = random, - Rehearsal = false, - BlockIndex = 6, - }); - var rootStateEncoded = state.GetState(SignerAddress()); RootState rootState = rootStateEncoded is Bencodex.Types.Dictionary bdict @@ -64,50 +51,37 @@ public void Execute_Success_Normal() Assert.Equal(1, rootState.InventoryState.RefrigeratorStateList.Count); } - [Fact] public void Execute_Success_AfterRemoveWeed() { IAccountStateDelta beforeState = new DummyState(); RootState beforeRootState = new RootState( new InventoryState(), - new DungeonState(), - new VillageState( - new HouseState( - 1, 1, 1, new KitchenState() - ) - ) + new UserDungeonState(), + new VillageState(new HouseState(1, 1, 1, new KitchenState())) ); - beforeRootState.VillageState!.UpdateHouseFieldState(0, new HouseFieldState( - Guid.NewGuid(), - 1, - 1, - 10, - 4, - 1 - )); - - beforeState = beforeState.SetState( - SignerAddress(), - beforeRootState.Serialize() + beforeRootState.VillageState!.UpdateHouseFieldState( + 0, + new HouseFieldState(Guid.NewGuid(), 1, 1, 10, 4, 1) ); + beforeState = beforeState.SetState(SignerAddress(), beforeRootState.Serialize()); + var random = new DummyRandom(1); - HarvestingSeedAction action = new HarvestingSeedAction( - 0, - Guid.NewGuid() + HarvestingSeedAction action = new HarvestingSeedAction(0, Guid.NewGuid()); + + IAccountStateDelta state = action.Execute( + new DummyActionContext + { + PreviousStates = beforeState, + Signer = SignerAddress(), + Random = random, + Rehearsal = false, + BlockIndex = 10, + } ); - IAccountStateDelta state = action.Execute(new DummyActionContext - { - PreviousStates = beforeState, - Signer = SignerAddress(), - Random = random, - Rehearsal = false, - BlockIndex = 10, - }); - var rootStateEncoded = state.GetState(SignerAddress()); RootState rootState = rootStateEncoded is Bencodex.Types.Dictionary bdict diff --git a/backend/app/Savor22b.Tests/Action/InstallKitchenEquipmentActionTests.cs b/backend/app/Savor22b.Tests/Action/InstallKitchenEquipmentActionTests.cs index c2a0fb24..13696467 100644 --- a/backend/app/Savor22b.Tests/Action/InstallKitchenEquipmentActionTests.cs +++ b/backend/app/Savor22b.Tests/Action/InstallKitchenEquipmentActionTests.cs @@ -11,9 +11,7 @@ namespace Savor22b.Tests.Action; public class InstallKitchenEquipmentActionTests : ActionTests { - public InstallKitchenEquipmentActionTests() - { - } + public InstallKitchenEquipmentActionTests() { } [Theory] [InlineData(1)] @@ -27,32 +25,32 @@ public void Execute_Success_NormalCase(int spaceNumber) new InventoryState( ImmutableList.Empty, ImmutableList.Empty, - ImmutableList.Empty.Add(new KitchenEquipmentState(Guid.NewGuid(), 1, 1)), + ImmutableList.Empty.Add( + new KitchenEquipmentState(Guid.NewGuid(), 1, 1) + ), ImmutableList.Empty ), - new DungeonState(), - new VillageState( - new HouseState( - 1, 1, 1, new KitchenState() - ) - ) + new UserDungeonState(), + new VillageState(new HouseState(1, 1, 1, new KitchenState())) ); - beforeState = beforeState.SetState( - SignerAddress(), - beforeRootState.Serialize() - ); + beforeState = beforeState.SetState(SignerAddress(), beforeRootState.Serialize()); - var action = new InstallKitchenEquipmentAction(beforeRootState.InventoryState.KitchenEquipmentStateList[0].StateID, spaceNumber); + var action = new InstallKitchenEquipmentAction( + beforeRootState.InventoryState.KitchenEquipmentStateList[0].StateID, + spaceNumber + ); - var afterState = action.Execute(new DummyActionContext - { - PreviousStates = beforeState, - Signer = SignerAddress(), - Random = random, - Rehearsal = false, - BlockIndex = 1, - }); + var afterState = action.Execute( + new DummyActionContext + { + PreviousStates = beforeState, + Signer = SignerAddress(), + Random = random, + Rehearsal = false, + BlockIndex = 1, + } + ); var afterRootStateEncoded = afterState.GetState(SignerAddress()); RootState afterRootState = afterRootStateEncoded is Bencodex.Types.Dictionary bdict @@ -62,25 +60,44 @@ public void Execute_Success_NormalCase(int spaceNumber) Assert.Single(afterRootState.InventoryState.KitchenEquipmentStateList); Assert.Equal( beforeRootState.InventoryState.KitchenEquipmentStateList[0].StateID, - afterRootState.InventoryState.KitchenEquipmentStateList[0].StateID); + afterRootState.InventoryState.KitchenEquipmentStateList[0].StateID + ); if (spaceNumber == 1) { Assert.Equal( beforeRootState.InventoryState.KitchenEquipmentStateList[0].StateID, - afterRootState.VillageState!.HouseState.KitchenState.FirstApplianceSpace.InstalledKitchenEquipmentStateId); + afterRootState + .VillageState! + .HouseState + .KitchenState + .FirstApplianceSpace + .InstalledKitchenEquipmentStateId + ); } else if (spaceNumber == 2) { Assert.Equal( beforeRootState.InventoryState.KitchenEquipmentStateList[0].StateID, - afterRootState.VillageState!.HouseState.KitchenState.SecondApplianceSpace.InstalledKitchenEquipmentStateId); + afterRootState + .VillageState! + .HouseState + .KitchenState + .SecondApplianceSpace + .InstalledKitchenEquipmentStateId + ); } else if (spaceNumber == 3) { Assert.Equal( beforeRootState.InventoryState.KitchenEquipmentStateList[0].StateID, - afterRootState.VillageState!.HouseState.KitchenState.ThirdApplianceSpace.InstalledKitchenEquipmentStateId); + afterRootState + .VillageState! + .HouseState + .KitchenState + .ThirdApplianceSpace + .InstalledKitchenEquipmentStateId + ); } else { @@ -100,31 +117,26 @@ public void Execute_Failure_NotHaveKitchenEquipment() ImmutableList.Empty, ImmutableList.Empty ), - new DungeonState(), - new VillageState( - new HouseState( - 1, 1, 1, new KitchenState() - ) - ) + new UserDungeonState(), + new VillageState(new HouseState(1, 1, 1, new KitchenState())) ); - beforeState = beforeState.SetState( - SignerAddress(), - beforeRootState.Serialize() - ); + beforeState = beforeState.SetState(SignerAddress(), beforeRootState.Serialize()); var action = new InstallKitchenEquipmentAction(Guid.NewGuid(), 1); Assert.Throws(() => { - action.Execute(new DummyActionContext - { - PreviousStates = beforeState, - Signer = SignerAddress(), - Random = random, - Rehearsal = false, - BlockIndex = 1, - }); + action.Execute( + new DummyActionContext + { + PreviousStates = beforeState, + Signer = SignerAddress(), + Random = random, + Rehearsal = false, + BlockIndex = 1, + } + ); }); } @@ -140,27 +152,26 @@ public void Execute_Failure_NotPlacedHouse() ImmutableList.Empty, ImmutableList.Empty ), - new DungeonState(), + new UserDungeonState(), null ); - beforeState = beforeState.SetState( - SignerAddress(), - beforeRootState.Serialize() - ); + beforeState = beforeState.SetState(SignerAddress(), beforeRootState.Serialize()); var action = new InstallKitchenEquipmentAction(Guid.NewGuid(), 1); Assert.Throws(() => { - action.Execute(new DummyActionContext - { - PreviousStates = beforeState, - Signer = SignerAddress(), - Random = random, - Rehearsal = false, - BlockIndex = 1, - }); + action.Execute( + new DummyActionContext + { + PreviousStates = beforeState, + Signer = SignerAddress(), + Random = random, + Rehearsal = false, + BlockIndex = 1, + } + ); }); } } diff --git a/backend/app/Savor22b.Tests/Action/PlaceUserHouseActionTests.cs b/backend/app/Savor22b.Tests/Action/PlaceUserHouseActionTests.cs index 6c59ac09..3b1ce962 100644 --- a/backend/app/Savor22b.Tests/Action/PlaceUserHouseActionTests.cs +++ b/backend/app/Savor22b.Tests/Action/PlaceUserHouseActionTests.cs @@ -64,7 +64,11 @@ private IAccountStateDelta createStateForRelocationHouse() prevGlobalUserHouseState.UserHouse.Add("1,0,0", SignerAddress()); VillageState villageState = new VillageState(new HouseState(1, 0, 0, new KitchenState())); - RootState prevRootState = new RootState(new InventoryState(), new DungeonState(), villageState); + RootState prevRootState = new RootState( + new InventoryState(), + new UserDungeonState(), + villageState + ); state = state.MintAsset( SignerAddress(), @@ -141,7 +145,7 @@ private IAccountStateDelta createStateForInProgressReplaceHouse() VillageState villageState = new VillageState(new HouseState(1, 0, 0, new KitchenState())); RootState prevRootState = new RootState( new InventoryState(), - new DungeonState(), + new UserDungeonState(), villageState, new RelocationState(1, 90, 1, 0, 0) ); diff --git a/backend/app/Savor22b.Tests/Action/PlantingSeedActionTests.cs b/backend/app/Savor22b.Tests/Action/PlantingSeedActionTests.cs index 76384c69..70b332dc 100644 --- a/backend/app/Savor22b.Tests/Action/PlantingSeedActionTests.cs +++ b/backend/app/Savor22b.Tests/Action/PlantingSeedActionTests.cs @@ -9,10 +9,7 @@ namespace Savor22b.Tests.Action; public class PlantingSeedActionTests : ActionTests { - - public PlantingSeedActionTests() - { - } + public PlantingSeedActionTests() { } private InventoryState getInventoryState() { @@ -26,14 +23,7 @@ private InventoryState getInventoryState() private VillageState getVillageState() { - VillageState villageState = new VillageState( - new HouseState( - 1, - 1, - 1, - new KitchenState() - ) - ); + VillageState villageState = new VillageState(new HouseState(1, 1, 1, new KitchenState())); return villageState; } @@ -55,10 +45,7 @@ public void Execute_ValidAction() IAccountStateDelta beforeState = new DummyState(); RootState beforeRootState = createRootStatePreset(); - beforeState = beforeState.SetState( - SignerAddress(), - beforeRootState.Serialize() - ); + beforeState = beforeState.SetState(SignerAddress(), beforeRootState.Serialize()); var beforeSeedGuid = Guid.NewGuid(); PlantingSeedAction plantingSeedAction = new PlantingSeedAction( @@ -69,21 +56,26 @@ public void Execute_ValidAction() var random = new DummyRandom(1); - IAccountStateDelta state = plantingSeedAction.Execute(new DummyActionContext - { - PreviousStates = beforeState, - Signer = SignerAddress(), - Random = random, - Rehearsal = false, - BlockIndex = 1, - }); + IAccountStateDelta state = plantingSeedAction.Execute( + new DummyActionContext + { + PreviousStates = beforeState, + Signer = SignerAddress(), + Random = random, + Rehearsal = false, + BlockIndex = 1, + } + ); var rootStateEncoded = state.GetState(SignerAddress()); RootState rootState = rootStateEncoded is Bencodex.Types.Dictionary bdict ? new RootState(bdict) : throw new Exception(); - Assert.Equal(rootState.VillageState!.HouseFieldStates[0]!.InstalledSeedGuid, beforeSeedGuid); + Assert.Equal( + rootState.VillageState!.HouseFieldStates[0]!.InstalledSeedGuid, + beforeSeedGuid + ); Assert.Equal(rootState.InventoryState.SeedStateList.Count, 1); Assert.Equal(rootState.InventoryState.ItemStateList.Count, 0); } @@ -94,15 +86,9 @@ public void Execute_InvalidVillageState() IAccountStateDelta beforeState = new DummyState(); InventoryState inventoryState = getInventoryState(); - RootState beforeRootState = new RootState( - inventoryState, - new DungeonState() - ); + RootState beforeRootState = new RootState(inventoryState, new UserDungeonState()); - beforeState = beforeState.SetState( - SignerAddress(), - beforeRootState.Serialize() - ); + beforeState = beforeState.SetState(SignerAddress(), beforeRootState.Serialize()); var beforeSeedGuid = Guid.NewGuid(); PlantingSeedAction plantingSeedAction = new PlantingSeedAction( @@ -115,14 +101,16 @@ public void Execute_InvalidVillageState() Assert.Throws(() => { - plantingSeedAction.Execute(new DummyActionContext - { - PreviousStates = beforeState, - Signer = SignerAddress(), - Random = random, - Rehearsal = false, - BlockIndex = 1, - }); + plantingSeedAction.Execute( + new DummyActionContext + { + PreviousStates = beforeState, + Signer = SignerAddress(), + Random = random, + Rehearsal = false, + BlockIndex = 1, + } + ); }); } @@ -133,10 +121,7 @@ public void Execute_InvalidFieldIndex() RootState beforeRootState = createRootStatePreset(); - beforeState = beforeState.SetState( - SignerAddress(), - beforeRootState.Serialize() - ); + beforeState = beforeState.SetState(SignerAddress(), beforeRootState.Serialize()); var beforeSeedGuid = Guid.NewGuid(); PlantingSeedAction plantingSeedAction = new PlantingSeedAction( @@ -149,14 +134,16 @@ public void Execute_InvalidFieldIndex() Assert.Throws(() => { - plantingSeedAction.Execute(new DummyActionContext - { - PreviousStates = beforeState, - Signer = SignerAddress(), - Random = random, - Rehearsal = false, - BlockIndex = 1, - }); + plantingSeedAction.Execute( + new DummyActionContext + { + PreviousStates = beforeState, + Signer = SignerAddress(), + Random = random, + Rehearsal = false, + BlockIndex = 1, + } + ); }); } @@ -167,10 +154,7 @@ public void Execute_InvalidItemStateId() RootState beforeRootState = createRootStatePreset(); - beforeState = beforeState.SetState( - SignerAddress(), - beforeRootState.Serialize() - ); + beforeState = beforeState.SetState(SignerAddress(), beforeRootState.Serialize()); var beforeSeedGuid = Guid.NewGuid(); PlantingSeedAction plantingSeedAction = new PlantingSeedAction( @@ -183,14 +167,16 @@ public void Execute_InvalidItemStateId() Assert.Throws(() => { - plantingSeedAction.Execute(new DummyActionContext - { - PreviousStates = beforeState, - Signer = SignerAddress(), - Random = random, - Rehearsal = false, - BlockIndex = 1, - }); + plantingSeedAction.Execute( + new DummyActionContext + { + PreviousStates = beforeState, + Signer = SignerAddress(), + Random = random, + Rehearsal = false, + BlockIndex = 1, + } + ); }); } } diff --git a/backend/app/Savor22b.Tests/Action/RemovePlantedSeedActionTests.cs b/backend/app/Savor22b.Tests/Action/RemovePlantedSeedActionTests.cs index bb98eba8..c4fadc1f 100644 --- a/backend/app/Savor22b.Tests/Action/RemovePlantedSeedActionTests.cs +++ b/backend/app/Savor22b.Tests/Action/RemovePlantedSeedActionTests.cs @@ -8,10 +8,7 @@ namespace Savor22b.Tests.Action; public class RemovePlantedSeedActionTests : ActionTests { - - public RemovePlantedSeedActionTests() - { - } + public RemovePlantedSeedActionTests() { } [Fact] public void Execute_Success_Normal() @@ -19,37 +16,30 @@ public void Execute_Success_Normal() IAccountStateDelta beforeState = new DummyState(); RootState beforeRootState = new RootState( new InventoryState(), - new DungeonState(), - new VillageState( - new HouseState( - 1, 1, 1, new KitchenState() - ) - ) + new UserDungeonState(), + new VillageState(new HouseState(1, 1, 1, new KitchenState())) ); - beforeRootState.VillageState!.UpdateHouseFieldState(0, new HouseFieldState( - Guid.NewGuid(), - 1, - 1, - 5 - )); - - beforeState = beforeState.SetState( - SignerAddress(), - beforeRootState.Serialize() + beforeRootState.VillageState!.UpdateHouseFieldState( + 0, + new HouseFieldState(Guid.NewGuid(), 1, 1, 5) ); + beforeState = beforeState.SetState(SignerAddress(), beforeRootState.Serialize()); + var random = new DummyRandom(1); RemovePlantedSeedAction action = new RemovePlantedSeedAction(0); - IAccountStateDelta state = action.Execute(new DummyActionContext - { - PreviousStates = beforeState, - Signer = SignerAddress(), - Random = random, - Rehearsal = false, - BlockIndex = 1, - }); + IAccountStateDelta state = action.Execute( + new DummyActionContext + { + PreviousStates = beforeState, + Signer = SignerAddress(), + Random = random, + Rehearsal = false, + BlockIndex = 1, + } + ); var rootStateEncoded = state.GetState(SignerAddress()); diff --git a/backend/app/Savor22b.Tests/Action/RemoveWeedActionTests.cs b/backend/app/Savor22b.Tests/Action/RemoveWeedActionTests.cs index 904b498d..40e601bc 100644 --- a/backend/app/Savor22b.Tests/Action/RemoveWeedActionTests.cs +++ b/backend/app/Savor22b.Tests/Action/RemoveWeedActionTests.cs @@ -8,21 +8,14 @@ namespace Savor22b.Tests.Action; public class RemoveWeedActionTests : ActionTests { - - public RemoveWeedActionTests() - { - } + public RemoveWeedActionTests() { } public RootState createRootStatePreset() { RootState beforeRootState = new RootState( new InventoryState(), - new DungeonState(), - new VillageState( - new HouseState( - 1, 1, 1, new KitchenState() - ) - ) + new UserDungeonState(), + new VillageState(new HouseState(1, 1, 1, new KitchenState())) ); return beforeRootState; @@ -34,32 +27,26 @@ public void Execute_Success_FirstWeedRemove() IAccountStateDelta beforeState = new DummyState(); RootState beforeRootState = createRootStatePreset(); - HouseFieldState houseFieldState = new( - Guid.NewGuid(), - 1, - 1, - 10 - ); + HouseFieldState houseFieldState = new(Guid.NewGuid(), 1, 1, 10); beforeRootState.VillageState!.UpdateHouseFieldState(0, houseFieldState); - beforeState = beforeState.SetState( - SignerAddress(), - beforeRootState.Serialize() - ); + beforeState = beforeState.SetState(SignerAddress(), beforeRootState.Serialize()); var random = new DummyRandom(1); RemoveWeedAction action = new RemoveWeedAction(0); - IAccountStateDelta state = action.Execute(new DummyActionContext - { - PreviousStates = beforeState, - Signer = SignerAddress(), - Random = random, - Rehearsal = false, - BlockIndex = 5, - }); + IAccountStateDelta state = action.Execute( + new DummyActionContext + { + PreviousStates = beforeState, + Signer = SignerAddress(), + Random = random, + Rehearsal = false, + BlockIndex = 5, + } + ); var rootStateEncoded = state.GetState(SignerAddress()); @@ -67,55 +54,37 @@ public void Execute_Success_FirstWeedRemove() ? new RootState(bdict) : throw new Exception(); - Assert.Equal( - 5, - rootState.VillageState!.HouseFieldStates[0]!.LastWeedBlock - ); - Assert.Equal( - 1, - rootState.VillageState!.HouseFieldStates[0]!.WeedRemovalCount - ); - Assert.Equal( - false, - rootState.VillageState!.HouseFieldStates[0]!.WeedRemovalAble(6) - ); + Assert.Equal(5, rootState.VillageState!.HouseFieldStates[0]!.LastWeedBlock); + Assert.Equal(1, rootState.VillageState!.HouseFieldStates[0]!.WeedRemovalCount); + Assert.Equal(false, rootState.VillageState!.HouseFieldStates[0]!.WeedRemovalAble(6)); } - [Fact] public void Execute_Success_SecondWeedRemove() { IAccountStateDelta beforeState = new DummyState(); RootState beforeRootState = createRootStatePreset(); - HouseFieldState houseFieldState = new( - Guid.NewGuid(), - 1, - 1, - 10, - 3, - 1 - ); + HouseFieldState houseFieldState = new(Guid.NewGuid(), 1, 1, 10, 3, 1); beforeRootState.VillageState!.UpdateHouseFieldState(0, houseFieldState); - beforeState = beforeState.SetState( - SignerAddress(), - beforeRootState.Serialize() - ); + beforeState = beforeState.SetState(SignerAddress(), beforeRootState.Serialize()); var random = new DummyRandom(1); RemoveWeedAction action = new RemoveWeedAction(0); - IAccountStateDelta state = action.Execute(new DummyActionContext - { - PreviousStates = beforeState, - Signer = SignerAddress(), - Random = random, - Rehearsal = false, - BlockIndex = 6, - }); + IAccountStateDelta state = action.Execute( + new DummyActionContext + { + PreviousStates = beforeState, + Signer = SignerAddress(), + Random = random, + Rehearsal = false, + BlockIndex = 6, + } + ); var rootStateEncoded = state.GetState(SignerAddress()); @@ -123,17 +92,8 @@ public void Execute_Success_SecondWeedRemove() ? new RootState(bdict) : throw new Exception(); - Assert.Equal( - 6, - rootState.VillageState!.HouseFieldStates[0]!.LastWeedBlock - ); - Assert.Equal( - 2, - rootState.VillageState!.HouseFieldStates[0]!.WeedRemovalCount - ); - Assert.Equal( - false, - rootState.VillageState!.HouseFieldStates[0]!.WeedRemovalAble(7) - ); + Assert.Equal(6, rootState.VillageState!.HouseFieldStates[0]!.LastWeedBlock); + Assert.Equal(2, rootState.VillageState!.HouseFieldStates[0]!.WeedRemovalCount); + Assert.Equal(false, rootState.VillageState!.HouseFieldStates[0]!.WeedRemovalAble(7)); } }