Added suggested changes

Co-authored-by: ilgyu <[email protected]>
planetarium · Jun 21, 2024 · 48e13a9 · 48e13a9
1 parent 0b86001
commit 48e13a9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/Libplanet.Net.Tests/Consensus/ContextTest.cs b/Libplanet.Net.Tests/Consensus/ContextTest.cs
@@ -323,7 +323,7 @@ void BroadcastMessage(ConsensusMsg message) =>
                 1L,
                 TestUtils.PrivateKeys[0],
                 blockChain
-                    .GetNextWorldState(0)
+                    .GetNextWorldState(0L)
                     .GetValidatorSet(),
                 contextTimeoutOptions: new ContextTimeoutOption());
 

diff --git a/Libplanet.Tests/Action/WorldTest.cs b/Libplanet.Tests/Action/WorldTest.cs
@@ -260,11 +260,13 @@ public virtual void TransferAssetInBlock()
             chain.Append(block1, TestUtils.CreateBlockCommit(block1));
             Assert.Equal(
                 DumbAction.DumbCurrency * 0,
-                GetLatestWorldState(chain)
+                chain
+                    .GetNextWorldState()
                     .GetBalance(_addr[0], DumbAction.DumbCurrency));
             Assert.Equal(
                 DumbAction.DumbCurrency * 20,
-                GetLatestWorldState(chain)
+                chain
+                    .GetNextWorldState()
                     .GetBalance(_addr[1], DumbAction.DumbCurrency));
 
             // Transfer
@@ -288,11 +290,13 @@ public virtual void TransferAssetInBlock()
             chain.Append(block2, TestUtils.CreateBlockCommit(block2));
             Assert.Equal(
                 DumbAction.DumbCurrency * 5,
-                GetLatestWorldState(chain)
+                chain
+                    .GetNextWorldState()
                     .GetBalance(_addr[0], DumbAction.DumbCurrency));
             Assert.Equal(
                 DumbAction.DumbCurrency * 15,
-                GetLatestWorldState(chain)
+                chain
+                    .GetNextWorldState()
                     .GetBalance(_addr[1], DumbAction.DumbCurrency));
 
             // Transfer bugged
@@ -504,9 +508,6 @@ public virtual void TotalSupplyTracking()
                 world.GetTotalSupply(_currencies[4]));
         }
 
-        protected static IWorldState GetLatestWorldState(BlockChain blockChain) =>
-            blockChain.GetNextWorldState();
-
         protected FungibleAssetValue Value(int currencyIndex, BigInteger quantity) =>
             new FungibleAssetValue(_currencies[currencyIndex], quantity, 0);
     }

diff --git a/Libplanet.Tests/Blockchain/BlockChainTest.cs b/Libplanet.Tests/Blockchain/BlockChainTest.cs
@@ -2314,15 +2314,15 @@ private void ValidateNextBlockCommitOnValidatorSetChange()
 
             Assert.Equal(
                 blockChain
-                    .GetNextWorldState(0)
+                    .GetNextWorldState(0L)
                     .GetValidatorSet(),
                 new ValidatorSet(
                     ValidatorPrivateKeys.Select(
                         pk => new Validator(pk.PublicKey, BigInteger.One)).ToList()));
 
             Assert.Equal(
                 blockChain
-                    .GetNextWorldState(1)
+                    .GetNextWorldState(1L)
                     .GetValidatorSet(),
                 new ValidatorSet(
                     newValidators.Select(

diff --git a/Libplanet/Blockchain/BlockChain.States.cs b/Libplanet/Blockchain/BlockChain.States.cs
@@ -28,13 +28,13 @@ public IWorldState GetWorldState(HashDigest<SHA256>? stateRootHash)
         /// <returns>The next world state.  If it does not exist, returns null.</returns>
         public IWorldState? GetNextWorldState()
         {
-            if (GetNextStateRootHash() is { } srh)
+            if (GetNextStateRootHash() is { } nsrh)
             {
-                var trie = StateStore.GetStateRoot(srh);
+                var trie = StateStore.GetStateRoot(nsrh);
                 return trie.Recorded
                     ? new WorldBaseState(trie, StateStore)
                     : throw new InvalidOperationException(
-                        $"Could not find state root {srh} in {nameof(StateStore)} for " +
+                        $"Could not find state root {nsrh} in {nameof(StateStore)} for " +
                         $"the current tip.");
             }
             else