Merge pull request #3337 from OnedgeLee/feature/world-state

Rename `IAccountStateDelta` as `IAccount`
planetarium · Jul 31, 2023 · 62860a3 · 62860a3
2 parents 57dea63 + a831b2b
commit 62860a3
Show file tree

Hide file tree

Showing 57 changed files with 303 additions and 298 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -10,6 +10,9 @@ To be released.
 
 ### Backward-incompatible API changes
 
+ -  (Libplanet.Action) Renamed `IAccountStateDelta` as `IAccount`.
+    [[#3337]]
+
 ### Backward-incompatible network protocol changes
 
 ### Backward-incompatible storage format changes
@@ -24,6 +27,8 @@ To be released.
 
 ### CLI tools
 
+[#3337]: https://github.com/planetarium/libplanet/pull/3337
+
 
 Version 3.1.0
 -------------

diff --git a/Libplanet.Action.Tests/ActionContextTest.cs b/Libplanet.Action.Tests/ActionContextTest.cs
@@ -36,7 +36,7 @@ public void RandomShouldBeDeterministic()
                     miner: _address,
                     blockIndex: 1,
                     blockProtocolVersion: Block.CurrentProtocolVersion,
-                    previousState: AccountStateDelta.Create(MockAccountState.Empty),
+                    previousState: Account.Create(MockAccountState.Empty),
                     randomSeed: seed,
                     gasLimit: 0
                 );
@@ -54,7 +54,7 @@ public void GuidShouldBeDeterministic()
                 miner: _address,
                 blockIndex: 1,
                 blockProtocolVersion: Block.CurrentProtocolVersion,
-                previousState: AccountStateDelta.Create(MockAccountState.Empty),
+                previousState: Account.Create(MockAccountState.Empty),
                 randomSeed: 0,
                 gasLimit: 0
             );
@@ -65,7 +65,7 @@ public void GuidShouldBeDeterministic()
                 miner: _address,
                 blockIndex: 1,
                 blockProtocolVersion: Block.CurrentProtocolVersion,
-                previousState: AccountStateDelta.Create(MockAccountState.Empty),
+                previousState: Account.Create(MockAccountState.Empty),
                 randomSeed: 0,
                 gasLimit: 0
             );
@@ -76,7 +76,7 @@ public void GuidShouldBeDeterministic()
                 miner: _address,
                 blockIndex: 1,
                 blockProtocolVersion: Block.CurrentProtocolVersion,
-                previousState: AccountStateDelta.Create(MockAccountState.Empty),
+                previousState: Account.Create(MockAccountState.Empty),
                 randomSeed: 1,
                 gasLimit: 0
             );
@@ -112,7 +112,7 @@ public void GuidVersionAndVariant()
                     miner: _address,
                     blockIndex: 1,
                     blockProtocolVersion: Block.CurrentProtocolVersion,
-                    previousState: AccountStateDelta.Create(MockAccountState.Empty),
+                    previousState: Account.Create(MockAccountState.Empty),
                     randomSeed: i,
                     gasLimit: 0
                 );
@@ -132,7 +132,7 @@ public void GetUnconsumedContext()
                 miner: _address,
                 blockIndex: 1,
                 blockProtocolVersion: Block.CurrentProtocolVersion,
-                previousState: AccountStateDelta.Create(MockAccountState.Empty),
+                previousState: Account.Create(MockAccountState.Empty),
                 randomSeed: _random.Next(),
                 gasLimit: 0);
 

diff --git a/Libplanet.Action.Tests/ActionEvaluationTest.cs b/Libplanet.Action.Tests/ActionEvaluationTest.cs
@@ -37,12 +37,12 @@ public void Constructor()
                     address,
                     1,
                     Block.CurrentProtocolVersion,
-                    AccountStateDelta.Create(MockAccountState.Empty),
+                    Account.Create(MockAccountState.Empty),
                     123,
                     0,
                     false
                 ),
-                AccountStateDelta.Create(
+                Account.Create(
                     MockAccountState.Empty
                         .SetState(address, (Text)"item"))
             );

diff --git a/Libplanet.Action.Tests/Common/Attack.cs b/Libplanet.Action.Tests/Common/Attack.cs
@@ -29,11 +29,11 @@ public override void LoadPlainValue(IValue plainValue)
             TargetAddress = new Address(values["target_address"]);
         }
 
-        public override IAccountStateDelta Execute(IActionContext context)
+        public override IAccount Execute(IActionContext context)
         {
             IImmutableSet<string> usedWeapons = ImmutableHashSet<string>.Empty;
             IImmutableSet<string> targets = ImmutableHashSet<string>.Empty;
-            IAccountStateDelta previousState = context.PreviousState;
+            IAccount previousState = context.PreviousState;
 
             object value = previousState.GetState(TargetAddress);
             if (!ReferenceEquals(value, null))

diff --git a/Libplanet.Action.Tests/Common/BaseAction.cs b/Libplanet.Action.Tests/Common/BaseAction.cs
@@ -15,7 +15,7 @@ public abstract class BaseAction : IAction
 
         public abstract IValue PlainValue { get; }
 
-        public abstract IAccountStateDelta Execute(IActionContext context);
+        public abstract IAccount Execute(IActionContext context);
 
         public abstract void LoadPlainValue(IValue plainValue);
 

diff --git a/Libplanet.Action.Tests/Common/DelayAction.cs b/Libplanet.Action.Tests/Common/DelayAction.cs
@@ -31,7 +31,7 @@ public IValue PlainValue
             }
         }
 
-        public IAccountStateDelta Execute(IActionContext context)
+        public IAccount Execute(IActionContext context)
         {
             var state = context.PreviousState;
             var started = DateTimeOffset.UtcNow;

diff --git a/Libplanet.Action.Tests/Common/DetectRehearsal.cs b/Libplanet.Action.Tests/Common/DetectRehearsal.cs
@@ -22,9 +22,9 @@ public override void LoadPlainValue(IValue plainValue)
             TargetAddress = new Address(values["target_address"]);
         }
 
-        public override IAccountStateDelta Execute(IActionContext context)
+        public override IAccount Execute(IActionContext context)
         {
-            IAccountStateDelta previousState = context.PreviousState;
+            IAccount previousState = context.PreviousState;
             ResultState = context.Rehearsal;
             return previousState.SetState(
                 TargetAddress,

diff --git a/Libplanet.Action.Tests/Common/DumbAction.cs b/Libplanet.Action.Tests/Common/DumbAction.cs
@@ -131,7 +131,7 @@ public IValue PlainValue
             }
         }
 
-        public IAccountStateDelta Execute(IActionContext context)
+        public IAccount Execute(IActionContext context)
         {
             if (RehearsalRecords.Value is null)
             {
@@ -144,7 +144,7 @@ public IAccountStateDelta Execute(IActionContext context)
                     RehearsalRecords.Value.Add((TargetAddress, Item));
             }
 
-            IAccountStateDelta states = context.PreviousState;
+            IAccount states = context.PreviousState;
             if (Item is null)
             {
                 return states;
@@ -187,7 +187,7 @@ public IAccountStateDelta Execute(IActionContext context)
                 Item = Item.ToUpperInvariant();
             }
 
-            IAccountStateDelta nextState = states.SetState(TargetAddress, (Text)items);
+            IAccount nextState = states.SetState(TargetAddress, (Text)items);
 
             if (!(Transfer is null))
             {

diff --git a/Libplanet.Action.Tests/Common/ExecuteRecord.cs b/Libplanet.Action.Tests/Common/ExecuteRecord.cs
@@ -6,7 +6,7 @@ public struct ExecuteRecord
     {
         public IAction Action { get; set; }
 
-        public IAccountStateDelta NextState { get; set; }
+        public IAccount NextState { get; set; }
 
         public bool Rehearsal { get; set; }
 

diff --git a/Libplanet.Action.Tests/Common/MinerReward.cs b/Libplanet.Action.Tests/Common/MinerReward.cs
@@ -36,9 +36,9 @@ public void LoadPlainValue(Dictionary plainValue)
             Reward = plainValue.GetValue<Integer>("reward");
         }
 
-        public IAccountStateDelta Execute(IActionContext ctx)
+        public IAccount Execute(IActionContext ctx)
         {
-            IAccountStateDelta states = ctx.PreviousState;
+            IAccount states = ctx.PreviousState;
 
             string rewardRecord = (Text?)states.GetState(RewardRecordAddress);
 

diff --git a/Libplanet.Action.Tests/Common/RandomAction.cs b/Libplanet.Action.Tests/Common/RandomAction.cs
@@ -28,9 +28,9 @@ public void LoadPlainValue(IValue plainValue)
             Address = new Address((string)dictionary.GetValue<Text>("address"));
         }
 
-        public IAccountStateDelta Execute(IActionContext context)
+        public IAccount Execute(IActionContext context)
         {
-            IAccountStateDelta states = context.PreviousState;
+            IAccount states = context.PreviousState;
             if (context.Rehearsal)
             {
                 return states.SetState(Address, Null.Value);

diff --git a/Libplanet.Action.Tests/Common/SetStatesAtBlock.cs b/Libplanet.Action.Tests/Common/SetStatesAtBlock.cs
@@ -34,9 +34,9 @@ public void LoadPlainValue(IValue plainValue)
             _blockIndex = dict.GetValue<Bencodex.Types.Integer>("block_index");
         }
 
-        public IAccountStateDelta Execute(IActionContext context)
+        public IAccount Execute(IActionContext context)
         {
-            IAccountStateDelta states = context.PreviousState;
+            IAccount states = context.PreviousState;
             if (context.BlockIndex == _blockIndex)
             {
                 states = states.SetState(_address, _value);

diff --git a/Libplanet.Action.Tests/Common/SetValidator.cs b/Libplanet.Action.Tests/Common/SetValidator.cs
@@ -37,7 +37,7 @@ public void LoadPlainValue(IValue plainValue)
         }
 
         /// <inheritdoc cref="IAction.Execute(IActionContext)"/>
-        public IAccountStateDelta Execute(IActionContext context)
+        public IAccount Execute(IActionContext context)
         {
             return context.PreviousState.SetValidator(Validator);
         }

diff --git a/Libplanet.Action.Tests/Common/Sleep.cs b/Libplanet.Action.Tests/Common/Sleep.cs
@@ -13,7 +13,7 @@ public class Sleep : BaseAction
             .Add("values", Dictionary.Empty
                 .Add("zone_id", ZoneId));
 
-        public override IAccountStateDelta Execute(IActionContext context)
+        public override IAccount Execute(IActionContext context)
         {
             // No-op.
             return context.PreviousState;

diff --git a/Libplanet.Action.Tests/Common/ThrowException.cs b/Libplanet.Action.Tests/Common/ThrowException.cs
@@ -36,7 +36,7 @@ public void LoadPlainValue(Dictionary plainValue)
             Deterministic = plainValue.GetValue<Boolean>("deterministic");
         }
 
-        public IAccountStateDelta Execute(IActionContext context)
+        public IAccount Execute(IActionContext context)
         {
             if (context.Rehearsal ? ThrowOnRehearsal : ThrowOnExecution)
             {

diff --git a/Libplanet.Action.Tests/Sys/InitializeTest.cs b/Libplanet.Action.Tests/Sys/InitializeTest.cs
@@ -42,7 +42,7 @@ public void Execute()
         {
             var random = new System.Random();
             Address signer = random.NextAddress();
-            var prevState = AccountStateDelta.Create(MockAccountState.Empty);
+            var prevState = Account.Create(MockAccountState.Empty);
             BlockHash genesisHash = random.NextBlockHash();
             var context = new ActionContext(
                 signer: signer,
@@ -70,7 +70,7 @@ public void ExecuteInNonGenesis()
         {
             var random = new System.Random();
             Address signer = random.NextAddress();
-            var prevState = AccountStateDelta.Create(MockAccountState.Empty);
+            var prevState = Account.Create(MockAccountState.Empty);
             BlockHash genesisHash = random.NextBlockHash();
             var context = new ActionContext(
                 signer: signer,

diff --git a/Libplanet.Action/AccountStateDeltaMetrics.cs → Libplanet.Action/AccountMetrics.cs b/Libplanet.Action/AccountStateDeltaMetrics.cs → Libplanet.Action/AccountMetrics.cs
@@ -3,7 +3,7 @@
 
 namespace Libplanet.Action
 {
-    public static class AccountStateDeltaMetrics
+    public static class AccountMetrics
     {
         public static readonly AsyncLocal<Stopwatch> GetStateTimer = new AsyncLocal<Stopwatch>();
         public static readonly AsyncLocal<int> GetStateCount = new AsyncLocal<int>();

diff --git a/Libplanet.Action/ActionContext.cs b/Libplanet.Action/ActionContext.cs
@@ -20,7 +20,7 @@ public ActionContext(
             Address miner,
             long blockIndex,
             int blockProtocolVersion,
-            IAccountStateDelta previousState,
+            IAccount previousState,
             int randomSeed,
             long gasLimit,
             bool rehearsal = false)
@@ -58,7 +58,7 @@ public ActionContext(
         public bool Rehearsal { get; }
 
         /// <inheritdoc cref="IActionContext.PreviousState"/>
-        public IAccountStateDelta PreviousState { get; }
+        public IAccount PreviousState { get; }
 
         /// <inheritdoc cref="IActionContext.Random"/>
         public IRandom Random { get; }

diff --git a/Libplanet.Action/ActionEvaluation.cs b/Libplanet.Action/ActionEvaluation.cs
@@ -24,7 +24,7 @@ public class ActionEvaluation : IActionEvaluation
         public ActionEvaluation(
             IAction action,
             IActionContext inputContext,
-            IAccountStateDelta outputState,
+            IAccount outputState,
             Exception? exception = null)
         {
             Action = action;
@@ -51,7 +51,7 @@ public ActionEvaluation(
         /// <summary>
         /// The result states that <see cref="Action"/> makes.
         /// </summary>
-        public IAccountStateDelta OutputState { get; }
+        public IAccount OutputState { get; }
 
         /// <summary>
         /// An exception that had risen during evaluation.