From c54ee9ea1a1317ab98e58fb78a95d0b5a578fe2a Mon Sep 17 00:00:00 2001
From: Eric <5089238+emizzle@users.noreply.github.com>
Date: Wed, 20 Dec 2023 08:39:58 +1100
Subject: [PATCH] temporarily remove failing integration test (#659)

* temporarily remove failing integration test

Temporarily removing this test for now as it occasionally fails on macos/linux. This test has been completely refactored in PR #607 in which it will be retintroduced.

* skip instead of comment out
---
 tests/integration/testIntegration.nim | 53 ++++++++++++++-------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/tests/integration/testIntegration.nim b/tests/integration/testIntegration.nim
index 16940d98..eed181f5 100644
--- a/tests/integration/testIntegration.nim
+++ b/tests/integration/testIntegration.nim
@@ -243,33 +243,34 @@ twonodessuite "Integration tests", debug1 = false, debug2 = false:
     check responseBefore.status == "400 Bad Request"
     check responseBefore.body == "Expiry has to be before the request's end (now + duration)"
 
-  # TODO: commenting out this test for now as is not passing on linux for some
-  # reason. This test has been completely refactored in another PR in which it
-  # will be reintroduced in a newer form.
-  # test "expired request partially pays out for stored time":
-  #   let marketplace = Marketplace.new(Marketplace.address, provider.getSigner())
-  #   let tokenAddress = await marketplace.token()
-  #   let token = Erc20Token.new(tokenAddress, provider.getSigner())
-  #   let reward = 400.u256
-  #   let duration = 100.u256
+  # TODO: skipping this test for now as is not passing on macos/linux for some
+  # reason. This test has been completely refactored in
+  # https://github.com/codex-storage/nim-codex/pull/607 in which it will be
+  # reintroduced.
+  test "expired request partially pays out for stored time":
+    skip
+    let marketplace = Marketplace.new(Marketplace.address, ethProvider.getSigner())
+    let tokenAddress = await marketplace.token()
+    let token = Erc20Token.new(tokenAddress, ethProvider.getSigner())
+    let reward = 400.u256
+    let duration = 100.u256
 
-  #   # client 2 makes storage available
-  #   let startBalanceClient2 = await token.balanceOf(account2)
-  #   discard client2.postAvailability(size=140000.u256, duration=200.u256, minPrice=300.u256, maxCollateral=300.u256).get
+    # client 2 makes storage available
+    let startBalanceClient2 = await token.balanceOf(account2)
+    discard client2.postAvailability(size=140000.u256, duration=200.u256, minPrice=300.u256, maxCollateral=300.u256).get
 
-  #   # client 1 requests storage but requires two nodes to host the content
-  #   let startBalanceClient1 = await token.balanceOf(account1)
-  #   let expiry = (await provider.currentTime()) + 10
-  #   let cid = client1.upload(exampleString(100000)).get
-  #   let id = client1.requestStorage(cid, duration=duration, reward=reward, proofProbability=3.u256, expiry=expiry, collateral=200.u256, nodes=2).get
+    # client 1 requests storage but requires two nodes to host the content
+    let startBalanceClient1 = await token.balanceOf(account1)
+    let expiry = (await ethProvider.currentTime()) + 10
+    let cid = client1.upload(exampleString(100000)).get
+    let id = client1.requestStorage(cid, duration=duration, reward=reward, proofProbability=3.u256, expiry=expiry, collateral=200.u256, nodes=2).get
 
-  #   # We have to wait for Client 2 fills the slot, before advancing time.
-  #   # Until https://github.com/codex-storage/nim-codex/issues/594 is implemented nothing better then
-  #   # sleeping some seconds is available.
-  #   await sleepAsync(2.seconds)
-  #   await provider.advanceTimeTo(expiry+1)
-  #   check eventually(client1.purchaseStateIs(id, "cancelled"), 20000)
-
-  #   check eventually ((await token.balanceOf(account2)) - startBalanceClient2) > 0 and ((await token.balanceOf(account2)) - startBalanceClient2) < 10*reward
-  #   check eventually (startBalanceClient1 - (await token.balanceOf(account1))) == ((await token.balanceOf(account2)) - startBalanceClient2)
+    # We have to wait for Client 2 fills the slot, before advancing time.
+    # Until https://github.com/codex-storage/nim-codex/issues/594 is implemented nothing better then
+    # sleeping some seconds is available.
+    await sleepAsync(2.seconds)
+    await ethProvider.advanceTimeTo(expiry+1)
+    check eventually(client1.purchaseStateIs(id, "cancelled"), 20000)
 
+    check eventually ((await token.balanceOf(account2)) - startBalanceClient2) > 0 and ((await token.balanceOf(account2)) - startBalanceClient2) < 10*reward
+    check eventually (startBalanceClient1 - (await token.balanceOf(account1))) == ((await token.balanceOf(account2)) - startBalanceClient2)