logos-storage/logos-storage-nim-cs-dist-tests
1
0
Fork 0
mirror of https://github.com/logos-storage/logos-storage-nim-cs-dist-tests.git synced 2026-01-08 00:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

nice checks for timings of successful contract

Browse Source
This commit is contained in:
benbierens 2024-05-24 14:33:59 +02:00
parent 6c956c1a64
commit 684a99027b
No known key found for this signature in database
GPG Key ID: 877D2C2E09A22F3A
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ProjectPlugins/CodexPlugin/MarketplaceAccess.cs
View File

@ -105,13 +105,13 @@ namespace CodexPlugin
public TimeSpan? PendingToSubmitted => contractSubmittedUtc - contractPendingUtc; public TimeSpan? PendingToSubmitted => contractSubmittedUtc - contractPendingUtc;
public TimeSpan? SubmittedToStarted => contractStartedUtc - contractSubmittedUtc; public TimeSpan? SubmittedToStarted => contractStartedUtc - contractSubmittedUtc;
public TimeSpan? SubmittedToFinished => contractFinishedUtc - contractSubmittedUtc; public TimeSpan? SubmittedToFinished => contractFinishedUtc - contractSubmittedUtc;
public TimeSpan? StartedToFinished => contractFinishedUtc - contractStartedUtc;
public void WaitForStorageContractSubmitted() public void WaitForStorageContractSubmitted()
{ {
WaitForStorageContractState(gracePeriod, "submitted", sleep: 200); WaitForStorageContractState(gracePeriod, "submitted", sleep: 200);
contractSubmittedUtc = DateTime.UtcNow; contractSubmittedUtc = DateTime.UtcNow;
LogSubmittedDuration(); LogSubmittedDuration();
AssertDuration(PendingToSubmitted, gracePeriod, nameof(PendingToSubmitted));
} }
public void WaitForStorageContractStarted() public void WaitForStorageContractStarted()
@ -121,6 +121,7 @@ namespace CodexPlugin
WaitForStorageContractState(timeout, "started"); WaitForStorageContractState(timeout, "started");
contractStartedUtc = DateTime.UtcNow; contractStartedUtc = DateTime.UtcNow;
LogStartedDuration(); LogStartedDuration();
AssertDuration(SubmittedToStarted, timeout, nameof(SubmittedToStarted));
} }
public void WaitForStorageContractFinished() public void WaitForStorageContractFinished()
@ -129,11 +130,12 @@ namespace CodexPlugin
{ {
WaitForStorageContractStarted(); WaitForStorageContractStarted();
} }
var currentContractTime = DateTime.UtcNow - contractStartedUtc!.Value; var currentContractTime = DateTime.UtcNow - contractSubmittedUtc!.Value;
var timeout = (Purchase.Duration - currentContractTime) + gracePeriod; var timeout = (Purchase.Duration - currentContractTime) + gracePeriod;
WaitForStorageContractState(timeout, "finished"); WaitForStorageContractState(timeout, "finished");
contractFinishedUtc = DateTime.UtcNow; contractFinishedUtc = DateTime.UtcNow;
LogFinishedDuration(); LogFinishedDuration();
AssertDuration(SubmittedToFinished, timeout, nameof(SubmittedToFinished));
} }
public StoragePurchase GetPurchaseStatus(string purchaseId) public StoragePurchase GetPurchaseStatus(string purchaseId)
@ -173,18 +175,31 @@ namespace CodexPlugin
private void LogSubmittedDuration() private void LogSubmittedDuration()
{ {
Log($"Pending to Submitted in {Time.FormatDuration(PendingToSubmitted)}"); Log($"Pending to Submitted in {Time.FormatDuration(PendingToSubmitted)} " +
$"( < {Time.FormatDuration(gracePeriod)})");
} }
private void LogStartedDuration() private void LogStartedDuration()
{ {
Log($"Submitted to Started in {Time.FormatDuration(SubmittedToStarted)}"); Log($"Submitted to Started in {Time.FormatDuration(SubmittedToStarted)} " +
$"( < {Time.FormatDuration(Purchase.Expiry + gracePeriod)})");
} }
private void LogFinishedDuration() private void LogFinishedDuration()
{ {
Log($"Submitted to Finished in {Time.FormatDuration(SubmittedToFinished)}"); Log($"Submitted to Finished in {Time.FormatDuration(SubmittedToFinished)} " +
Log($"Started to Finished in {Time.FormatDuration(StartedToFinished)}"); $"( < {Time.FormatDuration(Purchase.Duration + gracePeriod)})");
}
private void AssertDuration(TimeSpan? span, TimeSpan max, string message)
{
if (span == null) throw new ArgumentNullException(nameof(MarketplaceAccess) + ": " + message + " (IsNull)");
if (span.Value.TotalDays >= max.TotalSeconds)
{
throw new Exception(nameof(MarketplaceAccess) +
$": Duration out of range. Max: {Time.FormatDuration(max)} but was: {Time.FormatDuration(span.Value)} " +
message);
}
} }
private void Log(string msg) private void Log(string msg)

10
Tests/CodexTests/BasicTests/MarketplaceTests.cs
View File

@ -83,10 +83,6 @@ namespace CodexTests.BasicTests
AssertBalance(contracts, client, Is.LessThan(clientInitialBalance), "Buyer was not charged for storage."); AssertBalance(contracts, client, Is.LessThan(clientInitialBalance), "Buyer was not charged for storage.");
Assert.That(contracts.GetRequestState(request), Is.EqualTo(RequestState.Finished)); Assert.That(contracts.GetRequestState(request), Is.EqualTo(RequestState.Finished));
AssertDuration(purchaseContract.PendingToSubmitted, 30, 1, nameof(purchaseContract.PendingToSubmitted));
AssertDuration(purchaseContract.SubmittedToStarted, purchase.Expiry.TotalSeconds, 30, nameof(purchaseContract.SubmittedToStarted));
AssertDuration(purchaseContract.SubmittedToFinished, purchase.Duration.TotalSeconds, 30, nameof(purchaseContract.SubmittedToFinished));
} }
private void WaitForAllSlotFilledEvents(ICodexContracts contracts, StoragePurchaseRequest purchase, IGethNode geth) private void WaitForAllSlotFilledEvents(ICodexContracts contracts, StoragePurchaseRequest purchase, IGethNode geth)
@ -121,11 +117,5 @@ namespace CodexTests.BasicTests
var slotHost = contracts.GetSlotHost(request, contractSlotIndex); var slotHost = contracts.GetSlotHost(request, contractSlotIndex);
Assert.That(slotHost?.Address, Is.Not.Null); Assert.That(slotHost?.Address, Is.Not.Null);
} }
private void AssertDuration(TimeSpan? span, double expectedSeconds, int tolerance, string message)
{
Assert.That(span.HasValue, "IsNull: " + message);
Assert.That(span!.Value.TotalSeconds, Is.EqualTo(expectedSeconds).Within(tolerance), message);
}
} }
} }