Removes marketaverages from discordbot and rewarderbot

Author: benbierens

Framework/DiscordRewards/GiveRewardsCommand.cs

@@ -3,12 +3,11 @@
     public class GiveRewardsCommand
     {
         public RewardUsersCommand[] Rewards { get; set; } = Array.Empty<RewardUsersCommand>();
-        public MarketAverage[] Averages { get; set; } = Array.Empty<MarketAverage>();
         public string[] EventsOverview { get; set; } = Array.Empty<string>();
 
         public bool HasAny()
         {
-            return Rewards.Any() || Averages.Any() || EventsOverview.Any();
+            return Rewards.Any() || EventsOverview.Any();
         }
     }
 
@@ -17,15 +16,4 @@ public class RewardUsersCommand
         public ulong RewardId { get; set; }
         public string[] UserAddresses { get; set; } = Array.Empty<string>();
     }
-
-    public class MarketAverage
-    {
-        public int NumberOfFinished { get; set; }
-        public int TimeRangeSeconds { get; set; }
-        public float Price { get; set; }
-        public float Size { get; set; }
-        public float Duration { get; set; }
-        public float Collateral { get; set; }
-        public float ProofProbability { get; set; }
-    }
 }

Tests/CodexTests/UtilityTests/DiscordBotTests.cs

@@ -24,7 +24,6 @@ public class DiscordBotTests : AutoBootstrapDistTest
         private readonly List<ulong> rewardsSeen = new List<ulong>();
         private readonly TimeSpan rewarderInterval = TimeSpan.FromMinutes(1);
         private readonly List<string> receivedEvents = new List<string>();
-        private readonly List<MarketAverage> receivedAverages = new List<MarketAverage>();
 
         [Test]
         [DontDownloadLogs]
@@ -56,8 +55,6 @@ public void BotRewardTest()
             AssertEventOccurance("Transit: New -> Started", 1);
             AssertEventOccurance("Transit: Started -> Finished", 1);
 
-            AssertMarketAverage();
-
             foreach (var r in repo.Rewards)
             {
                 var seen = rewardsSeen.Any(s => r.RoleId == s);
@@ -80,28 +77,9 @@ private void AssertEventOccurance(string msg, int expectedCount)
                 $"Event '{msg}' did not occure correct number of times.");
         }
 
-        private void AssertMarketAverage()
-        {
-            Assert.That(receivedAverages.Count, Is.EqualTo(1));
-            var a = receivedAverages.Single();
-
-            Assert.That(a.NumberOfFinished, Is.EqualTo(1));
-            Assert.That(a.TimeRangeSeconds, Is.EqualTo(5760));
-            Assert.That(a.Price, Is.EqualTo(2.0f).Within(0.1f));
-            Assert.That(a.Size, Is.EqualTo(GetMinFileSize().SizeInBytes).Within(1.0f));
-            Assert.That(a.Duration, Is.EqualTo(GetMinRequiredRequestDuration().TotalSeconds).Within(1.0f));
-            Assert.That(a.Collateral, Is.EqualTo(10.0f).Within(0.1f));
-            Assert.That(a.ProofProbability, Is.EqualTo(5.0f).Within(0.1f));
-        }
-
         private void OnCommand(string timestamp, GiveRewardsCommand call)
         {
             Log($"<API call {timestamp}>");
-            receivedAverages.AddRange(call.Averages);
-            foreach (var a in call.Averages)
-            {
-                Log("\tAverage: " + JsonConvert.SerializeObject(a));
-            }
             receivedEvents.AddRange(call.EventsOverview);
             foreach (var e in call.EventsOverview)
             {

Tools/BiblioTech/Commands/MarketCommand.cs

@@ -18,7 +18,6 @@ public class Program
         public static AdminChecker AdminChecker { get; private set; } = null!;
         public static IDiscordRoleDriver RoleDriver { get; set; } = null!;
         public static ILog Log { get; private set; } = null!;
-        public static MarketAverage[] Averages { get; set; } = Array.Empty<MarketAverage>();
 
         public static Task Main(string[] args)
         {
@@ -91,8 +90,7 @@ private async Task StartDiscordBot()
                 sprCommand,
                 associateCommand,
                 notifyCommand,
-                new AdminCommand(sprCommand, replacement),
-                new MarketCommand()
+                new AdminCommand(sprCommand, replacement)
             );
 
             await client.LoginAsync(TokenType.Bot, Config.ApplicationToken);

Tools/BiblioTech/Program.cs

@@ -23,10 +23,6 @@ public async Task<string> Give(GiveRewardsCommand cmd)
         {
             try
             {
-                if (cmd.Averages != null && cmd.Averages.Any())
-                {
-                    Program.Averages = cmd.Averages;
-                }
                 await Program.RoleDriver.GiveRewards(cmd);
             }
             catch (Exception ex)

Tools/BiblioTech/Rewards/RewardController.cs

@@ -9,7 +9,6 @@ public class Processor : ITimeSegmentHandler
     {
         private readonly RequestBuilder builder;
         private readonly RewardChecker rewardChecker;
-        private readonly MarketTracker marketTracker;
         private readonly EventsFormatter eventsFormatter;
         private readonly ChainState chainState;
         private readonly BotClient client;
@@ -22,12 +21,10 @@ public Processor(Configuration config, BotClient client, ICodexContracts contrac
 
             builder = new RequestBuilder();
             rewardChecker = new RewardChecker(builder);
-            marketTracker = new MarketTracker(config, log);
             eventsFormatter = new EventsFormatter();
 
             var handler = new ChainStateChangeHandlerMux(
                 rewardChecker.Handler,
-                marketTracker,
                 eventsFormatter
             );
 
@@ -40,10 +37,9 @@ public async Task OnNewSegment(TimeRange timeRange)
             {
                 chainState.Update(timeRange.To);
 
-                var averages = marketTracker.GetAverages();
                 var events = eventsFormatter.GetEvents();
 
-                var request = builder.Build(averages, events);
+                var request = builder.Build(events);
                 if (request.HasAny())
                 {
                     await client.SendRewards(request);

Tools/TestNetRewarder/MarketBuffer.cs

@@ -19,7 +19,7 @@ public void Give(RewardConfig reward, EthAddress receiver)
             }
         }
 
-        public GiveRewardsCommand Build(MarketAverage[] marketAverages, string[] lines)
+        public GiveRewardsCommand Build(string[] lines)
         {
             var result = new GiveRewardsCommand
             {
@@ -28,7 +28,6 @@ public GiveRewardsCommand Build(MarketAverage[] marketAverages, string[] lines)
                     RewardId = p.Key,
                     UserAddresses = p.Value.Select(v => v.Address).ToArray()
                 }).ToArray(),
-                Averages = marketAverages,
                 EventsOverview = lines
             };