codex-storage/cs-codex-dist-tests
1
0
Fork 0
mirror of https://github.com/codex-storage/cs-codex-dist-tests.git synced 2025-02-03 15:53:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Ben 2024-05-30 11:17:13 +02:00
parent 117a30bb82
commit 12dc7efd5b
No known key found for this signature in database
GPG Key ID: 541B9D8C9F1426A1
4 changed files with 58 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Tests/CodexTests/UtilityTests/DiscordBotTests.cs
View File

@ -1,4 +1,5 @@
using CodexContractsPlugin; using CodexContractsPlugin;
using CodexContractsPlugin.Marketplace;
using CodexDiscordBotPlugin; using CodexDiscordBotPlugin;
using CodexPlugin; using CodexPlugin;
using Core; using Core;
@ -8,6 +9,7 @@ using KubernetesWorkflow.Types;
using Logging; using Logging;
using Newtonsoft.Json; using Newtonsoft.Json;
using NUnit.Framework; using NUnit.Framework;
using TestNetRewarder;
using Utils; using Utils;
namespace CodexTests.UtilityTests namespace CodexTests.UtilityTests
@ -301,28 +303,29 @@ namespace CodexTests.UtilityTests
private void ProcessLine(string line, Action<string> log) private void ProcessLine(string line, Action<string> log)
{ {
// Processing chain state: ' //$"ChainState=[{JsonConvert.SerializeObject(this)}]" +
// NewRequests: [] //$"HistoricState=[{historicState.EntireString()}]";
// FulfilledE: []
// CancelledE: []
// FilledE: []
// FreedE: []
// Historic: [{"Request":{"RequestId":"hvWlli4gHP5tUJoG5b8zh3tMBIr0wpcr/lHgIU/KRmU=","ClientAddress":{"Address":"0x760e722469cdeb086b78edd2b4b670621f43a923"},"Client":"0x760e722469Cdeb086b78EdD2b4b670621F43a923","Ask":{"Slots":4,"SlotSize":33554432,"Duration":360,"ProofProbability":5,"Reward":2,"Collateral":10,"MaxSlotLoss":2},"Content":{"Cid":"zDvZRwzm8DzbqdUcy7gS1wFKAsBjUHTQEUt1am1L6XGEWtsJ5U2X","MerkleRoot":"/KjFr+FezQ8m3huhdaPDy6zVgZs3ODtfE78K5eyieQo="},"Expiry":300,"Nonce":"2tANtfgVcMBuLLxe+4MbxMFWWO36Yv+l2yC4tpqdelI="},"Hosts":[{"Address":"0x0000000000000000000000000000000000000000"},{"Address":"0x0000000000000000000000000000000000000000"},{"Address":"0x0000000000000000000000000000000000000000"},{"Address":"0x0000000000000000000000000000000000000000"}],"State":"New"}]
// '
if (!line.Contains("Processing chain state: ")) return; var stateOpenTag = "ChainState=[";
var historicOpenTag = "]HistoricState=[";
log(Between(line, "'")); if (!line.Contains(stateOpenTag)) return;
//var tokens = state.Split("Historic: ", StringSplitOptions.RemoveEmptyEntries); if (!line.Contains(historicOpenTag)) return;
//var historics = JsonConvert.DeserializeObject<TestNetRewarder.StorageRequest[]>(tokens[1]);
//log(tokens[0] + " historic: " + string.Join(",", historics!.Select(h => h.Request.RequestId + " = " + h.State))); var stateStr = Between(line, stateOpenTag, historicOpenTag);
var historicStr = Between(line, historicOpenTag, "]");
var chainState = JsonConvert.DeserializeObject<ChainState>(stateStr);
var historicState = JsonConvert.DeserializeObject<TestNetRewarder.StorageRequest[]>(historicStr)!;
chainState!.Set(new HistoricState(historicState));
log(string.Join(",", chainState!.GenerateOverview()));
} }
private string Between(string s, string lim) private string Between(string s, string open, string close)
{ {
var start = s.IndexOf(lim) + lim.Length; var start = s.IndexOf(open) + open.Length;
var end = s.LastIndexOf(lim); var end = s.LastIndexOf(close);
return s.Substring(start, end - start); return s.Substring(start, end - start);
} }
} }

36
Tools/TestNetRewarder/ChainState.cs
View File

@ -8,7 +8,7 @@ namespace TestNetRewarder
{ {
public class ChainState public class ChainState
{ {
private readonly HistoricState historicState; private HistoricState historicState;
private readonly string[] colorIcons = new[] private readonly string[] colorIcons = new[]
{ {
"🔴", "🔴",
@ -50,9 +50,30 @@ namespace TestNetRewarder
SlotFreedEvents = contracts.GetSlotFreedEvents(blockRange); SlotFreedEvents = contracts.GetSlotFreedEvents(blockRange);
} }
public ChainState(
Request[] newRequests,
RequestFulfilledEventDTO[] requestFulfilledEvents,
RequestCancelledEventDTO[] requestCancelledEvents,
SlotFilledEventDTO[] slotFilledEvents,
SlotFreedEventDTO[] slotFreedEvents)
{
NewRequests = newRequests;
RequestFulfilledEvents = requestFulfilledEvents;
RequestCancelledEvents = requestCancelledEvents;
SlotFilledEvents = slotFilledEvents;
SlotFreedEvents = slotFreedEvents;
historicState = new HistoricState();
StartedRequests = Array.Empty<StorageRequest>();
FinishedRequests = Array.Empty<StorageRequest>();
}
public Request[] NewRequests { get; } public Request[] NewRequests { get; }
[JsonIgnore]
public StorageRequest[] AllRequests => historicState.StorageRequests; public StorageRequest[] AllRequests => historicState.StorageRequests;
[JsonIgnore]
public StorageRequest[] StartedRequests { get; private set; } public StorageRequest[] StartedRequests { get; private set; }
[JsonIgnore]
public StorageRequest[] FinishedRequests { get; private set; } public StorageRequest[] FinishedRequests { get; private set; }
public RequestFulfilledEventDTO[] RequestFulfilledEvents { get; } public RequestFulfilledEventDTO[] RequestFulfilledEvents { get; }
public RequestCancelledEventDTO[] RequestCancelledEvents { get; } public RequestCancelledEventDTO[] RequestCancelledEvents { get; }
@ -62,12 +83,13 @@ namespace TestNetRewarder
public string EntireString() public string EntireString()
{ {
return return
$"NewRequests: {JsonConvert.SerializeObject(NewRequests)}" + $"ChainState=[{JsonConvert.SerializeObject(this)}]" +
$"FulfilledE: {JsonConvert.SerializeObject(RequestFulfilledEvents)}" + $"HistoricState=[{historicState.EntireString()}]";
$"CancelledE: {JsonConvert.SerializeObject(RequestCancelledEvents)}" + }
$"FilledE: {JsonConvert.SerializeObject(SlotFilledEvents)}" +
$"FreedE: {JsonConvert.SerializeObject(SlotFreedEvents)}" + public void Set(HistoricState h)
$"Historic: {historicState.EntireString()}"; {
historicState = h;
} }
public string[] GenerateOverview() public string[] GenerateOverview()

9
Tools/TestNetRewarder/HistoricState.cs
View File

@ -34,6 +34,15 @@ namespace TestNetRewarder
{ {
return JsonConvert.SerializeObject(StorageRequests); return JsonConvert.SerializeObject(StorageRequests);
} }
public HistoricState()
{
}
public HistoricState(StorageRequest[] requests)
{
storageRequests.AddRange(requests);
}
} }
public class StorageRequest public class StorageRequest

2
Tools/TestNetRewarder/Processor.cs
View File

@ -58,7 +58,7 @@ namespace TestNetRewarder
private async Task ProcessChainState(ChainState chainState) private async Task ProcessChainState(ChainState chainState)
{ {
log.Log($"Processing chain state: '{chainState.EntireString()}'"); log.Log(chainState.EntireString());
var outgoingRewards = new List<RewardUsersCommand>(); var outgoingRewards = new List<RewardUsersCommand>();
foreach (var reward in rewardRepo.Rewards) foreach (var reward in rewardRepo.Rewards)