fix test

Author: nuevoalex

tests/reporting/test_fee_distribution.py

@@ -6,6 +6,7 @@
 
 def test_initial_report_and_participation_fee_collection(localFixture, universe, market, categoricalMarket, scalarMarket, cash, reputationToken):
     feeWindow = localFixture.applySignature('FeeWindow', market.getFeeWindow())
+    constants = localFixture.contracts["Constants"]
 
     # We cannot purchase participation tokens yet since the window isn't active
     with raises(TransactionFailed):
@@ -68,14 +69,15 @@ def test_initial_report_and_participation_fee_collection(localFixture, universe,
 
     marketStake = marketInitialReport.getStake()
     expectedFees = reporterFees * marketStake / totalStake
+    expectedGasBond = 2 * constants.GAS_TO_REPORT() * constants.DEFAULT_REPORTING_GAS_PRICE()
     with TokenDelta(reputationToken, marketStake, tester.a0, "Redeeming didn't refund REP"):
-        with EtherDelta(expectedFees, tester.a0, localFixture.chain, "Redeeming didn't increase ETH correctly"):
+        with EtherDelta(expectedFees + expectedGasBond, tester.a0, localFixture.chain, "Redeeming didn't increase ETH correctly"):
             assert marketInitialReport.redeem(tester.a0)
 
     categoricalMarketStake = categoricalInitialReport.getStake()
     expectedFees = reporterFees * categoricalMarketStake / totalStake
     with TokenDelta(reputationToken, categoricalMarketStake, tester.a0, "Redeeming didn't refund REP"):
-        with EtherDelta(expectedFees, tester.a0, localFixture.chain, "Redeeming didn't increase ETH correctly"):
+        with EtherDelta(expectedFees + expectedGasBond, tester.a0, localFixture.chain, "Redeeming didn't increase ETH correctly"):
             assert categoricalInitialReport.redeem(tester.a0)
 
 def test_failed_crowdsourcer_fees(localFixture, universe, market, cash, reputationToken):
@@ -121,6 +123,7 @@ def test_failed_crowdsourcer_fees(localFixture, universe, market, cash, reputati
 
 def test_one_round_crowdsourcer_fees(localFixture, universe, market, cash, reputationToken):
     feeWindow = localFixture.applySignature('FeeWindow', market.getFeeWindow())
+    constants = localFixture.contracts["Constants"]
 
     # We'll make the window active
     localFixture.contracts["Time"].setTimestamp(feeWindow.getStartTime() + 1)
@@ -159,11 +162,14 @@ def test_one_round_crowdsourcer_fees(localFixture, universe, market, cash, reput
 
     # The initial reporter gets fees even though they were not correct. They do not get their REP back though
     expectedFees = cash.balanceOf(feeWindow.address) + cash.balanceOf(universe.getOrCreateFeeWindowBefore(feeWindow.address))
+    expectedGasBond = 2 * constants.GAS_TO_REPORT() * constants.DEFAULT_REPORTING_GAS_PRICE()
     with TokenDelta(reputationToken, 0, tester.a0, "Redeeming didn't refund REP"):
-        with EtherDelta(expectedFees, tester.a0, localFixture.chain, "Redeeming didn't increase ETH correctly"):
+        with EtherDelta(expectedFees + expectedGasBond, tester.a0, localFixture.chain, "Redeeming didn't increase ETH correctly"):
             assert initialReporter.redeem(tester.a0)
 
 def test_multiple_round_crowdsourcer_fees(localFixture, universe, market, cash, reputationToken):
+    constants = localFixture.contracts["Constants"]
+
     # Initial Report disputed
     proceedToNextRound(localFixture, market, tester.k1, True)
     # Initial Report winning
@@ -197,8 +203,9 @@ def test_multiple_round_crowdsourcer_fees(localFixture, universe, market, cash,
     # The initial reporter locked in REP for 5 rounds.
     expectedInitialReporterFees = getExpectedFees(localFixture, cash, initialReporter, 5)
     expectedRep = long(initialReporter.getStake() + initialReporter.getStake() / 2)
+    expectedGasBond = 2 * constants.GAS_TO_REPORT() * constants.DEFAULT_REPORTING_GAS_PRICE()
     with TokenDelta(reputationToken, expectedRep, tester.a0, "Redeeming didn't refund REP"):
-        with EtherDelta(expectedInitialReporterFees, tester.a0, localFixture.chain, "Redeeming didn't increase ETH correctly"):
+        with EtherDelta(expectedInitialReporterFees + expectedGasBond, tester.a0, localFixture.chain, "Redeeming didn't increase ETH correctly"):
             assert initialReporter.redeem(tester.a0)
 
     # The first winning dispute crowdsourcer will get fees for 4 rounds

tests/reporting/test_universe_redeem.py

@@ -62,6 +62,7 @@ def test_redeem_participation_tokens(kitchenSinkFixture, universe, market, cash)
 
 def test_redeem_reporting_participants(kitchenSinkFixture, market, categoricalMarket, scalarMarket, universe, cash):
     reputationToken = kitchenSinkFixture.applySignature("ReputationToken", universe.getReputationToken())
+    constants = kitchenSinkFixture.contracts["Constants"]
 
     # Initial Report
     proceedToNextRound(kitchenSinkFixture, market, doGenerateFees = True)
@@ -90,8 +91,9 @@ def test_redeem_reporting_participants(kitchenSinkFixture, market, categoricalMa
     expectedRep = long(winningDisputeCrowdsourcer2.getStake() + winningDisputeCrowdsourcer1.getStake())
     expectedRep = long(expectedRep + expectedRep / 2)
     expectedRep += long(initialReporter.getStake() + initialReporter.getStake() / 2)
+    expectedGasBond = 2 * constants.GAS_TO_REPORT() * constants.DEFAULT_REPORTING_GAS_PRICE()
     with TokenDelta(reputationToken, expectedRep, tester.a0, "Redeeming didn't refund REP"):
-        with EtherDelta(expectedFees, tester.a0, kitchenSinkFixture.chain, "Redeeming didn't increase ETH correctly"):
+        with EtherDelta(expectedFees +  expectedGasBond, tester.a0, kitchenSinkFixture.chain, "Redeeming didn't increase ETH correctly"):
             with PrintGasUsed(kitchenSinkFixture, "Universe Redeem:", 0):
                 assert universe.redeemStake([initialReporter.address, winningDisputeCrowdsourcer1.address, winningDisputeCrowdsourcer2.address], [])