From 8c73c32a3e1fa5a9714ca7d71da09da6feddefba Mon Sep 17 00:00:00 2001 From: sky1045 Date: Mon, 22 Jul 2024 17:58:30 +0900 Subject: [PATCH 01/14] [WIP]Upgrade dotnet version from 6.0 to 8.0 --- Dockerfile | 4 ++-- Dockerfile.ACC | 4 ++-- Dockerfile.ACC.amd64 | 4 ++-- Dockerfile.ACC.arm64v8 | 4 ++-- Dockerfile.amd64 | 4 ++-- Dockerfile.arm64v8 | 4 ++-- .../NineChronicles.Headless.AccessControlCenter.csproj | 2 +- .../NineChronicles.Headless.Executable.Tests.csproj | 2 +- .../NineChronicles.Headless.Executable.csproj | 2 +- .../NineChronicles.Headless.Tests.csproj | 2 +- NineChronicles.Headless/ActionEvaluationPublisher.cs | 3 ++- NineChronicles.Headless/MemoryCacheExtensions.cs | 2 +- NineChronicles.Headless/NineChronicles.Headless.csproj | 2 +- global.json | 2 +- 14 files changed, 21 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index ecc69e00a..6e03a4942 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:6.0-jammy AS build-env +FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build-env WORKDIR /app ARG COMMIT @@ -24,7 +24,7 @@ RUN dotnet publish NineChronicles.Headless.Executable/NineChronicles.Headless.Ex --version-suffix $COMMIT # Build runtime image -FROM mcr.microsoft.com/dotnet/aspnet:6.0 +FROM mcr.microsoft.com/dotnet/aspnet:8.0 WORKDIR /app RUN apt-get update && apt-get install -y libc6-dev COPY --from=build-env /app/out . diff --git a/Dockerfile.ACC b/Dockerfile.ACC index 40861ddc3..515c74228 100644 --- a/Dockerfile.ACC +++ b/Dockerfile.ACC @@ -1,5 +1,5 @@ # Use the SDK image to build the app -FROM mcr.microsoft.com/dotnet/sdk:6.0-jammy AS build-env +FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build-env WORKDIR /app ARG COMMIT @@ -21,7 +21,7 @@ RUN dotnet publish NineChronicles.Headless.AccessControlCenter/NineChronicles.He --version-suffix $COMMIT # Build runtime image -FROM mcr.microsoft.com/dotnet/aspnet:6.0 +FROM mcr.microsoft.com/dotnet/aspnet:8.0 WORKDIR /app RUN apt-get update && apt-get install -y libc6-dev COPY --from=build-env /app/out . diff --git a/Dockerfile.ACC.amd64 b/Dockerfile.ACC.amd64 index eeb7814d7..6bfd21e35 100644 --- a/Dockerfile.ACC.amd64 +++ b/Dockerfile.ACC.amd64 @@ -1,5 +1,5 @@ # Use the SDK image to build the app -FROM mcr.microsoft.com/dotnet/sdk:6.0-jammy AS build-env +FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build-env WORKDIR /app ARG COMMIT @@ -21,7 +21,7 @@ RUN dotnet publish NineChronicles.Headless.AccessControlCenter/NineChronicles.He --version-suffix $COMMIT # Build runtime image -FROM --platform=linux/amd64 mcr.microsoft.com/dotnet/aspnet:6.0-bullseye-slim +FROM --platform=linux/amd64 mcr.microsoft.com/dotnet/aspnet:8.0-bullseye-slim WORKDIR /app RUN apt-get update && apt-get install -y libc6-dev COPY --from=build-env /app/out . diff --git a/Dockerfile.ACC.arm64v8 b/Dockerfile.ACC.arm64v8 index 510a04d02..782745e8a 100644 --- a/Dockerfile.ACC.arm64v8 +++ b/Dockerfile.ACC.arm64v8 @@ -1,5 +1,5 @@ # Use the SDK image to build the app -FROM mcr.microsoft.com/dotnet/sdk:6.0-jammy AS build-env +FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build-env WORKDIR /app ARG COMMIT @@ -21,7 +21,7 @@ RUN dotnet publish NineChronicles.Headless.AccessControlCenter/NineChronicles.He --version-suffix $COMMIT # Build runtime image -FROM --platform=linux/arm64 mcr.microsoft.com/dotnet/aspnet:6.0-bullseye-slim-arm64v8 +FROM --platform=linux/arm64 mcr.microsoft.com/dotnet/aspnet:8.0-bookworm-slim-arm64v8 WORKDIR /app RUN apt-get update && apt-get install -y libc6-dev COPY --from=build-env /app/out . diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index 6956759fd..2c480cafd 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env WORKDIR /app ARG COMMIT @@ -24,7 +24,7 @@ RUN dotnet publish NineChronicles.Headless.Executable/NineChronicles.Headless.Ex --version-suffix $COMMIT # Build runtime image -FROM --platform=linux/amd64 mcr.microsoft.com/dotnet/aspnet:6.0-bullseye-slim +FROM --platform=linux/amd64 mcr.microsoft.com/dotnet/aspnet:8.0-bookworm-slim WORKDIR /app RUN apt-get update && apt-get install -y libc6-dev liblz4-dev zlib1g-dev libsnappy-dev libzstd-dev COPY --from=build-env /app/out . diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8 index c65b9e968..b0d7e8e89 100644 --- a/Dockerfile.arm64v8 +++ b/Dockerfile.arm64v8 @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env WORKDIR /app ARG COMMIT @@ -24,7 +24,7 @@ RUN dotnet publish NineChronicles.Headless.Executable/NineChronicles.Headless.Ex --version-suffix $COMMIT # Build runtime image -FROM --platform=linux/arm64 mcr.microsoft.com/dotnet/aspnet:6.0-bullseye-slim-arm64v8 +FROM --platform=linux/arm64 mcr.microsoft.com/dotnet/aspnet:8.0-bookworm-slim-arm64v8 WORKDIR /app RUN apt-get update && apt-get install -y libc6-dev COPY --from=build-env /app/out . diff --git a/NineChronicles.Headless.AccessControlCenter/NineChronicles.Headless.AccessControlCenter.csproj b/NineChronicles.Headless.AccessControlCenter/NineChronicles.Headless.AccessControlCenter.csproj index 1ca96b941..dd1d387f2 100644 --- a/NineChronicles.Headless.AccessControlCenter/NineChronicles.Headless.AccessControlCenter.csproj +++ b/NineChronicles.Headless.AccessControlCenter/NineChronicles.Headless.AccessControlCenter.csproj @@ -1,6 +1,6 @@ - net6 + net8.0 true ..\NineChronicles.Headless.Common.ruleset enable diff --git a/NineChronicles.Headless.Executable.Tests/NineChronicles.Headless.Executable.Tests.csproj b/NineChronicles.Headless.Executable.Tests/NineChronicles.Headless.Executable.Tests.csproj index 601591534..a00edfe40 100644 --- a/NineChronicles.Headless.Executable.Tests/NineChronicles.Headless.Executable.Tests.csproj +++ b/NineChronicles.Headless.Executable.Tests/NineChronicles.Headless.Executable.Tests.csproj @@ -1,7 +1,7 @@ - net6 + net8.0 8 false diff --git a/NineChronicles.Headless.Executable/NineChronicles.Headless.Executable.csproj b/NineChronicles.Headless.Executable/NineChronicles.Headless.Executable.csproj index da4115593..538a29a47 100644 --- a/NineChronicles.Headless.Executable/NineChronicles.Headless.Executable.csproj +++ b/NineChronicles.Headless.Executable/NineChronicles.Headless.Executable.csproj @@ -2,7 +2,7 @@ Exe - net6 + net8.0 1.0.0 true ..\NineChronicles.Headless.Common.ruleset diff --git a/NineChronicles.Headless.Tests/NineChronicles.Headless.Tests.csproj b/NineChronicles.Headless.Tests/NineChronicles.Headless.Tests.csproj index 85ffad613..d1465d4a1 100644 --- a/NineChronicles.Headless.Tests/NineChronicles.Headless.Tests.csproj +++ b/NineChronicles.Headless.Tests/NineChronicles.Headless.Tests.csproj @@ -1,7 +1,7 @@ - net6 + net8.0 false false true diff --git a/NineChronicles.Headless/ActionEvaluationPublisher.cs b/NineChronicles.Headless/ActionEvaluationPublisher.cs index cc3060f00..98000be39 100644 --- a/NineChronicles.Headless/ActionEvaluationPublisher.cs +++ b/NineChronicles.Headless/ActionEvaluationPublisher.cs @@ -303,7 +303,8 @@ public IdGroupFinder(IMemoryCache memoryCache) var serializedInput = "key"; // Check cache - if (_memoryCache.TryGetValue(serializedInput, out List<(HashSet IPs, HashSet IDs)> cachedResult)) + List<(HashSet IPs, HashSet IDs)> cachedResult = new(); + if (_memoryCache.TryGetValue(serializedInput, out cachedResult!)) { return cachedResult; } diff --git a/NineChronicles.Headless/MemoryCacheExtensions.cs b/NineChronicles.Headless/MemoryCacheExtensions.cs index 3cda79d22..1d7d4d00d 100644 --- a/NineChronicles.Headless/MemoryCacheExtensions.cs +++ b/NineChronicles.Headless/MemoryCacheExtensions.cs @@ -20,7 +20,7 @@ public static byte[] SetSheet(this MemoryCache cache, string cacheKey, IValue va public static bool TryGetSheet(this MemoryCache cache, string cacheKey, out T cached) { - return cache.TryGetValue(cacheKey, out cached); + return cache.TryGetValue(cacheKey, out cached!); } public static string? GetSheet(this MemoryCache cache, string cacheKey) diff --git a/NineChronicles.Headless/NineChronicles.Headless.csproj b/NineChronicles.Headless/NineChronicles.Headless.csproj index 8c1fe7d3b..68b93d2dd 100644 --- a/NineChronicles.Headless/NineChronicles.Headless.csproj +++ b/NineChronicles.Headless/NineChronicles.Headless.csproj @@ -1,6 +1,6 @@ - net6 + net8.0 true ..\NineChronicles.Headless.Common.ruleset enable diff --git a/global.json b/global.json index c119d61ba..3d7cc68bc 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.0", + "version": "8.0.0", "rollForward": "minor" } } From 1d50688531a7e66e27448d98cb2cc9716843809e Mon Sep 17 00:00:00 2001 From: sky1045 Date: Thu, 29 Aug 2024 18:15:13 +0900 Subject: [PATCH 02/14] Fix acc dockerfile --- Dockerfile.ACC.amd64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.ACC.amd64 b/Dockerfile.ACC.amd64 index 6bfd21e35..2337bfa21 100644 --- a/Dockerfile.ACC.amd64 +++ b/Dockerfile.ACC.amd64 @@ -21,7 +21,7 @@ RUN dotnet publish NineChronicles.Headless.AccessControlCenter/NineChronicles.He --version-suffix $COMMIT # Build runtime image -FROM --platform=linux/amd64 mcr.microsoft.com/dotnet/aspnet:8.0-bullseye-slim +FROM --platform=linux/amd64 mcr.microsoft.com/dotnet/aspnet:8.0-bookworm-slim WORKDIR /app RUN apt-get update && apt-get install -y libc6-dev COPY --from=build-env /app/out . From 9023edb96b09a740a2da4436b843a03a21f31d20 Mon Sep 17 00:00:00 2001 From: sky1045 Date: Tue, 3 Sep 2024 16:39:25 +0900 Subject: [PATCH 03/14] Bump lib9c --- Lib9c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib9c b/Lib9c index 776c9113f..88ad21631 160000 --- a/Lib9c +++ b/Lib9c @@ -1 +1 @@ -Subproject commit 776c9113f7fd8f99b5645222d45b57dd7ad2cb82 +Subproject commit 88ad2163150ee60895c31e09f8222411510f5980 From 245490e5467dee2a2eb8fbaad7dd4acfbb4223d4 Mon Sep 17 00:00:00 2001 From: moreal Date: Wed, 4 Sep 2024 14:19:27 +0900 Subject: [PATCH 04/14] Fix `ActionCommandTest` --- .../Commands/ActionCommandTest.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NineChronicles.Headless.Executable.Tests/Commands/ActionCommandTest.cs b/NineChronicles.Headless.Executable.Tests/Commands/ActionCommandTest.cs index 29eade8fb..b408ac5a7 100644 --- a/NineChronicles.Headless.Executable.Tests/Commands/ActionCommandTest.cs +++ b/NineChronicles.Headless.Executable.Tests/Commands/ActionCommandTest.cs @@ -94,7 +94,7 @@ public void TransferAsset( } else { - Assert.Contains("System.FormatException: Input string was not in a correct format.", _console.Error.ToString()); + Assert.Contains("System.FormatException", _console.Error.ToString()); } } @@ -136,7 +136,7 @@ public void ClaimStakeReward(string addressString, int expectedCode) } else { - Assert.Contains("System.FormatException: Input string was not in a correct format.", _console.Error.ToString()); + Assert.Contains("System.FormatException", _console.Error.ToString()); } } @@ -163,7 +163,7 @@ public void MigrateMonsterCollection(string addressString, int expectedCode) } else { - Assert.Contains("System.FormatException: Input string was not in a correct format.", _console.Error.ToString()); + Assert.Contains("System.FormatException", _console.Error.ToString()); } } } From 23fd4019385a938ad35dc3b088090059df3d8464 Mon Sep 17 00:00:00 2001 From: hyeon Date: Tue, 10 Sep 2024 11:25:23 +0900 Subject: [PATCH 05/14] bump lib9c --- Lib9c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib9c b/Lib9c index 88ad21631..bbe92005e 160000 --- a/Lib9c +++ b/Lib9c @@ -1 +1 @@ -Subproject commit 88ad2163150ee60895c31e09f8222411510f5980 +Subproject commit bbe92005e00028e0caac21040c95eb49d99baade From 6ec7c596d39eed967349fcced75b31c0c713875c Mon Sep 17 00:00:00 2001 From: hyeon Date: Fri, 13 Sep 2024 12:00:17 +0900 Subject: [PATCH 06/14] Bump lib9c --- Lib9c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib9c b/Lib9c index bbe92005e..f48c5aca4 160000 --- a/Lib9c +++ b/Lib9c @@ -1 +1 @@ -Subproject commit bbe92005e00028e0caac21040c95eb49d99baade +Subproject commit f48c5aca44555460f80955b0d413436886c67d70 From 2f5b2101be73b248c2b1d767eea3cffab80395c6 Mon Sep 17 00:00:00 2001 From: hyeon Date: Fri, 13 Sep 2024 12:28:41 +0900 Subject: [PATCH 07/14] Fix broken tests --- .../ArenaParticipantsWorkerTest.cs | 39 ++++++++++++++++--- .../Common/Fixtures.cs | 20 ++++++++-- 2 files changed, 49 insertions(+), 10 deletions(-) diff --git a/NineChronicles.Headless.Tests/ArenaParticipantsWorkerTest.cs b/NineChronicles.Headless.Tests/ArenaParticipantsWorkerTest.cs index 887b59f4f..7d5c406c3 100644 --- a/NineChronicles.Headless.Tests/ArenaParticipantsWorkerTest.cs +++ b/NineChronicles.Headless.Tests/ArenaParticipantsWorkerTest.cs @@ -7,9 +7,11 @@ using Libplanet.Mocks; using Nekoyume; using Nekoyume.Action; +using Nekoyume.Model; using Nekoyume.Model.Arena; using Nekoyume.Model.EnumType; using Nekoyume.Model.Item; +using Nekoyume.Model.Quest; using Nekoyume.Model.State; using Nekoyume.Module; using Nekoyume.TableData; @@ -92,7 +94,8 @@ public void AvatarAddrAndScoresWithRank() .SetLegacyState(sheetAddress, csv.Serialize()) .SetLegacyState(participantsAddr, participants.Serialize()) .SetLegacyState(arenaScore.Address, arenaScore.Serialize()); - var actual = ArenaParticipantsWorker.AvatarAddrAndScoresWithRank(participants.AvatarAddresses, currentRoundData, state); + var actual = + ArenaParticipantsWorker.AvatarAddrAndScoresWithRank(participants.AvatarAddresses, currentRoundData, state); Assert.Equal(2, actual.Count); var first = actual.First(); Assert.Equal(avatarAddress, first.avatarAddr); @@ -114,7 +117,16 @@ public void GetArenaParticipants() avatarAddress, agentAddress, 0, - tableSheets.GetAvatarSheets(), + new QuestList( + tableSheets.QuestSheet, + tableSheets.QuestRewardSheet, + tableSheets.QuestItemRewardSheet, + tableSheets.EquipmentItemRecipeSheet, + tableSheets.EquipmentItemSubRecipeSheet + ), + new WorldInformation( + 0, tableSheets.WorldSheet, GameConfig.IsEditor, "test" + ), new Address(), "avatar_state" ); @@ -123,7 +135,16 @@ public void GetArenaParticipants() avatar2Address, agentAddress, 0, - tableSheets.GetAvatarSheets(), + new QuestList( + tableSheets.QuestSheet, + tableSheets.QuestRewardSheet, + tableSheets.QuestItemRewardSheet, + tableSheets.EquipmentItemRecipeSheet, + tableSheets.EquipmentItemSubRecipeSheet + ), + new WorldInformation( + 0, tableSheets.WorldSheet, GameConfig.IsEditor, "test" + ), new Address(), "avatar_state2" ); @@ -131,7 +152,9 @@ public void GetArenaParticipants() // equipment var equipmentSheet = tableSheets.EquipmentItemSheet; var random = new Random(0); - var equipment = (Equipment)ItemFactory.CreateItem(equipmentSheet.Values.First(r => r.ItemSubType == ItemSubType.Armor), random); + var equipment = + (Equipment)ItemFactory.CreateItem(equipmentSheet.Values.First(r => r.ItemSubType == ItemSubType.Armor), + random); equipment.equipped = true; avatarState.inventory.AddItem(equipment); avatarState2.inventory.AddItem(equipment); @@ -182,8 +205,12 @@ public void GetArenaParticipants() { state = state.SetLegacyState(Addresses.GetSheetAddress(key), s.Serialize()); } - var avatarAddrAndScoresWithRank = ArenaParticipantsWorker.AvatarAddrAndScoresWithRank(participants.AvatarAddresses, currentRoundData, state); - var actual = ArenaParticipantsWorker.GetArenaParticipants(state, participants.AvatarAddresses, avatarAddrAndScoresWithRank); + + var avatarAddrAndScoresWithRank = + ArenaParticipantsWorker.AvatarAddrAndScoresWithRank(participants.AvatarAddresses, currentRoundData, state); + var actual = + ArenaParticipantsWorker.GetArenaParticipants(state, participants.AvatarAddresses, + avatarAddrAndScoresWithRank); Assert.Equal(2, actual.Count); var first = actual.First(); Assert.Equal(avatarAddress, first.AvatarAddr); diff --git a/NineChronicles.Headless.Tests/Common/Fixtures.cs b/NineChronicles.Headless.Tests/Common/Fixtures.cs index 38e485719..f950e1e42 100644 --- a/NineChronicles.Headless.Tests/Common/Fixtures.cs +++ b/NineChronicles.Headless.Tests/Common/Fixtures.cs @@ -6,7 +6,10 @@ using Libplanet.Common; using Libplanet.Crypto; using Libplanet.Types.Assets; +using Nekoyume; +using Nekoyume.Model; using Nekoyume.Model.Item; +using Nekoyume.Model.Quest; using Nekoyume.Model.State; namespace NineChronicles.Headless.Tests @@ -24,13 +27,21 @@ public static class Fixtures public static readonly Address StakeStateAddress = StakeState.DeriveAddress(UserAddress); - public static readonly TableSheets TableSheetsFX = new(TableSheetsImporter.ImportSheets()); + public static readonly TableSheets TableSheetsFX = new (TableSheetsImporter.ImportSheets()); - public static readonly AvatarState AvatarStateFX = new( + public static readonly AvatarState AvatarStateFX = new ( AvatarAddress, UserAddress, 0, - TableSheetsFX.GetAvatarSheets(), + new QuestList( + TableSheetsFX.GetAvatarSheets().QuestSheet, + TableSheetsFX.GetAvatarSheets().QuestRewardSheet, + TableSheetsFX.GetAvatarSheets().QuestItemRewardSheet, + TableSheetsFX.GetAvatarSheets().EquipmentItemRecipeSheet, + TableSheetsFX.GetAvatarSheets().EquipmentItemSubRecipeSheet + ), + new WorldInformation(0, TableSheetsFX.GetAvatarSheets().WorldSheet, + GameConfig.IsEditor, "test"), new Address(), "avatar_state_fx" ); @@ -54,7 +65,8 @@ public static ShopState ShopStateFX() var equipment = ItemFactory.CreateItemUsable(row, Guid.Empty, 0); if (equipment is ITradableItem tradableItem) { - var shopItem = new ShopItem(UserAddress, AvatarAddress, Guid.NewGuid(), index * CurrencyFX, tradableItem); + var shopItem = new ShopItem(UserAddress, AvatarAddress, Guid.NewGuid(), index * CurrencyFX, + tradableItem); shopState.Register(shopItem); } } From c39f4736c6d78ca93514fc1e6df83f33fc12a8ed Mon Sep 17 00:00:00 2001 From: hyeon Date: Fri, 13 Sep 2024 12:39:33 +0900 Subject: [PATCH 08/14] Fix lint --- NineChronicles.Headless.Tests/Common/Fixtures.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NineChronicles.Headless.Tests/Common/Fixtures.cs b/NineChronicles.Headless.Tests/Common/Fixtures.cs index f950e1e42..d081b135b 100644 --- a/NineChronicles.Headless.Tests/Common/Fixtures.cs +++ b/NineChronicles.Headless.Tests/Common/Fixtures.cs @@ -27,9 +27,9 @@ public static class Fixtures public static readonly Address StakeStateAddress = StakeState.DeriveAddress(UserAddress); - public static readonly TableSheets TableSheetsFX = new (TableSheetsImporter.ImportSheets()); + public static readonly TableSheets TableSheetsFX = new(TableSheetsImporter.ImportSheets()); - public static readonly AvatarState AvatarStateFX = new ( + public static readonly AvatarState AvatarStateFX = new( AvatarAddress, UserAddress, 0, From 263a2b7dbdb41176376554bc431206b681643f42 Mon Sep 17 00:00:00 2001 From: hyeon Date: Mon, 23 Sep 2024 16:20:13 +0900 Subject: [PATCH 09/14] Fix function args --- .../ArenaParticipantsWorkerTest.cs | 24 ++----------------- .../Common/Fixtures.cs | 11 ++------- 2 files changed, 4 insertions(+), 31 deletions(-) diff --git a/NineChronicles.Headless.Tests/ArenaParticipantsWorkerTest.cs b/NineChronicles.Headless.Tests/ArenaParticipantsWorkerTest.cs index f2218842b..f0835bbc7 100644 --- a/NineChronicles.Headless.Tests/ArenaParticipantsWorkerTest.cs +++ b/NineChronicles.Headless.Tests/ArenaParticipantsWorkerTest.cs @@ -7,11 +7,9 @@ using Libplanet.Mocks; using Nekoyume; using Nekoyume.Action; -using Nekoyume.Model; using Nekoyume.Model.Arena; using Nekoyume.Model.EnumType; using Nekoyume.Model.Item; -using Nekoyume.Model.Quest; using Nekoyume.Model.State; using Nekoyume.Module; using Nekoyume.TableData; @@ -117,16 +115,7 @@ public void GetArenaParticipants() avatarAddress, agentAddress, 0, - new QuestList( - tableSheets.QuestSheet, - tableSheets.QuestRewardSheet, - tableSheets.QuestItemRewardSheet, - tableSheets.EquipmentItemRecipeSheet, - tableSheets.EquipmentItemSubRecipeSheet - ), - new WorldInformation( - 0, tableSheets.WorldSheet, GameConfig.IsEditor, "test" - ), + tableSheets.GetAvatarSheets(), new Address(), "avatar_state" ); @@ -135,16 +124,7 @@ public void GetArenaParticipants() avatar2Address, agentAddress, 0, - new QuestList( - tableSheets.QuestSheet, - tableSheets.QuestRewardSheet, - tableSheets.QuestItemRewardSheet, - tableSheets.EquipmentItemRecipeSheet, - tableSheets.EquipmentItemSubRecipeSheet - ), - new WorldInformation( - 0, tableSheets.WorldSheet, GameConfig.IsEditor, "test" - ), + tableSheets.GetAvatarSheets(), new Address(), "avatar_state2" ); diff --git a/NineChronicles.Headless.Tests/Common/Fixtures.cs b/NineChronicles.Headless.Tests/Common/Fixtures.cs index 81bf16c2e..851646c29 100644 --- a/NineChronicles.Headless.Tests/Common/Fixtures.cs +++ b/NineChronicles.Headless.Tests/Common/Fixtures.cs @@ -11,6 +11,7 @@ using Nekoyume.Model.Item; using Nekoyume.Model.Quest; using Nekoyume.Model.State; +using Nekoyume.TableData; namespace NineChronicles.Headless.Tests { @@ -33,15 +34,7 @@ public static class Fixtures AvatarAddress, UserAddress, 0, - new QuestList( - TableSheetsFX.GetAvatarSheets().QuestSheet, - TableSheetsFX.GetAvatarSheets().QuestRewardSheet, - TableSheetsFX.GetAvatarSheets().QuestItemRewardSheet, - TableSheetsFX.GetAvatarSheets().EquipmentItemRecipeSheet, - TableSheetsFX.GetAvatarSheets().EquipmentItemSubRecipeSheet - ), - new WorldInformation(0, TableSheetsFX.GetAvatarSheets().WorldSheet, - GameConfig.IsEditor, "test"), + TableSheetsFX.GetAvatarSheets(), new Address(), "avatar_state_fx" ); From 3cba470ad189741a57d0118187b779eeafc3113a Mon Sep 17 00:00:00 2001 From: hyeon Date: Tue, 24 Sep 2024 17:46:09 +0900 Subject: [PATCH 10/14] Bump lib9c: update custom craft CP selection --- Lib9c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib9c b/Lib9c index 0d91af77c..20013a2bf 160000 --- a/Lib9c +++ b/Lib9c @@ -1 +1 @@ -Subproject commit 0d91af77c324907272c1a5e7385b36cc2ad6dc54 +Subproject commit 20013a2bf993e0d52fb1ad1c4ec52034c2f2c9f1 From 4343d4163714f52b6e8c89304489a3568d8a8ec5 Mon Sep 17 00:00:00 2001 From: hyeon Date: Wed, 25 Sep 2024 15:14:24 +0900 Subject: [PATCH 11/14] Bump lib9c: Update mail --- Lib9c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib9c b/Lib9c index 20013a2bf..00ac3e8ea 160000 --- a/Lib9c +++ b/Lib9c @@ -1 +1 @@ -Subproject commit 20013a2bf993e0d52fb1ad1c4ec52034c2f2c9f1 +Subproject commit 00ac3e8ea53f76a809e7b6bcfc22c3d6d8cc0f09 From 35ab420254afaecb562f20383a0120ec97725e97 Mon Sep 17 00:00:00 2001 From: hyeon Date: Wed, 25 Sep 2024 17:30:41 +0900 Subject: [PATCH 12/14] Bump lib9c --- Lib9c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib9c b/Lib9c index 00ac3e8ea..2a67d1456 160000 --- a/Lib9c +++ b/Lib9c @@ -1 +1 @@ -Subproject commit 00ac3e8ea53f76a809e7b6bcfc22c3d6d8cc0f09 +Subproject commit 2a67d1456c6d3102f3356a3574951686c885cc61 From f6d44addbff7bd842432c7d6a45b74b57dd9d314 Mon Sep 17 00:00:00 2001 From: hyeon Date: Fri, 27 Sep 2024 18:53:20 +0900 Subject: [PATCH 13/14] Bump lib9c: Update custom craft cost calculator --- Lib9c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib9c b/Lib9c index 2a67d1456..5e6cea511 160000 --- a/Lib9c +++ b/Lib9c @@ -1 +1 @@ -Subproject commit 2a67d1456c6d3102f3356a3574951686c885cc61 +Subproject commit 5e6cea5115277ddc79e39366c26d21eb73d1ddaf From e30eb172b0822fc4bed0af051785ac1db2e8a251 Mon Sep 17 00:00:00 2001 From: hyeon Date: Mon, 30 Sep 2024 10:33:04 +0900 Subject: [PATCH 14/14] Bump lib9c to tag --- Lib9c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib9c b/Lib9c index 5e6cea511..810b1d86a 160000 --- a/Lib9c +++ b/Lib9c @@ -1 +1 @@ -Subproject commit 5e6cea5115277ddc79e39366c26d21eb73d1ddaf +Subproject commit 810b1d86a3f11f9780c270671b845bfa7c8bd0a1