From 5b564b14e10379c8797e8e79b67e9b3c089859d1 Mon Sep 17 00:00:00 2001 From: Arnaud Date: Thu, 6 Feb 2025 14:54:04 +0100 Subject: [PATCH] Clean up and fix tests --- codex/sales/reservations.nim | 6 +++--- tests/integration/testsales.nim | 26 -------------------------- 2 files changed, 3 insertions(+), 29 deletions(-) diff --git a/codex/sales/reservations.nim b/codex/sales/reservations.nim index f913d7c8..c34ba474 100644 --- a/codex/sales/reservations.nim +++ b/codex/sales/reservations.nim @@ -708,14 +708,14 @@ proc findAvailability*( let endTime = getTime().toUnix() + cast[int64](duration) for item in storables.items: if bytes =? (await item) and availability =? Availability.fromJson(bytes): - let enabled = availability.enabled - if enabled and size <= availability.freeSize and duration <= availability.duration and + if availability.enabled and size <= availability.freeSize and + duration <= availability.duration and collateralPerByte <= availability.maxCollateralPerByte and pricePerBytePerSecond >= availability.minPricePerBytePerSecond and (availability.until == 0 or availability.until >= endTime): trace "availability matched", id = availability.id, - enabled = enabled, + enabled = availability.enabled, size, availFreeSize = availability.freeSize, duration, diff --git a/tests/integration/testsales.nim b/tests/integration/testsales.nim index 6a7a2716..4571505d 100644 --- a/tests/integration/testsales.nim +++ b/tests/integration/testsales.nim @@ -135,32 +135,6 @@ multinodesuite "Sales": check updatedAvailability.totalSize == 100000 check updatedAvailability.freeSize == 100000 - test "updating availability - updating enabled", salesConfig: - let availability = host.postAvailability( - totalSize = 140000.u256, - duration = 200.u256, - minPricePerBytePerSecond = 3.u256, - totalCollateral = 300.u256, - enabled = true.some, - ).get - host.patchAvailability(availability.id, enabled = false.some) - let updatedAvailability = (host.getAvailabilities().get).findItem(availability).get - check updatedAvailability.enabled == false.some - - test "updating availability - updating until", salesConfig: - var until = cast[SecondsSince1970](getTime().toUnix()) - let availability = host.postAvailability( - totalSize = 140000.u256, - duration = 200.u256, - minPricePerBytePerSecond = 3.u256, - totalCollateral = 300.u256, - until = until.some, - ).get - until += 10.SecondsSince1970 - host.patchAvailability(availability.id, until = until.some) - let updatedAvailability = (host.getAvailabilities().get).findItem(availability).get - check updatedAvailability.until == until - test "updating availability - updating totalSize does not allow bellow utilized", salesConfig: let originalSize = 0xFFFFFF.uint64