From 95738145743d7363912787cf80a5625891cd241b Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 10 Oct 2024 11:45:04 +0200 Subject: [PATCH] Adds emoji icons to chain events log --- Framework/Utils/RandomUtils.cs | 10 +++++ Tools/TestNetRewarder/EmojiMaps.cs | 53 ++++++++++++++++++++++++ Tools/TestNetRewarder/EventsFormatter.cs | 22 ++++++---- 3 files changed, 77 insertions(+), 8 deletions(-) create mode 100644 Tools/TestNetRewarder/EmojiMaps.cs diff --git a/Framework/Utils/RandomUtils.cs b/Framework/Utils/RandomUtils.cs index ae93c41..f4f28dd 100644 --- a/Framework/Utils/RandomUtils.cs +++ b/Framework/Utils/RandomUtils.cs @@ -5,6 +5,16 @@ private static readonly Random random = new Random(); private static readonly object @lock = new object(); + public static T GetOneRandom(this T[] items) + { + lock (@lock) + { + var i = random.Next(0, items.Length); + var result = items[i]; + return result; + } + } + public static T PickOneRandom(this List remainingItems) { lock (@lock) diff --git a/Tools/TestNetRewarder/EmojiMaps.cs b/Tools/TestNetRewarder/EmojiMaps.cs new file mode 100644 index 0000000..e516021 --- /dev/null +++ b/Tools/TestNetRewarder/EmojiMaps.cs @@ -0,0 +1,53 @@ +ο»Ώusing Utils; + +namespace TestNetRewarder +{ + public class EmojiMaps + { + private readonly string[] create = new[] + { + "🐟", + "πŸ”΅", + "🟦" // blue square + }; + private readonly string[] positive = new[] + { + "🟒", // green circle + "🟩" // green square + }; + private readonly string[] surprise = new[] + { + "🧐", + "🀨", + "🟑", // yellow circle + "🟨" // yellow square + }; + private readonly string[] negative = new[] + { + "β›”", + "🚫", + "πŸ”΄", + "πŸŸ₯" // red square + }; + + public string GetCreate() + { + return RandomUtils.GetOneRandom(create); + } + + public string GetPositive() + { + return RandomUtils.GetOneRandom(positive); + } + + public string GetSurprise() + { + return RandomUtils.GetOneRandom(surprise); + } + + public string GetNegative() + { + return RandomUtils.GetOneRandom(negative); + } + } +} diff --git a/Tools/TestNetRewarder/EventsFormatter.cs b/Tools/TestNetRewarder/EventsFormatter.cs index c0c7379..e9a05ca 100644 --- a/Tools/TestNetRewarder/EventsFormatter.cs +++ b/Tools/TestNetRewarder/EventsFormatter.cs @@ -11,6 +11,7 @@ namespace TestNetRewarder { private static readonly string nl = Environment.NewLine; private readonly List events = new List(); + private readonly EmojiMaps emojiMaps = new EmojiMaps(); public string[] GetEvents() { @@ -27,7 +28,7 @@ namespace TestNetRewarder public void OnNewRequest(RequestEvent requestEvent) { var request = requestEvent.Request; - AddRequestBlock(requestEvent, "New Request", + AddRequestBlock(requestEvent, $"{C} New Request", $"Client: {request.Client}", $"Content: {request.Request.Content.Cid}", $"Duration: {BigIntToDuration(request.Request.Ask.Duration)}", @@ -42,27 +43,27 @@ namespace TestNetRewarder public void OnRequestCancelled(RequestEvent requestEvent) { - AddRequestBlock(requestEvent, "Cancelled"); + AddRequestBlock(requestEvent, $"{N} Cancelled"); } public void OnRequestFailed(RequestEvent requestEvent) { - AddRequestBlock(requestEvent, "Failed"); + AddRequestBlock(requestEvent, $"{N} Failed"); } public void OnRequestFinished(RequestEvent requestEvent) { - AddRequestBlock(requestEvent, "Finished"); + AddRequestBlock(requestEvent, $"{P} Finished"); } public void OnRequestFulfilled(RequestEvent requestEvent) { - AddRequestBlock(requestEvent, "Started"); + AddRequestBlock(requestEvent, $"{P} Started"); } public void OnSlotFilled(RequestEvent requestEvent, EthAddress host, BigInteger slotIndex) { - AddRequestBlock(requestEvent, "Slot Filled", + AddRequestBlock(requestEvent, $"{P} Slot Filled", $"Host: {host}", $"Slot Index: {slotIndex}" ); @@ -70,14 +71,14 @@ namespace TestNetRewarder public void OnSlotFreed(RequestEvent requestEvent, BigInteger slotIndex) { - AddRequestBlock(requestEvent, "Slot Freed", + AddRequestBlock(requestEvent, $"{S} Slot Freed", $"Slot Index: {slotIndex}" ); } public void OnSlotReservationsFull(RequestEvent requestEvent, BigInteger slotIndex) { - AddRequestBlock(requestEvent, "Slot Reservations Full", + AddRequestBlock(requestEvent, $"{P} Slot Reservations Full", $"Slot Index: {slotIndex}" ); } @@ -137,5 +138,10 @@ namespace TestNetRewarder var tt = new TestToken(big); return tt.ToString(); } + + private string C => emojiMaps.GetCreate(); + private string P => emojiMaps.GetPositive(); + private string S => emojiMaps.GetSurprise(); + private string N => emojiMaps.GetNegative(); } }