Merge pull request #2096 from planetarium/revert-itradable

Revert "Move ITradableItem from ItemUsable to each items"
planetarium · Aug 24, 2023 · 0e4f6bc · 0e4f6bc
2 parents 8dd516f + 6c8e965
commit 0e4f6bc
Show file tree

Hide file tree

Showing 70 changed files with 143 additions and 201 deletions.
diff --git a/.Lib9c.Tests/Action/Buy10Test.cs b/.Lib9c.Tests/Action/Buy10Test.cs
@@ -239,7 +239,7 @@ public void Execute(params OrderData[] orderDataList)
                         _tableSheets.EquipmentItemSheet.First,
                         itemId,
                         0);
-                    tradableItem = (ITradableItem)itemUsable;
+                    tradableItem = itemUsable;
                     itemSubType = itemUsable.ItemSubType;
                 }
                 else if (orderData.ItemType == ItemType.Costume)

diff --git a/.Lib9c.Tests/Action/Buy11Test.cs b/.Lib9c.Tests/Action/Buy11Test.cs
@@ -245,7 +245,7 @@ public void Execute(params OrderData[] orderDataList)
                         _tableSheets.EquipmentItemSheet.First,
                         itemId,
                         0);
-                    tradableItem = (ITradableItem)itemUsable;
+                    tradableItem = itemUsable;
                     itemSubType = itemUsable.ItemSubType;
                 }
                 else if (orderData.ItemType == ItemType.Costume)

diff --git a/.Lib9c.Tests/Action/Buy2Test.cs b/.Lib9c.Tests/Action/Buy2Test.cs
@@ -98,7 +98,7 @@ public Buy2Test(ITestOutputHelper outputHelper)
                 _sellerAvatarAddress,
                 Guid.NewGuid(),
                 new FungibleAssetValue(_goldCurrencyState.Currency, 100, 0),
-                (ITradableItem)equipment));
+                equipment));
 
             var result = new CombinationConsumable5.ResultModel()
             {

diff --git a/.Lib9c.Tests/Action/Buy3Test.cs b/.Lib9c.Tests/Action/Buy3Test.cs
@@ -108,14 +108,14 @@ public Buy3Test(ITestOutputHelper outputHelper)
                 _sellerAvatarAddress,
                 Guid.NewGuid(),
                 new FungibleAssetValue(_goldCurrencyState.Currency, ProductPrice, 0),
-                (ITradableItem)equipment));
+                equipment));
 
             shopState.Register(new ShopItem(
                 _sellerAgentAddress,
                 _sellerAvatarAddress,
                 Guid.NewGuid(),
                 new FungibleAssetValue(_goldCurrencyState.Currency, ProductPrice, 0),
-                (ITradableItem)consumable));
+                consumable));
 
             shopState.Register(new ShopItem(
                 _sellerAgentAddress,

diff --git a/.Lib9c.Tests/Action/Buy4Test.cs b/.Lib9c.Tests/Action/Buy4Test.cs
@@ -110,14 +110,14 @@ public Buy4Test(ITestOutputHelper outputHelper)
                 _sellerAvatarAddress,
                 Guid.NewGuid(),
                 new FungibleAssetValue(_goldCurrencyState.Currency, ProductPrice, 0),
-                (ITradableItem)equipment));
+                equipment));
 
             shopState.Register(new ShopItem(
                 _sellerAgentAddress,
                 _sellerAvatarAddress,
                 Guid.NewGuid(),
                 new FungibleAssetValue(_goldCurrencyState.Currency, ProductPrice, 0),
-                (ITradableItem)consumable));
+                consumable));
 
             shopState.Register(new ShopItem(
                 _sellerAgentAddress,

diff --git a/.Lib9c.Tests/Action/Buy5Test.cs b/.Lib9c.Tests/Action/Buy5Test.cs
@@ -210,7 +210,7 @@ public void Execute(params ShopItemData[] shopItemMembers)
                     productId,
                     new FungibleAssetValue(_goldCurrencyState.Currency, shopItemData.Price, 0),
                     requiredBlockIndex,
-                    (ITradableItem)nonFungibleItem);
+                    nonFungibleItem);
 
                 // Case for backward compatibility.
                 if (shopItemData.ContainsInInventory)
@@ -454,7 +454,7 @@ public void Execute_ErrorCode_InsufficientBalance()
                 _productId,
                 new FungibleAssetValue(_goldCurrencyState.Currency, 100, 0),
                 Sell6.ExpiredBlockIndex,
-                (ITradableItem)itemUsable);
+                itemUsable);
 
             ShardedShopState shopState = new ShardedShopState(shardedShopAddress);
             shopState.Register(shopItem);
@@ -506,7 +506,7 @@ public void Execute_ErrorCode_ItemDoesNotExist_By_SellerAvatar()
                 _productId,
                 new FungibleAssetValue(_goldCurrencyState.Currency, 100, 0),
                 Sell6.ExpiredBlockIndex,
-                (ITradableItem)itemUsable);
+                itemUsable);
 
             ShardedShopState shopState = new ShardedShopState(shardedShopAddress);
             shopState.Register(shopItem);

diff --git a/.Lib9c.Tests/Action/Buy6Test.cs b/.Lib9c.Tests/Action/Buy6Test.cs
@@ -213,7 +213,7 @@ public void Execute(params ShopItemData[] shopItemMembers)
                         _tableSheets.EquipmentItemSheet.First,
                         itemId,
                         requiredBlockIndex);
-                    tradableItem = (ITradableItem)itemUsable;
+                    tradableItem = itemUsable;
                     itemSubType = itemUsable.ItemSubType;
                 }
                 else if (shopItemData.ItemType == ItemType.Costume)
@@ -581,7 +581,7 @@ public void Execute_ErrorCode_InsufficientBalance()
                 _productId,
                 new FungibleAssetValue(_goldCurrencyState.Currency, 100, 0),
                 Sell6.ExpiredBlockIndex,
-                (ITradableItem)itemUsable);
+                itemUsable);
 
             ShardedShopState shopState = new ShardedShopState(shardedShopAddress);
             shopState.Register(shopItem);

diff --git a/.Lib9c.Tests/Action/Buy7Test.cs b/.Lib9c.Tests/Action/Buy7Test.cs
@@ -213,7 +213,7 @@ public void Execute(params ShopItemData[] shopItemMembers)
                         _tableSheets.EquipmentItemSheet.First,
                         itemId,
                         requiredBlockIndex);
-                    tradableItem = (ITradableItem)itemUsable;
+                    tradableItem = itemUsable;
                     itemSubType = itemUsable.ItemSubType;
                 }
                 else if (shopItemData.ItemType == ItemType.Costume)
@@ -652,7 +652,7 @@ public void Execute_ErrorCode_InsufficientBalance()
                 _productId,
                 new FungibleAssetValue(_goldCurrencyState.Currency, 100, 0),
                 Sell6.ExpiredBlockIndex,
-                (ITradableItem)itemUsable);
+                itemUsable);
 
             ShardedShopState shopState = new ShardedShopState(shardedShopAddress);
             shopState.Register(shopItem);

diff --git a/.Lib9c.Tests/Action/Buy8Test.cs b/.Lib9c.Tests/Action/Buy8Test.cs
@@ -207,7 +207,7 @@ public void Execute(params OrderData[] orderDataList)
                         _tableSheets.EquipmentItemSheet.First,
                         itemId,
                         0);
-                    tradableItem = (ITradableItem)itemUsable;
+                    tradableItem = itemUsable;
                     itemSubType = itemUsable.ItemSubType;
                 }
                 else if (orderData.ItemType == ItemType.Costume)

diff --git a/.Lib9c.Tests/Action/Buy9Test.cs b/.Lib9c.Tests/Action/Buy9Test.cs
@@ -294,7 +294,7 @@ public void Execute(params OrderData[] orderDataList)
                         _tableSheets.EquipmentItemSheet.First,
                         itemId,
                         0);
-                    tradableItem = (ITradableItem)itemUsable;
+                    tradableItem = itemUsable;
                     itemSubType = itemUsable.ItemSubType;
                 }
                 else if (orderData.ItemType == ItemType.Costume)

diff --git a/.Lib9c.Tests/Action/BuyMultipleTest.cs b/.Lib9c.Tests/Action/BuyMultipleTest.cs
@@ -275,7 +275,7 @@ public void Execute(params ShopItemData[] productDatas)
                     shopItemId,
                     new FungibleAssetValue(_goldCurrencyState.Currency, product.Price, 0),
                     product.RequiredBlockIndex,
-                    (ITradableItem)nonFungibleItem);
+                    nonFungibleItem);
                 shopState.Register(shopItem);
 
                 if (product.Buy)
@@ -504,7 +504,7 @@ public void ExecuteInsufficientBalanceError()
                 Guid.NewGuid(),
                 new FungibleAssetValue(_goldCurrencyState.Currency, 1, 0),
                 100,
-                (ITradableItem)equipment));
+                equipment));
 
             var costume = ItemFactory.CreateCostume(
                 _tableSheets.CostumeItemSheet.First,
@@ -574,7 +574,7 @@ public void ExecuteThrowShopItemExpiredError()
                 productId,
                 new FungibleAssetValue(_goldCurrencyState.Currency, 100, 0),
                 10,
-                (ITradableItem)equipment));
+                equipment));
 
             previousStates = previousStates
                 .SetState(Addresses.Shop, shopState.Serialize());

diff --git a/.Lib9c.Tests/Action/BuyProduct0Test.cs b/.Lib9c.Tests/Action/BuyProduct0Test.cs
@@ -28,7 +28,7 @@ public class BuyProduct0Test
         private static readonly Currency Gold = Currency.Legacy("NCG", 2, null);
         private static readonly TableSheets TableSheets = new TableSheets(TableSheetsImporter.ImportSheets());
         private static readonly ITradableItem TradableItem =
-            (ITradableItem)ItemFactory.CreateItemUsable(TableSheets.EquipmentItemSheet.OrderedList.First(r => r.ItemSubType == ItemSubType.Armor), Guid.NewGuid(), 1L);
+            ItemFactory.CreateItemUsable(TableSheets.EquipmentItemSheet.OrderedList.First(r => r.ItemSubType == ItemSubType.Armor), Guid.NewGuid(), 1L);
 
         private readonly Address _sellerAgentAddress2;
         private readonly Address _sellerAvatarAddress2;

diff --git a/.Lib9c.Tests/Action/BuyProductTest.cs b/.Lib9c.Tests/Action/BuyProductTest.cs
@@ -28,7 +28,7 @@ public class BuyProductTest
         private static readonly Currency Gold = Currency.Legacy("NCG", 2, null);
         private static readonly TableSheets TableSheets = new TableSheets(TableSheetsImporter.ImportSheets());
         private static readonly ITradableItem TradableItem =
-            (ITradableItem)ItemFactory.CreateItemUsable(TableSheets.EquipmentItemSheet.OrderedList.First(r => r.ItemSubType == ItemSubType.Armor), Guid.NewGuid(), 1L);
+            ItemFactory.CreateItemUsable(TableSheets.EquipmentItemSheet.OrderedList.First(r => r.ItemSubType == ItemSubType.Armor), Guid.NewGuid(), 1L);
 
         private readonly Address _sellerAgentAddress2;
         private readonly Address _sellerAvatarAddress2;

diff --git a/.Lib9c.Tests/Action/BuyTest.cs b/.Lib9c.Tests/Action/BuyTest.cs
@@ -240,7 +240,7 @@ public void Execute(params OrderData[] orderDataList)
                         _tableSheets.EquipmentItemSheet.First,
                         itemId,
                         0);
-                    tradableItem = (ITradableItem)itemUsable;
+                    tradableItem = itemUsable;
                     itemSubType = itemUsable.ItemSubType;
                 }
                 else if (orderData.ItemType == ItemType.Costume)

diff --git a/.Lib9c.Tests/Action/ItemEnhancement10Test.cs b/.Lib9c.Tests/Action/ItemEnhancement10Test.cs
@@ -192,8 +192,8 @@ public void Execute(int level, int expectedGold, bool backward)
                     break;
             }
 
-            Assert.Equal(preItemUsable.ItemId, slotResult.preItemUsable.ItemId);
-            Assert.Equal(preItemUsable.ItemId, resultEquipment.ItemId);
+            Assert.Equal(preItemUsable.TradableId, slotResult.preItemUsable.TradableId);
+            Assert.Equal(preItemUsable.TradableId, resultEquipment.TradableId);
             Assert.Equal(costRow.Cost, slotResult.gold);
         }
 

diff --git a/.Lib9c.Tests/Action/ItemEnhancement9Test.cs b/.Lib9c.Tests/Action/ItemEnhancement9Test.cs
@@ -186,8 +186,8 @@ public void Execute(int level, int expectedGold, bool backward)
                     break;
             }
 
-            Assert.Equal(preItemUsable.ItemId, slotResult.preItemUsable.ItemId);
-            Assert.Equal(preItemUsable.ItemId, resultEquipment.ItemId);
+            Assert.Equal(preItemUsable.TradableId, slotResult.preItemUsable.TradableId);
+            Assert.Equal(preItemUsable.TradableId, resultEquipment.TradableId);
             Assert.Equal(costRow.Cost, slotResult.gold);
         }
 

diff --git a/.Lib9c.Tests/Action/ItemEnhancementTest.cs b/.Lib9c.Tests/Action/ItemEnhancementTest.cs
@@ -289,9 +289,8 @@ public void Execute(
                 expectedBlockIndex + 1, // +1 for execution
                 resultEquipment.RequiredBlockIndex
             );
-            Assert.Equal(preItemUsable.ItemId, slotResult.preItemUsable.ItemId);
-            Assert.Equal(preItemUsable.ItemId, resultEquipment.ItemId);
-            Assert.Equal(targetRow.Cost - startRow.Cost, slotResult.gold);
+            Assert.Equal(preItemUsable.TradableId, slotResult.preItemUsable.TradableId);
+            Assert.Equal(preItemUsable.TradableId, resultEquipment.TradableId);
         }
     }
 }
diff --git a/.Lib9c.Tests/Action/ReRegisterProduct0Test.cs b/.Lib9c.Tests/Action/ReRegisterProduct0Test.cs
@@ -120,7 +120,7 @@ bool fromPreviousAction
                         _tableSheets.EquipmentItemSheet.First,
                         itemId,
                         requiredBlockIndex);
-                    tradableItem = (ITradableItem)itemUsable;
+                    tradableItem = itemUsable;
                     itemSubType = itemUsable.ItemSubType;
                     break;
                 }

diff --git a/.Lib9c.Tests/Action/ReRegisterProductTest.cs b/.Lib9c.Tests/Action/ReRegisterProductTest.cs
@@ -120,7 +120,7 @@ bool fromPreviousAction
                         _tableSheets.EquipmentItemSheet.First,
                         itemId,
                         requiredBlockIndex);
-                    tradableItem = (ITradableItem)itemUsable;
+                    tradableItem = itemUsable;
                     itemSubType = itemUsable.ItemSubType;
                     break;
                 }

diff --git a/.Lib9c.Tests/Action/RegisterProduct0Test.cs b/.Lib9c.Tests/Action/RegisterProduct0Test.cs
@@ -227,7 +227,7 @@ public void Execute()
                         AvatarAddress = AvatarAddress,
                         ItemCount = 1,
                         Price = 1 * Gold,
-                        TradableId = equipment.ItemId,
+                        TradableId = equipment.TradableId,
                         Type = ProductType.NonFungible,
                     },
                     new AssetInfo
@@ -329,7 +329,7 @@ public void Execute_Throw_ItemDoesNotExistException(ProductType type, int itemCo
                 {
                     var equipmentRow = _tableSheets.EquipmentItemSheet.Values.First();
                     var id = Guid.NewGuid();
-                    tradableItem = (ITradableItem)ItemFactory.CreateItemUsable(equipmentRow, id, requiredBlockIndex);
+                    tradableItem = ItemFactory.CreateItemUsable(equipmentRow, id, requiredBlockIndex);
                     break;
                 }
 

diff --git a/.Lib9c.Tests/Action/RegisterProductTest.cs b/.Lib9c.Tests/Action/RegisterProductTest.cs
@@ -227,7 +227,7 @@ public void Execute()
                         AvatarAddress = AvatarAddress,
                         ItemCount = 1,
                         Price = 1 * Gold,
-                        TradableId = equipment.ItemId,
+                        TradableId = equipment.TradableId,
                         Type = ProductType.NonFungible,
                     },
                     new AssetInfo
@@ -330,7 +330,7 @@ public void Execute_Throw_ItemDoesNotExistException(ProductType type, int itemCo
                 {
                     var equipmentRow = _tableSheets.EquipmentItemSheet.Values.First();
                     var id = Guid.NewGuid();
-                    tradableItem = (ITradableItem)ItemFactory.CreateItemUsable(equipmentRow, id, requiredBlockIndex);
+                    tradableItem = ItemFactory.CreateItemUsable(equipmentRow, id, requiredBlockIndex);
                     break;
                 }
 

diff --git a/.Lib9c.Tests/Action/Scenario/AuraScenarioTest.cs b/.Lib9c.Tests/Action/Scenario/AuraScenarioTest.cs
@@ -14,7 +14,6 @@ namespace Lib9c.Tests.Action.Scenario
     using Nekoyume.Model.BattleStatus.Arena;
     using Nekoyume.Model.EnumType;
     using Nekoyume.Model.Item;
-    using Nekoyume.Model.Market;
     using Nekoyume.Model.Skill;
     using Nekoyume.Model.Stat;
     using Nekoyume.Model.State;
@@ -30,7 +29,6 @@ public class AuraScenarioTest
         private readonly IAccountStateDelta _initialState;
         private readonly Aura _aura;
         private readonly TableSheets _tableSheets;
-        private readonly Currency _currency;
 
         public AuraScenarioTest()
         {
@@ -76,12 +74,11 @@ public AuraScenarioTest()
                         avatarState.questList.Serialize());
             }
 
-            _currency = Currency.Legacy("NCG", 2, minters: null);
             _initialState = _initialState
                 .SetState(_agentAddress, agentState.Serialize())
                 .SetState(
                     Addresses.GoldCurrency,
-                    new GoldCurrencyState(_currency).Serialize())
+                    new GoldCurrencyState(Currency.Legacy("NCG", 2, minters: null)).Serialize())
                 .SetState(gameConfigState.address, gameConfigState.Serialize())
                 .MintAsset(new ActionContext(), _agentAddress, Currencies.Crystal * 2);
             foreach (var (key, value) in sheets)
@@ -269,48 +266,6 @@ public void Arena()
             }
         }
 
-        [Fact]
-        public void Market()
-        {
-            var avatarState = _initialState.GetAvatarStateV2(_avatarAddress);
-            avatarState.inventory.TryGetNonFungibleItem(_aura.ItemId, out Aura aura);
-            Assert.NotNull(aura);
-            Assert.IsAssignableFrom<Equipment>(aura);
-            Assert.Null(aura as ITradableItem);
-            for (int i = 0; i < GameConfig.RequireClearedStageLevel.ActionsInShop; i++)
-            {
-                avatarState.worldInformation.ClearStage(1, i + 1, 0, _tableSheets.WorldSheet, _tableSheets.WorldUnlockSheet);
-            }
-
-            var previousState = _initialState.SetState(
-                _avatarAddress.Derive(LegacyWorldInformationKey),
-                avatarState.worldInformation.Serialize());
-
-            var register = new RegisterProduct
-            {
-                AvatarAddress = _avatarAddress,
-                RegisterInfos = new List<IRegisterInfo>
-                {
-                    new RegisterInfo
-                    {
-                        AvatarAddress = _avatarAddress,
-                        Price = 1 * _currency,
-                        TradableId = _aura.ItemId,
-                        ItemCount = 1,
-                        Type = ProductType.NonFungible,
-                    },
-                },
-                ChargeAp = false,
-            };
-            // Because Aura is not ITradableItem.
-            Assert.Throws<ItemDoesNotExistException>(() => register.Execute(new ActionContext
-            {
-                Signer = _agentAddress,
-                PreviousState = previousState,
-                BlockIndex = 0L,
-            }));
-        }
-
         private void Assert_Player(AvatarState avatarState, IAccountStateDelta state, Address avatarAddress, Address itemSlotStateAddress)
         {
             var nextAvatarState = state.GetAvatarStateV2(avatarAddress);