Skip to content

Commit

Permalink
adjust timing of integration tests
Browse files Browse the repository at this point in the history
reason: with the increased period length of 90 seconds, it
can take longer to wait for a stable challenge at the
beginning of a period.
  • Loading branch information
markspanbroek committed Nov 14, 2024
1 parent 523e8cb commit 90e3686
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions tests/integration/testecbug.nim
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ marketplacesuite "Bug #821 - node crashes during erasure coding":
.some,
):
let reward = 400.u256
let duration = 10.periods
let duration = 20.periods
let collateral = 200.u256
let expiry = 5.periods
let expiry = 10.periods
let data = await RandomChunker.example(blocks=8)
let client = clients()[0]
let clientApi = client.client
Expand Down
26 changes: 13 additions & 13 deletions tests/integration/testmarketplace.nim
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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":
Expand All @@ -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)
Expand All @@ -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

Expand Down Expand Up @@ -112,9 +112,9 @@ marketplacesuite "Marketplace payouts":
.some,
):
let reward = 400.u256
let duration = 10.periods
let duration = 20.periods
let collateral = 200.u256
let expiry = 5.periods
let expiry = 10.periods
let data = await RandomChunker.example(blocks=8)
let client = clients()[0]
let provider = providers()[0]
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/testproofs.nim
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ marketplacesuite "Hosts submit regular proofs":
.some,
):
let client0 = clients()[0].client
let expiry = 5.periods
let expiry = 10.periods
let duration = expiry + 5.periods

let data = await RandomChunker.example(blocks=8)
Expand Down Expand Up @@ -99,7 +99,7 @@ marketplacesuite "Simulate invalid proofs":
.some
):
let client0 = clients()[0].client
let expiry = 5.periods
let expiry = 10.periods
let duration = expiry + 10.periods

let data = await RandomChunker.example(blocks=8)
Expand Down Expand Up @@ -157,7 +157,7 @@ marketplacesuite "Simulate invalid proofs":
.some
):
let client0 = clients()[0].client
let expiry = 5.periods
let expiry = 10.periods
let duration = expiry + 10.periods

let data = await RandomChunker.example(blocks=8)
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/testsales.nim
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 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

Expand Down

0 comments on commit 90e3686

Please sign in to comment.