chore: fix build

limebell · Jul 17, 2023 · 4213b00 · 4213b00
1 parent 063cf5a
commit 4213b00
Show file tree

Hide file tree

Showing 112 changed files with 99 additions and 107 deletions.
diff --git a/...Action/Action/AccountStateDeltaMetrics.cs → Libplanet.Action/AccountStateDeltaMetrics.cs b/...Action/Action/AccountStateDeltaMetrics.cs → Libplanet.Action/AccountStateDeltaMetrics.cs
diff --git a/Libplanet.Action/Action/ActionContext.cs → Libplanet.Action/ActionContext.cs b/Libplanet.Action/Action/ActionContext.cs → Libplanet.Action/ActionContext.cs
@@ -2,9 +2,9 @@
 using System.Diagnostics;
 using System.Diagnostics.Contracts;
 using System.Threading;
+using Libplanet.Action.State;
 using Libplanet.Common.Crypto;
 using Libplanet.Common.Types.Tx;
-using Libplanet.State;
 
 namespace Libplanet.Action
 {

diff --git a/Libplanet.Action/Action/ActionEvaluation.cs → Libplanet.Action/ActionEvaluation.cs b/Libplanet.Action/Action/ActionEvaluation.cs → Libplanet.Action/ActionEvaluation.cs
@@ -1,6 +1,6 @@
 using System;
 using Bencodex.Types;
-using Libplanet.State;
+using Libplanet.Action.State;
 
 namespace Libplanet.Action
 {

diff --git a/...ion/Action/ActionEvaluationsExtensions.cs → ...net.Action/ActionEvaluationsExtensions.cs b/...ion/Action/ActionEvaluationsExtensions.cs → ...net.Action/ActionEvaluationsExtensions.cs
@@ -2,7 +2,7 @@
 using System.Collections.Immutable;
 using System.Linq;
 using Bencodex.Types;
-using Libplanet.State;
+using Libplanet.Action.State;
 
 namespace Libplanet.Action
 {

diff --git a/Libplanet.Action/Action/ActionEvaluator.cs → Libplanet.Action/ActionEvaluator.cs b/Libplanet.Action/Action/ActionEvaluator.cs → Libplanet.Action/ActionEvaluator.cs
@@ -8,12 +8,11 @@
 using System.Security.Cryptography;
 using Bencodex.Types;
 using Libplanet.Action.Loader;
-using Libplanet.Blockchain;
+using Libplanet.Action.State;
 using Libplanet.Common;
 using Libplanet.Common.Crypto;
 using Libplanet.Common.Types.Blocks;
 using Libplanet.Common.Types.Tx;
-using Libplanet.State;
 using Serilog;
 
 namespace Libplanet.Action

diff --git a/...anet.Action/Action/ActionTypeAttribute.cs → Libplanet.Action/ActionTypeAttribute.cs b/...anet.Action/Action/ActionTypeAttribute.cs → Libplanet.Action/ActionTypeAttribute.cs
diff --git a/Libplanet.Action/Action/ActionsExtensions.cs → Libplanet.Action/ActionsExtensions.cs b/Libplanet.Action/Action/ActionsExtensions.cs → Libplanet.Action/ActionsExtensions.cs
diff --git a/Libplanet.Action/AssemblyInfo.cs b/Libplanet.Action/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Libplanet.Tests")]
diff --git a/...DuplicateActionTypeIdentifierException.cs → ...DuplicateActionTypeIdentifierException.cs b/...DuplicateActionTypeIdentifierException.cs → ...DuplicateActionTypeIdentifierException.cs
diff --git a/Libplanet.Action/Action/FeeCollector.cs → Libplanet.Action/FeeCollector.cs b/Libplanet.Action/Action/FeeCollector.cs → Libplanet.Action/FeeCollector.cs
@@ -1,5 +1,5 @@
+using Libplanet.Action.State;
 using Libplanet.Common.Types.Assets;
-using Libplanet.State;
 
 namespace Libplanet.Action
 {

diff --git a/...ction/Action/GasLimitExceededException.cs → ...lanet.Action/GasLimitExceededException.cs b/...ction/Action/GasLimitExceededException.cs → ...lanet.Action/GasLimitExceededException.cs
diff --git a/...ction/Action/GasLimitNegativeException.cs → ...lanet.Action/GasLimitNegativeException.cs b/...ction/Action/GasLimitNegativeException.cs → ...lanet.Action/GasLimitNegativeException.cs
diff --git a/Libplanet.Action/Action/GasMeter.cs → Libplanet.Action/GasMeter.cs b/Libplanet.Action/Action/GasMeter.cs → Libplanet.Action/GasMeter.cs
diff --git a/....Action/Action/GasUseNegativeException.cs → Libplanet.Action/GasUseNegativeException.cs b/....Action/Action/GasUseNegativeException.cs → Libplanet.Action/GasUseNegativeException.cs
diff --git a/Libplanet.Action/Action/IAction.cs → Libplanet.Action/IAction.cs b/Libplanet.Action/Action/IAction.cs → Libplanet.Action/IAction.cs
@@ -1,6 +1,6 @@
 #nullable disable
 using Bencodex.Types;
-using Libplanet.State;
+using Libplanet.Action.State;
 
 namespace Libplanet.Action
 {

diff --git a/Libplanet.Action/Action/IActionContext.cs → Libplanet.Action/IActionContext.cs b/Libplanet.Action/Action/IActionContext.cs → Libplanet.Action/IActionContext.cs
@@ -1,8 +1,8 @@
 using System.Diagnostics.Contracts;
+using Libplanet.Action.State;
 using Libplanet.Common.Crypto;
 using Libplanet.Common.Types.Blocks;
 using Libplanet.Common.Types.Tx;
-using Libplanet.State;
 
 namespace Libplanet.Action
 {

diff --git a/Libplanet.Action/Action/IActionEvaluation.cs → Libplanet.Action/IActionEvaluation.cs b/Libplanet.Action/Action/IActionEvaluation.cs → Libplanet.Action/IActionEvaluation.cs
@@ -1,6 +1,6 @@
 using System;
 using Bencodex.Types;
-using Libplanet.State;
+using Libplanet.Action.State;
 
 namespace Libplanet.Action
 {

diff --git a/Libplanet.Action/Action/IActionEvaluator.cs → Libplanet.Action/IActionEvaluator.cs b/Libplanet.Action/Action/IActionEvaluator.cs → Libplanet.Action/IActionEvaluator.cs
diff --git a/...Action/Action/IActionTypeLoaderContext.cs → Libplanet.Action/IActionTypeLoaderContext.cs b/...Action/Action/IActionTypeLoaderContext.cs → Libplanet.Action/IActionTypeLoaderContext.cs
diff --git a/Libplanet.Action/Action/IFeeCollector.cs → Libplanet.Action/IFeeCollector.cs b/Libplanet.Action/Action/IFeeCollector.cs → Libplanet.Action/IFeeCollector.cs
@@ -1,4 +1,4 @@
-using Libplanet.State;
+using Libplanet.Action.State;
 
 namespace Libplanet.Action
 {

diff --git a/Libplanet.Action/Action/IGasMeter.cs → Libplanet.Action/IGasMeter.cs b/Libplanet.Action/Action/IGasMeter.cs → Libplanet.Action/IGasMeter.cs
diff --git a/Libplanet.Action/Action/IRandom.cs → Libplanet.Action/IRandom.cs b/Libplanet.Action/Action/IRandom.cs → Libplanet.Action/IRandom.cs
diff --git a/...t.Action/Action/InvalidActionException.cs → Libplanet.Action/InvalidActionException.cs b/...t.Action/Action/InvalidActionException.cs → Libplanet.Action/InvalidActionException.cs
diff --git a/Libplanet.Action/Libplanet.Action.csproj b/Libplanet.Action/Libplanet.Action.csproj
@@ -4,6 +4,8 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>8.0</LangVersion>
+    <RootNamespace>Libplanet.Action</RootNamespace>
+    <AssemblyName>Libplanet.Action</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...net.Action/Action/Loader/IActionLoader.cs → Libplanet.Action/Loader/IActionLoader.cs b/...net.Action/Action/Loader/IActionLoader.cs → Libplanet.Action/Loader/IActionLoader.cs
diff --git a/...tion/Action/Loader/IndexedActionLoader.cs → ...anet.Action/Loader/IndexedActionLoader.cs b/...tion/Action/Loader/IndexedActionLoader.cs → ...anet.Action/Loader/IndexedActionLoader.cs
diff --git a/...ction/Action/Loader/SingleActionLoader.cs → ...lanet.Action/Loader/SingleActionLoader.cs b/...ction/Action/Loader/SingleActionLoader.cs → ...lanet.Action/Loader/SingleActionLoader.cs
@@ -1,7 +1,6 @@
 using System;
 using Bencodex.Types;
 using Libplanet.Action.Sys;
-using Libplanet.Blockchain;
 
 namespace Libplanet.Action.Loader
 {

diff --git a/...Action/Action/Loader/TypedActionLoader.cs → Libplanet.Action/Loader/TypedActionLoader.cs b/...Action/Action/Loader/TypedActionLoader.cs → Libplanet.Action/Loader/TypedActionLoader.cs
diff --git a/Libplanet.Action/Action/NullAction.cs → Libplanet.Action/NullAction.cs b/Libplanet.Action/Action/NullAction.cs → Libplanet.Action/NullAction.cs
@@ -1,5 +1,5 @@
 using Bencodex.Types;
-using Libplanet.State;
+using Libplanet.Action.State;
 
 namespace Libplanet.Action
 {

diff --git a/....Action/Action/PolicyBlockActionGetter.cs → Libplanet.Action/PolicyBlockActionGetter.cs b/....Action/Action/PolicyBlockActionGetter.cs → Libplanet.Action/PolicyBlockActionGetter.cs
diff --git a/Libplanet.Action/Action/Random.cs → Libplanet.Action/Random.cs b/Libplanet.Action/Action/Random.cs → Libplanet.Action/Random.cs
diff --git a/Libplanet.Action/Action/RandomExtensions.cs → Libplanet.Action/RandomExtensions.cs b/Libplanet.Action/Action/RandomExtensions.cs → Libplanet.Action/RandomExtensions.cs
diff --git a/Libplanet.Action/State/AccountDelta.cs b/Libplanet.Action/State/AccountDelta.cs
@@ -6,7 +6,7 @@
 using Libplanet.Common.Types.Assets;
 using Libplanet.Common.Types.Consensus;
 
-namespace Libplanet.State
+namespace Libplanet.Action.State
 {
     internal class AccountDelta : IAccountDelta
     {

diff --git a/Libplanet.Action/State/AccountDeltaExtensions.cs b/Libplanet.Action/State/AccountDeltaExtensions.cs
@@ -7,9 +7,9 @@
 using Libplanet.Common.Types.Assets;
 using Libplanet.Common.Types.Consensus;
 using Libplanet.Store;
-using static Libplanet.State.KeyConverters;
+using static Libplanet.Action.State.KeyConverters;
 
-namespace Libplanet.State
+namespace Libplanet.Action.State
 {
     public static class AccountDeltaExtensions
     {

diff --git a/Libplanet.Action/State/AccountStateDelta.cs b/Libplanet.Action/State/AccountStateDelta.cs
@@ -5,12 +5,11 @@
 using System.Linq;
 using System.Numerics;
 using Bencodex.Types;
-using Libplanet.Action;
 using Libplanet.Common.Crypto;
 using Libplanet.Common.Types.Assets;
 using Libplanet.Common.Types.Consensus;
 
-namespace Libplanet.State
+namespace Libplanet.Action.State
 {
     /// <summary>
     /// An internal implementation of <see cref="IAccountStateDelta"/>.

diff --git a/Libplanet.Action/State/AccountStateDeltaExtensions.cs b/Libplanet.Action/State/AccountStateDeltaExtensions.cs
@@ -4,9 +4,9 @@
 using Bencodex.Types;
 using Libplanet.Common.Crypto;
 using Libplanet.Common.Types.Assets;
-using static Libplanet.State.KeyConverters;
+using static Libplanet.Action.State.KeyConverters;
 
-namespace Libplanet.State
+namespace Libplanet.Action.State
 {
     public static class AccountStateDeltaExtensions
     {

diff --git a/Libplanet.Action/Blocks/BlockState.cs → Libplanet.Action/State/BlockState.cs b/Libplanet.Action/Blocks/BlockState.cs → Libplanet.Action/State/BlockState.cs
@@ -5,12 +5,11 @@
 using Libplanet.Common.Types.Assets;
 using Libplanet.Common.Types.Blocks;
 using Libplanet.Common.Types.Consensus;
-using Libplanet.State;
 using Libplanet.Store;
 using Libplanet.Store.Trie;
-using static Libplanet.State.KeyConverters;
+using static Libplanet.Action.State.KeyConverters;
 
-namespace Libplanet.Blocks
+namespace Libplanet.Action.State
 {
     /// <summary>
     /// A default implementation of <see cref="IBlockState"/> interface.

diff --git a/Libplanet.Action/Blocks/BlockStateCache.cs → Libplanet.Action/State/BlockStateCache.cs b/Libplanet.Action/Blocks/BlockStateCache.cs → Libplanet.Action/State/BlockStateCache.cs
@@ -5,7 +5,7 @@
 using LruCacheNet;
 using Serilog;
 
-namespace Libplanet.Blocks
+namespace Libplanet.Action.State
 {
     internal class BlockStateCache
     {

diff --git a/Libplanet.Action/State/CurrencyPermissionException.cs b/Libplanet.Action/State/CurrencyPermissionException.cs
@@ -2,7 +2,7 @@
 using Libplanet.Common.Crypto;
 using Libplanet.Common.Types.Assets;
 
-namespace Libplanet.State
+namespace Libplanet.Action.State
 {
     /// <summary>
     /// The exception that is thrown when a <see cref="TransactionSigner"/> has no rights

diff --git a/Libplanet.Action/State/IAccountDelta.cs b/Libplanet.Action/State/IAccountDelta.cs
@@ -6,7 +6,7 @@
 using Libplanet.Common.Types.Assets;
 using Libplanet.Common.Types.Consensus;
 
-namespace Libplanet.State
+namespace Libplanet.Action.State
 {
     public interface IAccountDelta
     {

diff --git a/Libplanet.Action/State/IAccountState.cs b/Libplanet.Action/State/IAccountState.cs
@@ -5,7 +5,7 @@
 using Libplanet.Common.Types.Assets;
 using Libplanet.Common.Types.Consensus;
 
-namespace Libplanet.State
+namespace Libplanet.Action.State
 {
     /// <summary>
     /// An interface to fetch account states.

diff --git a/Libplanet.Action/State/IAccountStateDelta.cs b/Libplanet.Action/State/IAccountStateDelta.cs
@@ -3,13 +3,12 @@
 using System.Collections.Immutable;
 using System.Diagnostics.Contracts;
 using Bencodex.Types;
-using Libplanet.Action;
 using Libplanet.Common.Crypto;
 using Libplanet.Common.Types.Assets;
 using Libplanet.Common.Types.Blocks;
 using Libplanet.Common.Types.Consensus;
 
-namespace Libplanet.State
+namespace Libplanet.Action.State
 {
     /// <summary>
     /// An interface to manipulate an account state with

diff --git a/...et.Action/BlockChain/IBlockChainStates.cs → Libplanet.Action/State/IBlockChainStates.cs b/...et.Action/BlockChain/IBlockChainStates.cs → Libplanet.Action/State/IBlockChainStates.cs
@@ -1,15 +1,13 @@
 using System;
 using System.Collections.Generic;
 using Bencodex.Types;
-using Libplanet.Blocks;
 using Libplanet.Common.Crypto;
 using Libplanet.Common.Types.Assets;
 using Libplanet.Common.Types.Blocks;
 using Libplanet.Common.Types.Consensus;
-using Libplanet.State;
 using Libplanet.Store;
 
-namespace Libplanet.Blockchain
+namespace Libplanet.Action.State
 {
     /// <summary>
     /// A minimal interface to get states from a <see cref="BlockChain"/>.

diff --git a/Libplanet.Action/Blocks/IBlockState.cs → Libplanet.Action/State/IBlockState.cs b/Libplanet.Action/Blocks/IBlockState.cs → Libplanet.Action/State/IBlockState.cs
@@ -1,7 +1,6 @@
 using Libplanet.Common.Types.Blocks;
-using Libplanet.State;
 
-namespace Libplanet.Blocks
+namespace Libplanet.Action.State
 {
     /// <summary>
     /// A minimal interface to get states from the output state of a <see cref="Block"/>.

diff --git a/Libplanet.Action/State/InsufficientBalanceException.cs b/Libplanet.Action/State/InsufficientBalanceException.cs
@@ -4,7 +4,7 @@
 using Libplanet.Common.Serialization;
 using Libplanet.Common.Types.Assets;
 
-namespace Libplanet.State
+namespace Libplanet.Action.State
 {
     /// <summary>
     /// The exception that is thrown when a sender has less <see cref="Balance"/> than amount to

diff --git a/Libplanet.Action/State/KeyConverters.cs b/Libplanet.Action/State/KeyConverters.cs
@@ -2,7 +2,7 @@
 using Libplanet.Common.Crypto;
 using Libplanet.Common.Types.Assets;
 
-namespace Libplanet.State
+namespace Libplanet.Action.State
 {
     internal static class KeyConverters
     {

diff --git a/Libplanet.Action/State/SupplyOverflowException.cs b/Libplanet.Action/State/SupplyOverflowException.cs
@@ -3,7 +3,7 @@
 using Libplanet.Common.Serialization;
 using Libplanet.Common.Types.Assets;
 
-namespace Libplanet.State
+namespace Libplanet.Action.State
 {
     /// <summary>
     /// The exception thrown when a minter tries to mint a currency such that the resulting total

diff --git a/Libplanet.Action/State/TotalSupplyNotTrackableException.cs b/Libplanet.Action/State/TotalSupplyNotTrackableException.cs
@@ -3,7 +3,7 @@
 using Libplanet.Common.Serialization;
 using Libplanet.Common.Types.Assets;
 
-namespace Libplanet.State
+namespace Libplanet.Action.State
 {
     /// <summary>
     /// The exception thrown when <see cref="IAccountState.GetTotalSupply"/> was called on a

diff --git a/Libplanet.Action/Action/Sys/Initialize.cs → Libplanet.Action/Sys/Initialize.cs b/Libplanet.Action/Action/Sys/Initialize.cs → Libplanet.Action/Sys/Initialize.cs
@@ -4,9 +4,9 @@
 using System.Linq;
 using System.Reflection;
 using Bencodex.Types;
+using Libplanet.Action.State;
 using Libplanet.Common.Crypto;
 using Libplanet.Common.Types.Consensus;
-using Libplanet.State;
 
 namespace Libplanet.Action.Sys
 {

diff --git a/Libplanet.Action/Action/Sys/Registry.cs → Libplanet.Action/Sys/Registry.cs b/Libplanet.Action/Action/Sys/Registry.cs → Libplanet.Action/Sys/Registry.cs
@@ -6,7 +6,7 @@
 
 namespace Libplanet.Action.Sys
 {
-    internal static class Registry
+    public static class Registry
     {
         public static readonly Dictionary<IValue, Type> Types;
 

diff --git a/...tion/Action/Sys/SysActionJsonConverter.cs → ...anet.Action/Sys/SysActionJsonConverter.cs b/...tion/Action/Sys/SysActionJsonConverter.cs → ...anet.Action/Sys/SysActionJsonConverter.cs
diff --git a/.../UnexpectedlyTerminatedActionException.cs → .../UnexpectedlyTerminatedActionException.cs b/.../UnexpectedlyTerminatedActionException.cs → .../UnexpectedlyTerminatedActionException.cs
diff --git a/Libplanet.Explorer.Tests/Queries/StateQueryTest.cs b/Libplanet.Explorer.Tests/Queries/StateQueryTest.cs
@@ -6,13 +6,12 @@
 using Bencodex.Types;
 using GraphQL;
 using GraphQL.Execution;
-using Libplanet.Blockchain;
+using Libplanet.Action.State;
 using Libplanet.Blockchain.Policies;
-using Libplanet.Blocks;
 using Libplanet.Common.Crypto;
 using Libplanet.Common.Types.Assets;
 using Libplanet.Common.Types.Blocks;
-using Libplanet.Consensus;
+using Libplanet.Common.Types.Consensus;
 using Libplanet.Explorer.Queries;
 using Xunit;
 using static Libplanet.Explorer.Tests.GraphQLTestUtils;

diff --git a/Libplanet.Explorer.Tests/Queries/TransactionQueryTest.cs b/Libplanet.Explorer.Tests/Queries/TransactionQueryTest.cs
@@ -13,6 +13,7 @@
 using Libplanet.Common;
 using Libplanet.Common.Crypto;
 using Libplanet.Common.Types.Assets;
+using Libplanet.Common.Types.Consensus;
 using Libplanet.Common.Types.Tx;
 using Libplanet.Consensus;
 using Libplanet.Explorer.Queries;

diff --git a/Libplanet.Explorer.Tests/SimpleAction.cs b/Libplanet.Explorer.Tests/SimpleAction.cs
@@ -2,7 +2,7 @@
 using System.Reflection;
 using Bencodex.Types;
 using Libplanet.Action;
-using Libplanet.State;
+using Libplanet.Action.State;
 
 namespace Libplanet.Explorer.Tests;
 

diff --git a/Libplanet.Explorer/GraphTypes/ValidatorType.cs b/Libplanet.Explorer/GraphTypes/ValidatorType.cs
@@ -1,4 +1,5 @@
 using GraphQL.Types;
+using Libplanet.Common.Types.Consensus;
 using Libplanet.Consensus;
 
 namespace Libplanet.Explorer.GraphTypes;

diff --git a/Libplanet.Explorer/Queries/BlockQuery.cs b/Libplanet.Explorer/Queries/BlockQuery.cs
@@ -1,7 +1,6 @@
 #nullable disable
 using GraphQL;
 using GraphQL.Types;
-using Libplanet.Blocks;
 using Libplanet.Common.Crypto;
 using Libplanet.Common.Types.Blocks;
 using Libplanet.Explorer.GraphTypes;

diff --git a/Libplanet.Explorer/Queries/ExplorerQuery.cs b/Libplanet.Explorer/Queries/ExplorerQuery.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using GraphQL.Types;
+using Libplanet.Action.State;
 using Libplanet.Blockchain;
 using Libplanet.Common.Crypto;
 using Libplanet.Common.Types.Blocks;

diff --git a/Libplanet.Explorer/Queries/StateQuery.cs b/Libplanet.Explorer/Queries/StateQuery.cs
@@ -1,9 +1,8 @@
 using System;
 using GraphQL;
 using GraphQL.Types;
-using Libplanet.Blockchain;
+using Libplanet.Action.State;
 using Libplanet.Blockchain.Policies;
-using Libplanet.Blocks;
 using Libplanet.Common.Crypto;
 using Libplanet.Common.Types.Assets;
 using Libplanet.Common.Types.Blocks;

diff --git a/Libplanet.Extensions.Cocona/Utils.cs b/Libplanet.Extensions.Cocona/Utils.cs
@@ -8,8 +8,8 @@
 using Bencodex.Types;
 using global::Cocona;
 using Libplanet.Action;
+using Libplanet.Action.State;
 using Libplanet.Common.JsonConverters;
-using Libplanet.State;
 using Libplanet.Store;
 
 namespace Libplanet.Extensions.Cocona;

diff --git a/Libplanet.Net.Tests/SwarmTest.cs b/Libplanet.Net.Tests/SwarmTest.cs
@@ -9,6 +9,7 @@
 using System.Threading.Tasks;
 using Bencodex.Types;
 using Libplanet.Action;
+using Libplanet.Action.State;
 using Libplanet.Blockchain;
 using Libplanet.Blockchain.Policies;
 using Libplanet.Blockchain.Renderers.Debug;
@@ -21,7 +22,6 @@
 using Libplanet.Net.Options;
 using Libplanet.Net.Protocols;
 using Libplanet.Net.Transports;
-using Libplanet.State;
 using Libplanet.Store;
 using Libplanet.Store.Trie;
 using Libplanet.Stun;