Merge pull request #2613 from planetarium/release/1.12.0

merge `release/1.12.0` to `main`

Author: area363

.Lib9c.DevExtensions.Tests/Action/Craft/UnlocakCraftActionTest.cs

@@ -23,7 +23,7 @@ public class UnlockCraftActionTest
 
         public UnlockCraftActionTest()
         {
-            (_tableSheets, _agentAddress, _avatarAddress, _, _initialStateV2) =
+            (_tableSheets, _agentAddress, _avatarAddress, _initialStateV2) =
                 InitializeUtil.InitializeStates(isDevEx: true);
         }
 

.Lib9c.DevExtensions.Tests/Action/Craft/UnlockRecipeTest.cs

@@ -25,7 +25,7 @@ public class UnlockRecipeTest
 
         public UnlockRecipeTest()
         {
-            (_tableSheets, _agentAddress, _avatarAddress, _, _initialStateV2) =
+            (_tableSheets, _agentAddress, _avatarAddress, _initialStateV2) =
                 InitializeUtil.InitializeStates(isDevEx: true);
             _recipeAddress = _avatarAddress.Derive("recipe_ids");
         }

.Lib9c.DevExtensions.Tests/Action/ManipulateStateTest.cs

@@ -46,7 +46,7 @@ public class ManipulateStateTest
 
         public ManipulateStateTest()
         {
-            (_tableSheets, _agentAddress, _avatarAddress, _, _initialStateV2) =
+            (_tableSheets, _agentAddress, _avatarAddress, _initialStateV2) =
                 InitializeUtil.InitializeStates(
                     adminAddr: AdminAddr,
                     isDevEx: true);
@@ -111,7 +111,7 @@ public ManipulateStateTest()
         public static IEnumerable<object[]> FetchInventory()
         {
             var random = new TestRandom();
-            var (tableSheets, _, _, _, _) = InitializeUtil.InitializeStates(isDevEx: true);
+            var (tableSheets, _, _, _) = InitializeUtil.InitializeStates(isDevEx: true);
             var equipmentList = tableSheets.EquipmentItemSheet.Values.ToList();
             var consumableList = tableSheets.ConsumableItemSheet.Values.ToList();
             var materialList = tableSheets.MaterialItemSheet.Values.ToList();
@@ -170,7 +170,7 @@ public static IEnumerable<object[]> FetchInventory()
         public static IEnumerable<object[]> FetchWorldInfo()
         {
             var random = new Random();
-            var (tableSheets, _, _, _, _) = InitializeUtil.InitializeStates(isDevEx: true);
+            var (tableSheets, _, _, _) = InitializeUtil.InitializeStates(isDevEx: true);
             var worldSheet = tableSheets.WorldSheet;
             yield return new object[]
             {
@@ -195,7 +195,7 @@ public static IEnumerable<object[]> FetchWorldInfo()
         public static IEnumerable<object[]> FetchQuest()
         {
             var random = new Random();
-            var (tableSheets, _, _, _, stateV2) = InitializeUtil.InitializeStates(isDevEx: true);
+            var (tableSheets, _, _, stateV2) = InitializeUtil.InitializeStates(isDevEx: true);
             // Empty QuestList
             yield return new object[]
             {
@@ -455,7 +455,7 @@ public void SetAvatarState(
                 _initialStateV2,
                 new List<(Address, Address, IValue)>
                 {
-                    (Addresses.Avatar, _avatarAddress, MigrationAvatarState.LegacySerializeV2(newAvatarState))
+                    (Addresses.Avatar, _avatarAddress, newAvatarState.SerializeList())
                 },
                 new List<(Address, FungibleAssetValue)>()
             );
@@ -547,7 +547,7 @@ public void SetWorldInformation(int lastClearedStage, WorldInformation targetInf
                 _initialStateV2,
                 new List<(Address, Address, IValue)>
                 {
-                    (ReservedAddresses.LegacyAccount, _avatarAddress.Derive(SerializeKeys.LegacyWorldInformationKey), targetInfo.Serialize())
+                    (Addresses.WorldInformation, _avatarAddress, targetInfo.Serialize())
                 },
                 new List<(Address, FungibleAssetValue)>()
             );

.Lib9c.DevExtensions.Tests/Action/Stage/ClearStageTest.cs

@@ -20,7 +20,7 @@ public class ClearStageTest
 
         public ClearStageTest()
         {
-            (_tableSheets, _agentAddress, _avatarAddress, _, _initialStateV2) =
+            (_tableSheets, _agentAddress, _avatarAddress, _initialStateV2) =
                 InitializeUtil.InitializeStates(isDevEx: true);
         }
 

.Lib9c.Tests/Action/AccountStateViewExtensionsTest.cs

@@ -128,23 +128,10 @@ public void GetAvatarStateV2_Throw_FailedLoadStateException(string account)
             Assert.Contains(account, exc.Message);
         }
 
-        [Theory]
-        [InlineData(true)]
-        [InlineData(false)]
-        public void TryGetAvatarState(bool backward)
+        [Fact]
+        public void TryGetAvatarState()
         {
-            IWorld states = new World(MockUtil.MockModernWorldState);
-            if (backward)
-            {
-                states = states
-                    .SetLegacyState(_avatarAddress, MigrationAvatarState.LegacySerializeV1(_avatarState));
-            }
-            else
-            {
-                states = states
-                    .SetAvatarState(_avatarAddress, _avatarState);
-            }
-
+            IWorld states = new World(MockUtil.MockModernWorldState).SetAvatarState(_avatarAddress, _avatarState);
             Assert.True(states.TryGetAvatarState(_agentAddress, _avatarAddress, out _));
         }
 

.Lib9c.Tests/Action/ActionContext.cs

@@ -30,7 +30,7 @@ public class ActionContext : IActionContext
 
         public long BlockIndex { get; set; }
 
-        public int BlockProtocolVersion { get; set; }
+        public int BlockProtocolVersion { get; set; } = BlockMetadata.CurrentProtocolVersion;
 
         public IWorld PreviousState { get; set; }
 

.Lib9c.Tests/Action/ActionEvaluationTest.cs

@@ -63,7 +63,6 @@ public ActionEvaluationTest()
         [InlineData(typeof(InitializeStates))]
         [InlineData(typeof(ItemEnhancement))]
         [InlineData(typeof(MigrationActivatedAccountsState))]
-        [InlineData(typeof(MigrationAvatarState))]
         [InlineData(typeof(PatchTableSheet))]
         [InlineData(typeof(RankingBattle))]
         [InlineData(typeof(RapidCombination))]
@@ -198,10 +197,6 @@ private ActionBase GetAction(Type type)
                     materialIds = new List<Guid>(),
                 },
                 MigrationActivatedAccountsState _ => new MigrationActivatedAccountsState(),
-                MigrationAvatarState _ => new MigrationAvatarState
-                {
-                    avatarStates = new List<Dictionary>(),
-                },
                 PatchTableSheet _ => new PatchTableSheet
                 {
                     TableCsv = "table",