From 33e84fa3d8b3aa6544f34227330b0a4868114be1 Mon Sep 17 00:00:00 2001
From: Ko Chanhyuck <limeelbee@gmail.com>
Date: Wed, 15 Nov 2023 17:21:11 +0900
Subject: [PATCH] test: fix tests  [skip changelog]

---
 Libplanet.Action.Tests/ActionEvaluationTest.cs | 11 ++++++-----
 Libplanet.Action.Tests/Mocks/MockWorldState.cs | 10 +++++++---
 Libplanet.Action.Tests/Sys/InitializeTest.cs   |  8 +++-----
 Libplanet.Action.Tests/Sys/RegistryTest.cs     |  6 ++----
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/Libplanet.Action.Tests/ActionEvaluationTest.cs b/Libplanet.Action.Tests/ActionEvaluationTest.cs
index 1c0c1cfc3f6..ea3235b59d6 100644
--- a/Libplanet.Action.Tests/ActionEvaluationTest.cs
+++ b/Libplanet.Action.Tests/ActionEvaluationTest.cs
@@ -27,8 +27,12 @@ public ActionEvaluationTest(ITestOutputHelper output)
         [Fact]
         public void Constructor()
         {
-            var txid = new System.Random().NextTxId();
             Address address = new PrivateKey().ToAddress();
+            IWorld world = new World(new MockWorldState());
+            world = world.SetAccount(
+                ReservedAddresses.LegacyAccount,
+                world.GetAccount(ReservedAddresses.LegacyAccount).SetState(address, (Text)"item"));
+            var txid = new System.Random().NextTxId();
             var evaluation = new ActionEvaluation(
                 new DumbAction(address, "item"),
                 new ActionContext(
@@ -41,10 +45,7 @@ public void Constructor()
                     123,
                     0,
                     false),
-                new World(
-                    new MockWorldState().SetAccountState(
-                        ReservedAddresses.LegacyAccount,
-                        new Account(new MockAccountState().SetState(address, (Text)"item"))))
+                world
             );
             var action = (DumbAction)evaluation.Action;
 
diff --git a/Libplanet.Action.Tests/Mocks/MockWorldState.cs b/Libplanet.Action.Tests/Mocks/MockWorldState.cs
index a7545671be0..24968ec633b 100644
--- a/Libplanet.Action.Tests/Mocks/MockWorldState.cs
+++ b/Libplanet.Action.Tests/Mocks/MockWorldState.cs
@@ -22,6 +22,7 @@ public MockWorldState(
             IStateStore stateStore,
             HashDigest<SHA256>? stateRootHash = null)
         {
+            _stateStore = stateStore;
             Trie = stateStore.GetStateRoot(stateRootHash);
             Legacy = Trie
                 .Get(new[]
@@ -37,9 +38,12 @@ public MockWorldState(
 
         public IAccount GetAccount(Address address)
             => Legacy && address.Equals(ReservedAddresses.LegacyAccount)
-            ? new Account(new MockAccountState(_stateStore, Trie.Hash))
-            : new Account(new MockAccountState(
-                _stateStore, new HashDigest<SHA256>(Trie.Get(ToStateKey(address)))));
+                ? new Account(new MockAccountState(_stateStore, Trie.Hash))
+                : new Account(new MockAccountState(
+                    _stateStore,
+                    Trie.Get(ToStateKey(address)) is { } stateRootNotNull
+                        ? new HashDigest<SHA256>(stateRootNotNull)
+                        : null));
 
         public IWorldState SetAccountState(Address address, IAccount account)
             => Legacy && address.Equals(ReservedAddresses.LegacyAccount)
diff --git a/Libplanet.Action.Tests/Sys/InitializeTest.cs b/Libplanet.Action.Tests/Sys/InitializeTest.cs
index 51b2287aeb4..af8aefac8a7 100644
--- a/Libplanet.Action.Tests/Sys/InitializeTest.cs
+++ b/Libplanet.Action.Tests/Sys/InitializeTest.cs
@@ -67,7 +67,7 @@ public void Execute()
                 nextState.GetAccount(ReservedAddresses.LegacyAccount).GetValidatorSet());
             Assert.Equal(
                 _states[default],
-                nextState.GetAccount(default).GetState(default));
+                nextState.GetAccount(ReservedAddresses.LegacyAccount).GetState(default));
         }
 
         [Fact]
@@ -113,8 +113,7 @@ public void Serialize()
                             _validatorSet.Bencoded,
                             Dictionary.Empty.Add(
                                 default(Address).ToByteArray(),
-                                Dictionary.Empty.Add(default(Address).ToByteArray(), "initial value"
-                                )))),
+                                "initial value"))),
                 action.PlainValue);
         }
 
@@ -129,8 +128,7 @@ public void Deserialize()
                         _validatorSet.Bencoded,
                         Dictionary.Empty.Add(
                             default(Address).ToByteArray(),
-                            Dictionary.Empty.Add(default(Address).ToByteArray(), "initial value"
-                            ))));
+                            "initial value")));
             var action = new Initialize();
             action.LoadPlainValue(encoded);
 
diff --git a/Libplanet.Action.Tests/Sys/RegistryTest.cs b/Libplanet.Action.Tests/Sys/RegistryTest.cs
index f72a6deef8d..55e586d5d94 100644
--- a/Libplanet.Action.Tests/Sys/RegistryTest.cs
+++ b/Libplanet.Action.Tests/Sys/RegistryTest.cs
@@ -39,8 +39,7 @@ public void Deserialize()
                         _validatorSet.Bencoded,
                         Dictionary.Empty.Add(
                             default(Address).ToByteArray(),
-                            Dictionary.Empty.Add(default(Address).ToByteArray(), "initial value"
-                            ))));
+                            "initial value")));
             IAction action = Registry.Deserialize(value);
             var initialize = Assert.IsType<Initialize>(action);
             Assert.Equal(_validatorSet, initialize.ValidatorSet);
@@ -88,8 +87,7 @@ public void Serialize()
                         _validatorSet.Bencoded,
                         Dictionary.Empty.Add(
                             default(Address).ToByteArray(),
-                            Dictionary.Empty.Add(default(Address).ToByteArray(), "initial value"
-                            ))));
+                            "initial value")));
             TestUtils.AssertBencodexEqual(expected, actual);
         }