From 1dbb749732c89a5f1b754a97f7e72eca2fdcad9e Mon Sep 17 00:00:00 2001
From: benbierens <thatbenbierens@gmail.com>
Date: Thu, 11 Apr 2024 08:50:03 +0200
Subject: [PATCH] Removes ChangedEvents field from chain-state, not necessary

---
 Tools/TestNetRewarder/ChainState.cs    | 22 +++++++++++-----------
 Tools/TestNetRewarder/HistoricState.cs | 24 ------------------------
 2 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/Tools/TestNetRewarder/ChainState.cs b/Tools/TestNetRewarder/ChainState.cs
index 9c93f87..b290e78 100644
--- a/Tools/TestNetRewarder/ChainState.cs
+++ b/Tools/TestNetRewarder/ChainState.cs
@@ -20,7 +20,6 @@ namespace TestNetRewarder
 
             StartedRequests = historicState.StorageRequests.Where(r => r.RecentlyStarted).ToArray();
             FinishedRequests = historicState.StorageRequests.Where(r => r.RecentlyFinished).ToArray();
-            ChangedRequests = historicState.StorageRequests.Where(r => r.RecentlyChanged).ToArray();
             RequestFulfilledEvents = contracts.GetRequestFulfilledEvents(blockRange);
             RequestCancelledEvents = contracts.GetRequestCancelledEvents(blockRange);
             SlotFilledEvents = contracts.GetSlotFilledEvents(blockRange);
@@ -31,7 +30,6 @@ namespace TestNetRewarder
         public StorageRequest[] AllRequests => historicState.StorageRequests;
         public StorageRequest[] StartedRequests { get; private set; }
         public StorageRequest[] FinishedRequests { get; private set; }
-        public StorageRequest[] ChangedRequests { get; private set; }
         public RequestFulfilledEventDTO[] RequestFulfilledEvents { get; }
         public RequestCancelledEventDTO[] RequestCancelledEvents { get; }
         public SlotFilledEventDTO[] SlotFilledEvents { get; }
@@ -41,7 +39,7 @@ namespace TestNetRewarder
         {
             var entries = new List<StringBlockNumberPair>();
 
-            entries.AddRange(ChangedRequests.Select(ToPair));
+            entries.AddRange(NewRequests.Select(ToPair));
             entries.AddRange(RequestFulfilledEvents.Select(ToPair));
             entries.AddRange(RequestCancelledEvents.Select(ToPair));
             entries.AddRange(SlotFilledEvents.Select(ToPair));
@@ -52,44 +50,46 @@ namespace TestNetRewarder
             return entries.Select(ToLine).ToArray();
         }
 
-        private StringBlockNumberPair ToPair(StorageRequest r)
+        private StringBlockNumberPair ToPair(Request r)
         {
-            return new StringBlockNumberPair(JsonConvert.SerializeObject(r), r.Request.BlockNumber);
+            return new StringBlockNumberPair("NewRequest", JsonConvert.SerializeObject(r), r.BlockNumber);
         }
 
         private StringBlockNumberPair ToPair(RequestFulfilledEventDTO r)
         {
-            return new StringBlockNumberPair(JsonConvert.SerializeObject(r), r.BlockNumber);
+            return new StringBlockNumberPair("Fulfilled", JsonConvert.SerializeObject(r), r.BlockNumber);
         }
 
         private StringBlockNumberPair ToPair(RequestCancelledEventDTO r)
         {
-            return new StringBlockNumberPair(JsonConvert.SerializeObject(r), r.BlockNumber);
+            return new StringBlockNumberPair("Cancelled", JsonConvert.SerializeObject(r), r.BlockNumber);
         }
 
         private StringBlockNumberPair ToPair(SlotFilledEventDTO r)
         {
-            return new StringBlockNumberPair(JsonConvert.SerializeObject(r), r.BlockNumber);
+            return new StringBlockNumberPair("SlotFilled", JsonConvert.SerializeObject(r), r.BlockNumber);
         }
 
         private StringBlockNumberPair ToPair(SlotFreedEventDTO r)
         {
-            return new StringBlockNumberPair(JsonConvert.SerializeObject(r), r.BlockNumber);
+            return new StringBlockNumberPair("SlotFreed", JsonConvert.SerializeObject(r), r.BlockNumber);
         }
 
         private string ToLine(StringBlockNumberPair pair)
         {
-            return $"[{pair.Number}] {pair.Str}";
+            return $"[{pair.Number}]({pair.Name}) {pair.Str}";
         }
 
         public class StringBlockNumberPair
         {
-            public StringBlockNumberPair(string str, ulong number)
+            public StringBlockNumberPair(string name, string str, ulong number)
             {
+                Name = name;
                 Str = str;
                 Number = number;
             }
 
+            public string Name { get; }
             public string Str { get; }
             public ulong Number { get; }
         }
diff --git a/Tools/TestNetRewarder/HistoricState.cs b/Tools/TestNetRewarder/HistoricState.cs
index 316a80e..36d335d 100644
--- a/Tools/TestNetRewarder/HistoricState.cs
+++ b/Tools/TestNetRewarder/HistoricState.cs
@@ -28,8 +28,6 @@ namespace TestNetRewarder
                 r.State == RequestState.Finished ||
                 r.State == RequestState.Failed
             );
-
-            foreach (var r in storageRequests) r.IsNew = false;
         }
     }
 
@@ -39,13 +37,11 @@ namespace TestNetRewarder
         {
             Request = request;
             Hosts = Array.Empty<EthAddress>();
-            IsNew = true;
         }
 
         public Request Request { get; }
         public EthAddress[] Hosts { get; private set; }
         public RequestState State { get; private set; }
-        public bool IsNew { get; set; }
         
         [JsonIgnore]
         public bool RecentlyStarted { get; private set; }
@@ -53,9 +49,6 @@ namespace TestNetRewarder
         [JsonIgnore]
         public bool RecentlyFinished { get; private set; }
 
-        [JsonIgnore]
-        public bool RecentlyChanged { get; private set; }
-
         public void Update(ICodexContracts contracts)
         {
             var newHosts = GetHosts(contracts);
@@ -70,27 +63,10 @@ namespace TestNetRewarder
                 State == RequestState.Started &&
                 newState == RequestState.Finished;
 
-            RecentlyChanged =
-                IsNew ||
-                State != newState ||
-                HostsChanged(newHosts);
-
             State = newState;
             Hosts = newHosts;
         }
 
-        private bool HostsChanged(EthAddress[] newHosts)
-        {
-            if (newHosts.Length != Hosts.Length) return true;
-            
-            foreach (var newHost in newHosts) 
-            {
-                if (!Hosts.Contains(newHost)) return true;
-            }
-
-            return false;
-        }
-
         private EthAddress[] GetHosts(ICodexContracts contracts)
         {
             var result = new List<EthAddress>();