From 3701ba2b6873733a7f75bff51bc051628e16cbf3 Mon Sep 17 00:00:00 2001 From: Mark Spanbroek Date: Thu, 7 Nov 2024 14:11:51 +0100 Subject: [PATCH] adjust integration tests for 1 slot queue worker reason: with only 1 slot queue worker, downloading of slots no longer happens in parallel and therefore takes longer --- tests/integration/testmarketplace.nim | 22 +++++++++++----------- tests/integration/testsales.nim | 10 +++++----- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/integration/testmarketplace.nim b/tests/integration/testmarketplace.nim index 1db98433..acadbac4 100644 --- a/tests/integration/testmarketplace.nim +++ b/tests/integration/testmarketplace.nim @@ -24,15 +24,15 @@ twonodessuite "Marketplace", debug1 = false, debug2 = false: let cid = client1.upload(data).get let id = client1.requestStorage( cid, - duration=10*60.u256, + duration=20*60.u256, reward=400.u256, proofProbability=3.u256, - expiry=5*60, + expiry=10*60, collateral=200.u256, - nodes = 5, - tolerance = 2).get + nodes = 3, + tolerance = 1).get - check eventually(client1.purchaseStateIs(id, "started"), timeout=5*60*1000) + check eventually(client1.purchaseStateIs(id, "started"), timeout=10*60*1000) let purchase = client1.getPurchase(id).get check purchase.error == none string let availabilities = client2.getAvailabilities().get @@ -41,7 +41,7 @@ twonodessuite "Marketplace", debug1 = false, debug2 = false: check newSize > 0 and newSize < size let reservations = client2.getAvailabilityReservations(availability.id).get - check reservations.len == 5 + check reservations.len == 3 check reservations[0].requestId == purchase.requestId test "node slots gets paid out and rest of tokens are returned to client": @@ -51,8 +51,8 @@ twonodessuite "Marketplace", debug1 = false, debug2 = false: let tokenAddress = await marketplace.token() let token = Erc20Token.new(tokenAddress, ethProvider.getSigner()) let reward = 400.u256 - let duration = 10*60.u256 - let nodes = 5'u + let duration = 20*60.u256 + let nodes = 3'u # client 2 makes storage available let startBalanceHost = await token.balanceOf(account2) @@ -65,12 +65,12 @@ twonodessuite "Marketplace", debug1 = false, debug2 = false: duration=duration, reward=reward, proofProbability=3.u256, - expiry=5*60, + expiry=10*60, collateral=200.u256, nodes = nodes, - tolerance = 2).get + tolerance = 1).get - check eventually(client1.purchaseStateIs(id, "started"), timeout=5*60*1000) + check eventually(client1.purchaseStateIs(id, "started"), timeout=10*60*1000) let purchase = client1.getPurchase(id).get check purchase.error == none string diff --git a/tests/integration/testsales.nim b/tests/integration/testsales.nim index 2a57d0f0..b904f405 100644 --- a/tests/integration/testsales.nim +++ b/tests/integration/testsales.nim @@ -60,15 +60,15 @@ twonodessuite "Sales", debug1 = false, debug2 = false: let cid = client2.upload(data).get let id = client2.requestStorage( cid, - duration=10*60.u256, + duration=20*60.u256, reward=400.u256, proofProbability=3.u256, - expiry=5*60, + expiry=10*60, collateral=200.u256, - nodes = 5, - tolerance = 2).get + nodes = 3, + tolerance = 1).get - check eventually(client2.purchaseStateIs(id, "started"), timeout=5*60*1000) + check eventually(client2.purchaseStateIs(id, "started"), timeout=10*60*1000) let updatedAvailability = (client1.getAvailabilities().get).findItem(availability).get check updatedAvailability.totalSize != updatedAvailability.freeSize