feat: Remove World.Create()

planetarium · Nov 2, 2023 · f42967f · f42967f
1 parent 200b7ad
commit f42967f
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 25 deletions.
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: World.Create(new MockWorldState()),
+                    previousState: new World(new MockWorldState()),
                     randomSeed: seed,
                     gasLimit: 0
                 );
@@ -54,7 +54,7 @@ public void GuidShouldBeDeterministic()
                 miner: _address,
                 blockIndex: 1,
                 blockProtocolVersion: Block.CurrentProtocolVersion,
-                previousState: World.Create(new MockWorldState()),
+                previousState: new World(new MockWorldState()),
                 randomSeed: 0,
                 gasLimit: 0
             );
@@ -65,7 +65,7 @@ public void GuidShouldBeDeterministic()
                 miner: _address,
                 blockIndex: 1,
                 blockProtocolVersion: Block.CurrentProtocolVersion,
-                previousState: World.Create(new MockWorldState()),
+                previousState: new World(new MockWorldState()),
                 randomSeed: 0,
                 gasLimit: 0
             );
@@ -76,7 +76,7 @@ public void GuidShouldBeDeterministic()
                 miner: _address,
                 blockIndex: 1,
                 blockProtocolVersion: Block.CurrentProtocolVersion,
-                previousState: World.Create(new MockWorldState()),
+                previousState: new World(new MockWorldState()),
                 randomSeed: 1,
                 gasLimit: 0
             );
@@ -115,7 +115,7 @@ public void GuidVersionAndVariant()
                     miner: _address,
                     blockIndex: 1,
                     blockProtocolVersion: Block.CurrentProtocolVersion,
-                    previousState: World.Create(new MockWorldState()),
+                    previousState: new World(new MockWorldState()),
                     randomSeed: i,
                     gasLimit: 0
                 );

diff --git a/Libplanet.Action.Tests/ActionEvaluationTest.cs b/Libplanet.Action.Tests/ActionEvaluationTest.cs
@@ -37,11 +37,11 @@ public void Constructor()
                     address,
                     1,
                     Block.CurrentProtocolVersion,
-                    World.Create(new MockWorldState()),
+                    new World(new MockWorldState()),
                     123,
                     0,
                     false),
-                World.Create(
+                new World(
                     new MockWorldState().SetAccount(
                         ReservedAddresses.LegacyAccount,
                         new Account(MockAccountState.Empty.SetState(address, (Text)"item"))))

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

diff --git a/Libplanet.Action/State/World.cs b/Libplanet.Action/State/World.cs
@@ -23,7 +23,7 @@ public World(IWorldState baseState, IWorldDelta delta)
         {
             _baseState = baseState;
             Delta = delta;
-            Legacy = true;
+            Legacy = baseState.Legacy;
         }
 
         /// <inheritdoc/>
@@ -38,16 +38,6 @@ public World(IWorldState baseState, IWorldDelta delta)
         [Pure]
         public bool Legacy { get; private set; }
 
-        /// <summary>
-        /// Creates a new World from given <paramref name="previousWorld"/>.
-        /// </summary>
-        /// <param name="previousWorld">The previous <see cref="WorldBaseState"/> to initialize
-        /// new World.</param>
-        /// <returns>A null world using <paramref name="previousWorld"/> as its base state.
-        /// </returns>
-        public static IWorld Create(IWorldState previousWorld) =>
-            new World(previousWorld) { Legacy = previousWorld.Legacy };
-
         /// <summary>
         /// Creates a null worlds from given <see cref="IWorld"/>.
         /// </summary>

diff --git a/Libplanet.Tests/Action/AccountV0Test.cs b/Libplanet.Tests/Action/AccountV0Test.cs
@@ -26,7 +26,7 @@ public AccountV0Test(ITestOutputHelper output)
         public override IActionContext CreateContext(
             IAccount delta, Address signer)
         {
-            IWorld world = World.Create(new MockWorldState());
+            IWorld world = new World(new MockWorldState());
             world = world.SetAccount(_accountAddress, delta);
             return new ActionContext(
                 signer,

diff --git a/Libplanet.Tests/Action/AccountV1Test.cs b/Libplanet.Tests/Action/AccountV1Test.cs
@@ -28,7 +28,7 @@ public AccountV1Test(ITestOutputHelper output)
 
         public override IActionContext CreateContext(IAccount delta, Address signer)
         {
-            IWorld world = World.Create(new MockWorldState());
+            IWorld world = new World(new MockWorldState());
             world = world.SetAccount(_accountAddress, delta);
             return new ActionContext(
                 signer,

diff --git a/Libplanet.Tests/Blockchain/Renderers/AnonymousActionRendererTest.cs b/Libplanet.Tests/Blockchain/Renderers/AnonymousActionRendererTest.cs
@@ -16,7 +16,7 @@ public class AnonymousActionRendererTest
     {
         private static IValue _action = new DumbAction().PlainValue;
 
-        private static IWorld _world = World.Create(new MockWorldState());
+        private static IWorld _world = new World(new MockWorldState());
 
         private static ICommittedActionContext _actionContext =
             new CommittedActionContext(new ActionContext(

diff --git a/Libplanet.Tests/Blockchain/Renderers/LoggedActionRendererTest.cs b/Libplanet.Tests/Blockchain/Renderers/LoggedActionRendererTest.cs
@@ -23,7 +23,7 @@ public class LoggedActionRendererTest : IDisposable
     {
         private static IValue _action = new DumbAction().PlainValue;
 
-        private static IWorld _world = World.Create(new MockWorldState());
+        private static IWorld _world = new World(new MockWorldState());
 
         private static Block _genesis =
             TestUtils.ProposeGenesisBlock(TestUtils.GenesisProposer);

diff --git a/Libplanet.Tests/Fixtures/IntegerSet.cs b/Libplanet.Tests/Fixtures/IntegerSet.cs
@@ -180,7 +180,7 @@ public void Append(Block block) =>
             Chain.Append(block, TestUtils.CreateBlockCommit(block));
 
         public IWorld CreateWorld(BlockHash? offset = null)
-            => World.Create(Chain.GetWorldState(offset ?? Tip.Hash));
+            => new World(Chain.GetWorldState(offset ?? Tip.Hash));
 
         public ITrie GetTrie(BlockHash? blockHash)
         {