Skip to content

Commit 0fefb0b

Browse files
committed
Takes requestBlock emoji out of bold-text block
1 parent 561f277 commit 0fefb0b

File tree

1 file changed

+18
-12
lines changed

1 file changed

+18
-12
lines changed

Tools/TestNetRewarder/EventsFormatter.cs

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public string[] GetErrors()
5050
public void OnNewRequest(RequestEvent requestEvent)
5151
{
5252
var request = requestEvent.Request;
53-
AddRequestBlock(requestEvent, $"{emojiMaps.NewRequest} New Request",
53+
AddRequestBlock(requestEvent, emojiMaps.NewRequest, "New Request",
5454
$"Client: {request.Client}",
5555
$"Content: {BytesToHexString(request.Request.Content.Cid)}",
5656
$"Duration: {BigIntToDuration(request.Request.Ask.Duration)}",
@@ -66,42 +66,42 @@ public void OnNewRequest(RequestEvent requestEvent)
6666

6767
public void OnRequestCancelled(RequestEvent requestEvent)
6868
{
69-
AddRequestBlock(requestEvent, $"{emojiMaps.Cancelled} Cancelled");
69+
AddRequestBlock(requestEvent, emojiMaps.Cancelled, "Cancelled");
7070
}
7171

7272
public void OnRequestFailed(RequestEvent requestEvent)
7373
{
74-
AddRequestBlock(requestEvent, $"{emojiMaps.Failed} Failed");
74+
AddRequestBlock(requestEvent, emojiMaps.Failed, "Failed");
7575
}
7676

7777
public void OnRequestFinished(RequestEvent requestEvent)
7878
{
79-
AddRequestBlock(requestEvent, $"{emojiMaps.Finished} Finished");
79+
AddRequestBlock(requestEvent, emojiMaps.Finished, "Finished");
8080
}
8181

8282
public void OnRequestFulfilled(RequestEvent requestEvent)
8383
{
84-
AddRequestBlock(requestEvent, $"{emojiMaps.Started} Started");
84+
AddRequestBlock(requestEvent, emojiMaps.Started, "Started");
8585
}
8686

8787
public void OnSlotFilled(RequestEvent requestEvent, EthAddress host, BigInteger slotIndex, bool isRepair)
8888
{
89-
AddRequestBlock(requestEvent, GetSlotFilledTitle(isRepair),
89+
AddRequestBlock(requestEvent, GetSlotFilledIcon(isRepair), GetSlotFilledTitle(isRepair),
9090
$"Host: {host}",
9191
$"Slot Index: {slotIndex}"
9292
);
9393
}
9494

9595
public void OnSlotFreed(RequestEvent requestEvent, BigInteger slotIndex)
9696
{
97-
AddRequestBlock(requestEvent, $"{emojiMaps.SlotFreed} Slot Freed",
97+
AddRequestBlock(requestEvent, emojiMaps.SlotFreed, "Slot Freed",
9898
$"Slot Index: {slotIndex}"
9999
);
100100
}
101101

102102
public void OnSlotReservationsFull(RequestEvent requestEvent, BigInteger slotIndex)
103103
{
104-
AddRequestBlock(requestEvent, $"{emojiMaps.SlotReservationsFull} Slot Reservations Full",
104+
AddRequestBlock(requestEvent, emojiMaps.SlotReservationsFull, "Slot Reservations Full",
105105
$"Slot Index: {slotIndex}"
106106
);
107107
}
@@ -135,10 +135,16 @@ public void ProcessPeriodReports(PeriodMonitorResult reports)
135135
AddBlock(0, $"{emojiMaps.ProofReport} **Proof system report**", lines.ToArray());
136136
}
137137

138+
private string GetSlotFilledIcon(bool isRepair)
139+
{
140+
if (isRepair) return emojiMaps.SlotRepaired;
141+
return emojiMaps.SlotFilled;
142+
}
143+
138144
private string GetSlotFilledTitle(bool isRepair)
139145
{
140-
if (isRepair) return $"{emojiMaps.SlotRepaired} Slot Repaired";
141-
return $"{emojiMaps.SlotFilled} Slot Filled";
146+
if (isRepair) return $"Slot Repaired";
147+
return $"Slot Filled";
142148
}
143149

144150
private void AddMissedProofDetails(List<string> lines, PeriodReport[] reports)
@@ -176,10 +182,10 @@ private void DescribeMissedProof(List<string> lines, PeriodProofMissed missedPro
176182
lines.Add($"[{missedProof.FormatHost()}] missed proof for {FormatRequestId(missedProof.Request)} (slotIndex: {missedProof.SlotIndex})");
177183
}
178184

179-
private void AddRequestBlock(RequestEvent requestEvent, string eventName, params string[] content)
185+
private void AddRequestBlock(RequestEvent requestEvent, string icon, string eventName, params string[] content)
180186
{
181187
var blockNumber = $"[{requestEvent.Block.BlockNumber} {FormatDateTime(requestEvent.Block.Utc)}]";
182-
var title = $"{blockNumber} **{eventName}** {FormatRequestId(requestEvent)}";
188+
var title = $"{blockNumber} {icon} **{eventName}** {FormatRequestId(requestEvent)}";
183189
AddBlock(requestEvent.Block.BlockNumber, title, content);
184190
}
185191

0 commit comments

Comments
 (0)