Merge pull request #3723 from greymistcube/chore/cleanup

🧹 Removed RecordRandom from DumbAction
planetarium · Apr 2, 2024 · 03c1a63 · 03c1a63
2 parents 438df37 + 1612dc0
commit 03c1a63
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 60 deletions.
diff --git a/Libplanet.Action.Tests/Common/DumbAction.cs b/Libplanet.Action.Tests/Common/DumbAction.cs
@@ -16,9 +16,6 @@ public sealed class DumbAction : IAction
 
         public static readonly Text TypeId = new Text(nameof(DumbAction));
 
-        public static readonly Address RandomRecordsAddress =
-            new Address("7811C3fAa0f9Cc41F7971c3d9b031B1095b20AB2");
-
         public static readonly Currency DumbCurrency =
             Currency.Uncapped("DUMB", 0, null);
 
@@ -32,8 +29,6 @@ public DumbAction()
 
         public ImmutableList<Validator>? Validators { get; private set; }
 
-        public bool RecordRandom { get; private set; }
-
         public IValue PlainValue
         {
             get
@@ -61,13 +56,6 @@ public IValue PlainValue
                         .Add("validators", new List(validators.Select(v => v.Bencoded)));
                 }
 
-                if (RecordRandom)
-                {
-                    // In order to avoid changing tx signatures in many test
-                    // fixtures, adds field only if RecordRandom = true.
-                    plainValue = plainValue.Add("record_random", true);
-                }
-
                 return plainValue;
             }
         }
@@ -90,7 +78,6 @@ public static DumbAction Create(
                 Append = append,
                 Transfer = transfer,
                 Validators = validators?.ToImmutableList(),
-                RecordRandom = recordRandom,
             };
         }
 
@@ -137,15 +124,6 @@ public IWorld Execute(IActionContext context)
                     (current, validator) => current.SetValidator(validator));
             }
 
-            if (RecordRandom)
-            {
-                IAccount account = world.GetAccount(ReservedAddresses.LegacyAccount);
-                account = account.SetState(
-                    RandomRecordsAddress,
-                    (Integer)context.GetRandom().Next());
-                world = world.SetAccount(ReservedAddresses.LegacyAccount, account);
-            }
-
             return world;
         }
 
@@ -182,16 +160,10 @@ public void LoadPlainValue(Dictionary plainValue)
                     .Select(value => new Validator(value))
                     .ToImmutableList();
             }
-
-            RecordRandom =
-                plainValue.ContainsKey((Text)"record_random") &&
-                plainValue["record_random"] is Boolean r &&
-                r.Value;
         }
 
         public override string ToString()
         {
-            const string T = "true", F = "false";
             const string N = "null";
             const string E = "empty";
             string append = Append is { } a
@@ -206,8 +178,7 @@ public override string ToString()
             return $"{nameof(DumbAction)} {{ " +
                 $"{nameof(Append)} = {append}, " +
                 $"{nameof(Transfer)} = {transfer}, " +
-                $"{nameof(Validators)} = {validators}, " +
-                $"{nameof(RecordRandom)} = {(RecordRandom ? T : F)}, " +
+                $"{nameof(Validators)} = {validators} " +
                 $"}}";
         }
     }

diff --git a/Libplanet.Action.Tests/Common/DumbModernAction.cs b/Libplanet.Action.Tests/Common/DumbModernAction.cs
@@ -19,9 +19,6 @@ public sealed class DumbModernAction : IAction
         public static readonly Address DumbModernAddress =
             new Address("0123456789abcdef0123456789abcdef12345678");
 
-        public static readonly Address RandomRecordsAddress =
-            new Address("7811C3fAa0f9Cc41F7971c3d9b031B1095b20AB2");
-
         public static readonly Currency DumbCurrency =
             Currency.Uncapped("DUMB", 0, null);
 
@@ -35,8 +32,6 @@ public DumbModernAction()
 
         public ImmutableList<Validator>? Validators { get; private set; }
 
-        public bool RecordRandom { get; private set; }
-
         public IValue PlainValue
         {
             get
@@ -64,13 +59,6 @@ public IValue PlainValue
                         .Add("validators", new List(validators.Select(v => v.Bencoded)));
                 }
 
-                if (RecordRandom)
-                {
-                    // In order to avoid changing tx signatures in many test
-                    // fixtures, adds field only if RecordRandom = true.
-                    plainValue = plainValue.Add("record_random", true);
-                }
-
                 return plainValue;
             }
         }
@@ -93,7 +81,6 @@ public static DumbModernAction Create(
                 Append = append,
                 Transfer = transfer,
                 Validators = validators?.ToImmutableList(),
-                RecordRandom = recordRandom,
             };
         }
 
@@ -140,15 +127,6 @@ public IWorld Execute(IActionContext context)
                     (current, validator) => current.SetValidator(validator));
             }
 
-            if (RecordRandom)
-            {
-                IAccount account = world.GetAccount(ReservedAddresses.LegacyAccount);
-                account = account.SetState(
-                    RandomRecordsAddress,
-                    (Integer)context.GetRandom().Next());
-                world = world.SetAccount(ReservedAddresses.LegacyAccount, account);
-            }
-
             return world;
         }
 
@@ -185,16 +163,10 @@ public void LoadPlainValue(Dictionary plainValue)
                     .Select(value => new Validator(value))
                     .ToImmutableList();
             }
-
-            RecordRandom =
-                plainValue.ContainsKey((Text)"record_random") &&
-                plainValue["record_random"] is Boolean r &&
-                r.Value;
         }
 
         public override string ToString()
         {
-            const string T = "true", F = "false";
             const string N = "null";
             const string E = "empty";
             string append = Append is { } a
@@ -209,8 +181,7 @@ public override string ToString()
             return $"{nameof(DumbModernAction)} {{ " +
                 $"{nameof(Append)} = {append}, " +
                 $"{nameof(Transfer)} = {transfer}, " +
-                $"{nameof(Validators)} = {validators}, " +
-                $"{nameof(RecordRandom)} = {(RecordRandom ? T : F)}, " +
+                $"{nameof(Validators)} = {validators} " +
                 $"}}";
         }
     }