diff --git a/ProjectPlugins/CodexDiscordBotPlugin/CodexDiscordBotPlugin.cs b/ProjectPlugins/CodexDiscordBotPlugin/CodexDiscordBotPlugin.cs index b2bb5973..b2e184be 100644 --- a/ProjectPlugins/CodexDiscordBotPlugin/CodexDiscordBotPlugin.cs +++ b/ProjectPlugins/CodexDiscordBotPlugin/CodexDiscordBotPlugin.cs @@ -56,6 +56,7 @@ namespace CodexDiscordBotPlugin private RunningPod StartRewarderContainer(IStartupWorkflow workflow, RewarderBotStartupConfig config) { var startupConfig = new StartupConfig(); + startupConfig.NameOverride = config.Name; startupConfig.Add(config); return workflow.Start(1, new RewarderBotContainerRecipe(), startupConfig).WaitForOnline(); } diff --git a/ProjectPlugins/CodexDiscordBotPlugin/DiscordBotStartupConfig.cs b/ProjectPlugins/CodexDiscordBotPlugin/DiscordBotStartupConfig.cs index b990e60e..e77552e5 100644 --- a/ProjectPlugins/CodexDiscordBotPlugin/DiscordBotStartupConfig.cs +++ b/ProjectPlugins/CodexDiscordBotPlugin/DiscordBotStartupConfig.cs @@ -27,8 +27,9 @@ public class RewarderBotStartupConfig { - public RewarderBotStartupConfig(string discordBotHost, int discordBotPort, int intervalMinutes, DateTime historyStartUtc, DiscordBotGethInfo gethInfo, string? dataPath) + public RewarderBotStartupConfig(string name, string discordBotHost, int discordBotPort, int intervalMinutes, DateTime historyStartUtc, DiscordBotGethInfo gethInfo, string? dataPath) { + Name = name; DiscordBotHost = discordBotHost; DiscordBotPort = discordBotPort; IntervalMinutes = intervalMinutes; @@ -37,6 +38,7 @@ DataPath = dataPath; } + public string Name { get; } public string DiscordBotHost { get; } public int DiscordBotPort { get; } public int IntervalMinutes { get; } diff --git a/Tests/CodexTests/UtilityTests/DiscordBotTests.cs b/Tests/CodexTests/UtilityTests/DiscordBotTests.cs index d7ebd8db..671d6c07 100644 --- a/Tests/CodexTests/UtilityTests/DiscordBotTests.cs +++ b/Tests/CodexTests/UtilityTests/DiscordBotTests.cs @@ -121,6 +121,7 @@ namespace CodexTests.UtilityTests private void StartRewarderBot(DiscordBotGethInfo gethInfo, RunningContainer botContainer) { Ci.DeployRewarderBot(new RewarderBotStartupConfig( + name: "rewarder-bot", discordBotHost: botContainer.GetInternalAddress(DiscordBotContainerRecipe.RewardsPort).Host, discordBotPort: botContainer.GetInternalAddress(DiscordBotContainerRecipe.RewardsPort).Port, intervalMinutes: Convert.ToInt32(Math.Round(rewarderInterval.TotalMinutes)), @@ -145,7 +146,7 @@ namespace CodexTests.UtilityTests private RunningContainer StartDiscordBot(DiscordBotGethInfo gethInfo) { var bot = Ci.DeployCodexDiscordBot(new DiscordBotStartupConfig( - name: "bot", + name: "discord-bot", token: "aaa", serverName: "ThatBen's server", adminRoleName: "bottest-admins", diff --git a/Tools/TestNetRewarder/ChainState.cs b/Tools/TestNetRewarder/ChainState.cs index c3ce8a24..50b25017 100644 --- a/Tools/TestNetRewarder/ChainState.cs +++ b/Tools/TestNetRewarder/ChainState.cs @@ -59,6 +59,17 @@ namespace TestNetRewarder public SlotFilledEventDTO[] SlotFilledEvents { get; } public SlotFreedEventDTO[] SlotFreedEvents { get; } + public string EntireString() + { + return + $"NewRequests: {JsonConvert.SerializeObject(NewRequests)}" + + $"FulfilledE: {JsonConvert.SerializeObject(RequestFulfilledEvents)}" + + $"CancelledE: {JsonConvert.SerializeObject(RequestCancelledEvents)}" + + $"FilledE: {JsonConvert.SerializeObject(SlotFilledEvents)}" + + $"FreedE: {JsonConvert.SerializeObject(SlotFreedEvents)}" + + $"Historic: {historicState.EntireString()}"; + } + public string[] GenerateOverview() { var entries = new List(); diff --git a/Tools/TestNetRewarder/HistoricState.cs b/Tools/TestNetRewarder/HistoricState.cs index 36d335df..3ae58820 100644 --- a/Tools/TestNetRewarder/HistoricState.cs +++ b/Tools/TestNetRewarder/HistoricState.cs @@ -29,6 +29,11 @@ namespace TestNetRewarder r.State == RequestState.Failed ); } + + public string EntireString() + { + return JsonConvert.SerializeObject(StorageRequests); + } } public class StorageRequest diff --git a/Tools/TestNetRewarder/Processor.cs b/Tools/TestNetRewarder/Processor.cs index c18247b4..a756b937 100644 --- a/Tools/TestNetRewarder/Processor.cs +++ b/Tools/TestNetRewarder/Processor.cs @@ -58,6 +58,8 @@ namespace TestNetRewarder private async Task ProcessChainState(ChainState chainState) { + log.Log($"Processing chain state: '{chainState.EntireString()}'"); + var outgoingRewards = new List(); foreach (var reward in rewardRepo.Rewards) {