Revert "Merge pull request planetarium#3494 from limebell/feature/sys…

…tem-accounts" This reverts commit 11b9f54, reversing changes made to eabf0b3.
OnedgeLee · Nov 23, 2023 · e3734ca · e3734ca
1 parent 11b9f54
commit e3734ca
Show file tree

Hide file tree

Showing 73 changed files with 347 additions and 685 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -68,10 +68,6 @@ To be released.
  -  (Libplanet.Action) Type of `Initialize.States` property became
     `IImmutableDictionary<Address, IImmutableDictionary<Address, IValue>>?`.
     (was `IImmutableDictionary<Address, IValue>?`)  [[#3462]]
- -  (Libplanet.Action) New property `SystemAccounts` added to
-    `IActionContext` interface.  [[#3494]]
- -  (Libplanet.Action) New property `SystemAccountsGetter` added to
-    `IBlockPolicy` interface.  [[#3494]]
 
 
 ### Backward-incompatible network protocol changes
@@ -89,8 +85,6 @@ To be released.
      -  Added `WorldBaseState` class.
  -  (Libplanet.Action) Added `ReservedAddresses` static class.  [[#3462]]
  -  (Libplanet.Action) Added `WorldDeltaExtensions` static class.  [[#3462]]
- -  (Libplanet.Action) Added `ISystemAccounts` interface.  [[#3494]
- -  (Libplanet.Action) Added `ISystemAccountsGetter` interface.  [[#3494]]
  -  (Libplanet.Explorer) Added `AccountStateType` class.  [[#3462]]
  -  (Libplanet.Explorer) Added `WorldStateType` class.  [[#3462]]
  -  (Libplanet.Explorer) Added `WorldStateType` class.  [[#3462]]
@@ -123,7 +117,6 @@ To be released.
 ### CLI tools
 
 [#3462]: https://github.com/planetarium/libplanet/pull/3462
-[#3494]: https://github.com/planetarium/libplanet/pull/3494
 
 
 Version 3.7.0

diff --git a/Libplanet.Action.Tests/ActionContextTest.cs b/Libplanet.Action.Tests/ActionContextTest.cs
@@ -12,15 +12,12 @@ public class ActionContextTest
         private readonly System.Random _random;
         private readonly Address _address;
         private readonly TxId _txid;
-        private readonly ISystemAccounts _systemAccounts;
 
         public ActionContextTest()
         {
             _random = new System.Random();
             _address = _random.NextAddress();
             _txid = _random.NextTxId();
-            _systemAccounts = new SystemAccounts(
-                new SystemAccountsGetter(_ => ReservedAddresses.DefaultAccount), null);
         }
 
         [Fact]
@@ -37,7 +34,6 @@ public void RandomShouldBeDeterministic()
                     signer: _address,
                     txid: _txid,
                     miner: _address,
-                    systemAccounts: _systemAccounts,
                     blockIndex: 1,
                     blockProtocolVersion: Block.CurrentProtocolVersion,
                     previousState: new World(new MockWorldState()),
@@ -56,7 +52,6 @@ public void GuidShouldBeDeterministic()
                 signer: _address,
                 txid: _txid,
                 miner: _address,
-                systemAccounts: _systemAccounts,
                 blockIndex: 1,
                 blockProtocolVersion: Block.CurrentProtocolVersion,
                 previousState: new World(new MockWorldState()),
@@ -68,7 +63,6 @@ public void GuidShouldBeDeterministic()
                 signer: _address,
                 txid: _txid,
                 miner: _address,
-                systemAccounts: _systemAccounts,
                 blockIndex: 1,
                 blockProtocolVersion: Block.CurrentProtocolVersion,
                 previousState: new World(new MockWorldState()),
@@ -80,7 +74,6 @@ public void GuidShouldBeDeterministic()
                 signer: _address,
                 txid: _txid,
                 miner: _address,
-                systemAccounts: _systemAccounts,
                 blockIndex: 1,
                 blockProtocolVersion: Block.CurrentProtocolVersion,
                 previousState: new World(new MockWorldState()),
@@ -120,7 +113,6 @@ public void GuidVersionAndVariant()
                     signer: _address,
                     txid: _txid,
                     miner: _address,
-                    systemAccounts: _systemAccounts,
                     blockIndex: 1,
                     blockProtocolVersion: Block.CurrentProtocolVersion,
                     previousState: new World(new MockWorldState()),

diff --git a/Libplanet.Action.Tests/ActionEvaluationExtensions.cs b/Libplanet.Action.Tests/ActionEvaluationExtensions.cs
@@ -15,7 +15,7 @@ this IEnumerable<IActionEvaluation> evaluations
                 ImmutableDictionary<Address, IValue>.Empty,
                 (dirty, ev) => dirty.SetItems(
                     ev.OutputState.GetAccount(
-                        ReservedAddresses.DefaultAccount).GetUpdatedStates())
+                        ReservedAddresses.LegacyAccount).GetUpdatedStates())
             );
 
         public static IImmutableDictionary<(Address, Currency), FungibleAssetValue>
@@ -26,7 +26,7 @@ this IEnumerable<IActionEvaluation> evaluations
                 ImmutableDictionary<(Address, Currency), FungibleAssetValue>.Empty,
                 (dirty, ev) => dirty.SetItems(
                     ev.OutputState.GetAccount(
-                        ReservedAddresses.DefaultAccount).GetUpdatedBalances())
+                        ReservedAddresses.LegacyAccount).GetUpdatedBalances())
             );
 
         public static IImmutableDictionary<Currency, FungibleAssetValue>
@@ -35,7 +35,7 @@ public static IImmutableDictionary<Currency, FungibleAssetValue>
                 ImmutableDictionary<Currency, FungibleAssetValue>.Empty,
                 (dirty, ev) => dirty.SetItems(
                     ev.OutputState.GetAccount(
-                        ReservedAddresses.DefaultAccount).GetUpdatedTotalSupplies())
+                        ReservedAddresses.LegacyAccount).GetUpdatedTotalSupplies())
             );
     }
 }
diff --git a/Libplanet.Action.Tests/ActionEvaluationTest.cs b/Libplanet.Action.Tests/ActionEvaluationTest.cs
@@ -13,8 +13,6 @@ namespace Libplanet.Action.Tests
     public class ActionEvaluationTest
     {
         private readonly ILogger _logger;
-        private readonly ISystemAccounts _systemAccounts = new SystemAccounts(
-            new SystemAccountsGetter(_ => ReservedAddresses.DefaultAccount), null);
 
         public ActionEvaluationTest(ITestOutputHelper output)
         {
@@ -29,19 +27,18 @@ 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.DefaultAccount,
-                world.GetAccount(ReservedAddresses.DefaultAccount).SetState(address, (Text)"item"));
+                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(
                     address,
                     txid,
                     address,
-                    _systemAccounts,
                     1,
                     Block.CurrentProtocolVersion,
                     new World(new MockWorldState()),
@@ -60,12 +57,11 @@ public void Constructor()
             Assert.Equal(1, evaluation.InputContext.BlockIndex);
             Assert.Null(
                 evaluation.InputContext.PreviousState.GetAccount(
-                    ReservedAddresses.DefaultAccount).GetState(address)
+                    ReservedAddresses.LegacyAccount).GetState(address)
             );
             Assert.Equal(
                 (Text)"item",
-                evaluation.OutputState
-                    .GetAccount(ReservedAddresses.DefaultAccount).GetState(address)
+                evaluation.OutputState.GetAccount(ReservedAddresses.LegacyAccount).GetState(address)
             );
         }
     }

diff --git a/Libplanet.Action.Tests/Common/Attack.cs b/Libplanet.Action.Tests/Common/Attack.cs
@@ -34,7 +34,7 @@ public override IWorld Execute(IActionContext context)
             IImmutableSet<string> usedWeapons = ImmutableHashSet<string>.Empty;
             IImmutableSet<string> targets = ImmutableHashSet<string>.Empty;
             IWorld previousState = context.PreviousState;
-            IAccount legacyAccount = previousState.GetAccount(ReservedAddresses.DefaultAccount);
+            IAccount legacyAccount = previousState.GetAccount(ReservedAddresses.LegacyAccount);
 
             object value = legacyAccount.GetState(TargetAddress);
             if (!ReferenceEquals(value, null))
@@ -49,7 +49,7 @@ public override IWorld Execute(IActionContext context)
             var result = new BattleResult(usedWeapons, targets);
             legacyAccount = legacyAccount.SetState(TargetAddress, result.ToBencodex());
 
-            return previousState.SetAccount(ReservedAddresses.DefaultAccount, legacyAccount);
+            return previousState.SetAccount(ReservedAddresses.LegacyAccount, legacyAccount);
         }
     }
 }
diff --git a/Libplanet.Action.Tests/Common/DelayAction.cs b/Libplanet.Action.Tests/Common/DelayAction.cs
@@ -42,9 +42,9 @@ public IWorld Execute(IActionContext context)
             Thread.Sleep(MilliSecond);
             var ended = DateTimeOffset.UtcNow;
             var delayAccount = state
-                .GetAccount(ReservedAddresses.DefaultAccount)
+                .GetAccount(ReservedAddresses.LegacyAccount)
                 .SetState(TrivialUpdatedAddress, new Bencodex.Types.Integer(MilliSecond));
-            state = state.SetAccount(ReservedAddresses.DefaultAccount, delayAccount);
+            state = state.SetAccount(ReservedAddresses.LegacyAccount, delayAccount);
             Log.Debug(
                 "{MethodName} Total Executed Time: {Elapsed}. Delay target: {MilliSecond}",
                 nameof(DelayAction),

diff --git a/Libplanet.Action.Tests/Common/DetectRehearsal.cs b/Libplanet.Action.Tests/Common/DetectRehearsal.cs
@@ -25,10 +25,10 @@ public override void LoadPlainValue(IValue plainValue)
         public override IWorld Execute(IActionContext context)
         {
             IWorld previousState = context.PreviousState;
-            IAccount legacyAccount = previousState.GetAccount(ReservedAddresses.DefaultAccount);
+            IAccount legacyAccount = previousState.GetAccount(ReservedAddresses.LegacyAccount);
             ResultState = context.Rehearsal;
             return previousState.SetAccount(
-                ReservedAddresses.DefaultAccount,
+                ReservedAddresses.LegacyAccount,
                 legacyAccount.SetState(
                     TargetAddress,
                     new Bencodex.Types.Boolean(context.Rehearsal)

diff --git a/Libplanet.Action.Tests/Common/DumbAction.cs b/Libplanet.Action.Tests/Common/DumbAction.cs
@@ -150,7 +150,7 @@ public IWorld Execute(IActionContext context)
                 return world;
             }
 
-            IAccount account = world.GetAccount(ReservedAddresses.DefaultAccount);
+            IAccount account = world.GetAccount(ReservedAddresses.LegacyAccount);
             string items = (Text?)account.GetState(TargetAddress);
             string item = RecordRehearsal
                 ? $"{Item}:{context.Rehearsal}"
@@ -221,7 +221,7 @@ public IWorld Execute(IActionContext context)
                 Rehearsal = context.Rehearsal,
             });
 
-            return world.SetAccount(ReservedAddresses.DefaultAccount, account);
+            return world.SetAccount(ReservedAddresses.LegacyAccount, account);
         }
 
         public void LoadPlainValue(IValue plainValue)

diff --git a/Libplanet.Action.Tests/Common/MinerReward.cs b/Libplanet.Action.Tests/Common/MinerReward.cs
@@ -39,7 +39,7 @@ public void LoadPlainValue(Dictionary plainValue)
         public IWorld Execute(IActionContext ctx)
         {
             IWorld states = ctx.PreviousState;
-            IAccount legacyAccount = states.GetAccount(ReservedAddresses.DefaultAccount);
+            IAccount legacyAccount = states.GetAccount(ReservedAddresses.LegacyAccount);
 
             string rewardRecord = (Text?)legacyAccount.GetState(RewardRecordAddress);
 
@@ -54,7 +54,7 @@ public IWorld Execute(IActionContext ctx)
             int reward = previousReward + Reward;
 
             legacyAccount = legacyAccount.SetState(ctx.Miner, (Integer)reward);
-            return states.SetAccount(ReservedAddresses.DefaultAccount, legacyAccount);
+            return states.SetAccount(ReservedAddresses.LegacyAccount, legacyAccount);
         }
     }
 }
diff --git a/Libplanet.Action.Tests/Common/RandomAction.cs b/Libplanet.Action.Tests/Common/RandomAction.cs
@@ -31,16 +31,16 @@ public void LoadPlainValue(IValue plainValue)
         public IWorld Execute(IActionContext context)
         {
             IWorld states = context.PreviousState;
-            IAccount legacyAccount = states.GetAccount(ReservedAddresses.DefaultAccount);
+            IAccount legacyAccount = states.GetAccount(ReservedAddresses.LegacyAccount);
             if (context.Rehearsal)
             {
                 return states.SetAccount(
-                    ReservedAddresses.DefaultAccount,
+                    ReservedAddresses.LegacyAccount,
                     legacyAccount.SetState(Address, Null.Value));
             }
 
             legacyAccount = legacyAccount.SetState(Address, (Integer)context.GetRandom().Next());
-            return states.SetAccount(ReservedAddresses.DefaultAccount, legacyAccount);
+            return states.SetAccount(ReservedAddresses.LegacyAccount, legacyAccount);
         }
     }
 }
diff --git a/Libplanet.Action.Tests/Common/SetValidator.cs b/Libplanet.Action.Tests/Common/SetValidator.cs
@@ -40,9 +40,9 @@ public void LoadPlainValue(IValue plainValue)
         public IWorld Execute(IActionContext context)
         {
             IWorld states = context.PreviousState;
-            IAccount legacyAccount = states.GetAccount(ReservedAddresses.DefaultAccount);
+            IAccount legacyAccount = states.GetAccount(ReservedAddresses.LegacyAccount);
             return states.SetAccount(
-                ReservedAddresses.DefaultAccount, legacyAccount.SetValidator(Validator));
+                ReservedAddresses.LegacyAccount, legacyAccount.SetValidator(Validator));
         }
 
         /// <inheritdoc cref="IEquatable{T}.Equals(T)"/>

diff --git a/Libplanet.Action.Tests/Loader/TypedActionLoaderTest.cs b/Libplanet.Action.Tests/Loader/TypedActionLoaderTest.cs
@@ -49,7 +49,7 @@ public void LoadAction()
                             new List<Validator>()
                                 { new Validator(new PrivateKey().PublicKey, 1) }).Bencoded,
                         Dictionary.Empty.Add(
-                            ReservedAddresses.DefaultAccount.ToByteArray(),
+                            ReservedAddresses.LegacyAccount.ToByteArray(),
                             Dictionary.Empty.Add(
                                 default(Address).ToByteArray(), "initial value"))));
             var action = new Initialize();

diff --git a/Libplanet.Action.Tests/Mocks/MockWorldState.cs b/Libplanet.Action.Tests/Mocks/MockWorldState.cs
@@ -27,7 +27,7 @@ public MockWorldState(
             Legacy = Trie
                 .Get(new[]
                 {
-                    ToStateKey(ReservedAddresses.DefaultAccount),
+                    ToStateKey(ReservedAddresses.LegacyAccount),
                 })
                 .Any(v => v == null);
         }
@@ -37,7 +37,7 @@ public MockWorldState(
         public bool Legacy { get; private set; }
 
         public IAccount GetAccount(Address address)
-            => Legacy && address.Equals(ReservedAddresses.DefaultAccount)
+            => Legacy && address.Equals(ReservedAddresses.LegacyAccount)
                 ? new Account(new MockAccountState(_stateStore, Trie.Hash))
                 : new Account(new MockAccountState(
                     _stateStore,
@@ -46,7 +46,7 @@ public IAccount GetAccount(Address address)
                         : null));
 
         public IWorldState SetAccountState(Address address, IAccount account)
-            => Legacy && address.Equals(ReservedAddresses.DefaultAccount)
+            => Legacy && address.Equals(ReservedAddresses.LegacyAccount)
             ? new MockWorldState(_stateStore, account.Trie.Hash)
             : new MockWorldState(
                 _stateStore,

diff --git a/Libplanet.Action.Tests/Sys/InitializeTest.cs b/Libplanet.Action.Tests/Sys/InitializeTest.cs
@@ -27,9 +27,6 @@ private static readonly IImmutableDictionary<Address, IValue>
                 [default] = (Text)"initial value",
             }.ToImmutableDictionary();
 
-        private readonly ISystemAccounts _systemAccounts = new SystemAccounts(
-            new SystemAccountsGetter(_ => ReservedAddresses.DefaultAccount), null);
-
         [Fact]
         public void Constructor()
         {
@@ -47,11 +44,11 @@ public void Execute()
             var random = new System.Random();
             Address signer = random.NextAddress();
             var prevState = new World(new MockWorldState());
+            BlockHash genesisHash = random.NextBlockHash();
             var context = new ActionContext(
                 signer: signer,
                 txid: random.NextTxId(),
                 miner: random.NextAddress(),
-                systemAccounts: _systemAccounts,
                 blockIndex: 0,
                 blockProtocolVersion: Block.CurrentProtocolVersion,
                 previousState: prevState,
@@ -67,10 +64,10 @@ public void Execute()
 
             Assert.Equal(
                 _validatorSet,
-                nextState.GetAccount(ReservedAddresses.DefaultAccount).GetValidatorSet());
+                nextState.GetAccount(ReservedAddresses.LegacyAccount).GetValidatorSet());
             Assert.Equal(
                 _states[default],
-                nextState.GetAccount(ReservedAddresses.DefaultAccount).GetState(default));
+                nextState.GetAccount(ReservedAddresses.LegacyAccount).GetState(default));
         }
 
         [Fact]
@@ -84,7 +81,6 @@ public void ExecuteInNonGenesis()
                 signer: signer,
                 txid: random.NextTxId(),
                 miner: random.NextAddress(),
-                systemAccounts: _systemAccounts,
                 blockIndex: 10,
                 blockProtocolVersion: Block.CurrentProtocolVersion,
                 previousState: prevState,

diff --git a/Libplanet.Action/ActionContext.cs b/Libplanet.Action/ActionContext.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.Contracts;
 using System.Threading;
 using Libplanet.Action.State;
 using Libplanet.Crypto;
@@ -16,7 +17,6 @@ public ActionContext(
             Address signer,
             TxId? txid,
             Address miner,
-            ISystemAccounts systemAccounts,
             long blockIndex,
             int blockProtocolVersion,
             IWorld previousState,
@@ -27,7 +27,6 @@ public ActionContext(
             Signer = signer;
             TxId = txid;
             Miner = miner;
-            SystemAccounts = systemAccounts;
             BlockIndex = blockIndex;
             BlockProtocolVersion = blockProtocolVersion;
             Rehearsal = rehearsal;
@@ -47,9 +46,6 @@ public ActionContext(
         /// <inheritdoc cref="IActionContext.Miner"/>
         public Address Miner { get; }
 
-        /// <inheritdoc cref="IActionContext.SystemAccounts"/>
-        public ISystemAccounts SystemAccounts { get; }
-
         /// <inheritdoc cref="IActionContext.BlockIndex"/>
         public long BlockIndex { get; }