Merge pull request #513 from AugurProject/fee-window-unit-tests

new fee window unit tests. added and modified mocks, removed unneeded…

Author: bthaile

source/contracts/factories/DisputeCrowdsourcerFactory.sol

@@ -3,7 +3,6 @@ pragma solidity 0.4.18;
 import 'libraries/Delegator.sol';
 import 'reporting/IDisputeCrowdsourcer.sol';
 import 'reporting/IMarket.sol';
-import 'reporting/IFeeWindow.sol';
 import 'IController.sol';
 
 

source/contracts/factories/MarketFactory.sol

@@ -2,7 +2,6 @@ pragma solidity 0.4.18;
 
 
 import 'libraries/Delegator.sol';
-import 'reporting/IFeeWindow.sol';
 import 'reporting/IMarket.sol';
 import 'reporting/IReputationToken.sol';
 import 'trading/ICash.sol';

source/contracts/reporting/FeeWindow.sol

@@ -16,7 +16,6 @@ import 'reporting/Reporting.sol';
 import 'libraries/math/SafeMathUint256.sol';
 import 'libraries/math/RunningAverage.sol';
 import 'reporting/IFeeWindow.sol';
-import 'factories/FeeWindowFactory.sol';
 import 'libraries/Extractable.sol';
 import 'libraries/token/VariableSupplyToken.sol';
 import 'reporting/IFeeToken.sol';
@@ -108,7 +107,7 @@ contract FeeWindow is DelegationTarget, VariableSupplyToken, Extractable, Initia
         }
 
         if (_totalFeeStake == 0) {
-            return;
+            return true;
         }
 
         // CASH

tests/solidity_test_helpers/MockFeeToken.sol

@@ -0,0 +1,114 @@
+pragma solidity 0.4.18;
+
+import 'reporting/IFeeToken.sol';
+import 'reporting/IFeeWindow.sol';
+import 'libraries/DelegationTarget.sol';
+import 'TEST/MockVariableSupplyToken.sol';
+
+
+contract MockFeeToken is DelegationTarget, MockVariableSupplyToken, IFeeToken {
+    bool private onBurnCalledValue;
+    bool private onMintCalledValue;
+    bool private onTokenTransferValue;
+    IFeeWindow private initializeFeeWindowValue;
+    address private feeWindowBurnTargetValue;
+    uint256 private feeWindowBurnAmountValue;
+    address private mintForReportingParticipantTargetValue;
+    uint256 private mintForReportingParticipantAmountValue;
+    address private onTokenTransferFromValue;
+    address private onTokenTransferToValue;
+    uint256 private onTokenTransferValueValue;
+    address private onMintTargetValue;
+    uint256 private onMintAmountValue;
+    address private onBurnTargetValue;
+    uint256 private onBurnAmountValue;
+
+    function reset() public {
+        onBurnCalledValue = false;
+        onMintCalledValue = false;
+        onTokenTransferValue = false;
+        feeWindowBurnTargetValue = address(0);
+        feeWindowBurnAmountValue = 0;
+    }
+
+    function onBurnCalled() public returns(bool) {
+        return onBurnCalledValue;
+    }
+
+    function onMintCalled() public returns(bool) {
+        return onMintCalledValue;
+    }
+
+    function onTokenTransferCalled() public returns(bool) {
+        return onTokenTransferValue;
+    }
+
+    function getInitializedFeeWindow() public returns(IFeeWindow) {
+        return initializeFeeWindowValue;
+    }
+
+    function initialize(IFeeWindow _feeWindow) public beforeInitialized returns (bool) {
+        initializeFeeWindowValue = _feeWindow;
+        return true;
+    }
+
+    function getFeeWindow() public view returns (IFeeWindow) {
+        return initializeFeeWindowValue;
+    }
+
+    function getFeeWindowBurnTargetValue() public returns(address) { return feeWindowBurnTargetValue; }
+
+    function getFeeWindowBurnAmountValue() public returns(uint256) { return feeWindowBurnAmountValue; }
+
+    function feeWindowBurn(address _target, uint256 _amount) public returns (bool) {
+        feeWindowBurnTargetValue = _target;
+        feeWindowBurnAmountValue = _amount;
+        return true;
+    }
+
+    function getMintForReportingParticipantTargetValue() public returns(address) { return mintForReportingParticipantTargetValue; }
+
+    function getMintForReportingParticipantAmountValue() public returns(uint256) { return mintForReportingParticipantAmountValue; }
+
+    function mintForReportingParticipant(address _target, uint256 _amount) public returns (bool) {
+        mintForReportingParticipantTargetValue = _target;
+        mintForReportingParticipantAmountValue = _amount;
+        return true;
+    }
+
+    function getOnTokenTransferFromValue() public returns (address) { return onTokenTransferFromValue;}
+
+    function getOnTokenTransferToValue() public returns (address) { return onTokenTransferToValue;}
+
+    function getOnTokenTransferValueValue() public returns (uint256) { return onTokenTransferValueValue;}
+
+    function getOnMintTargetValue() public returns (address) { return onMintTargetValue;}
+
+    function getOnMintAmountValue() public returns (uint256) { return onMintAmountValue;}
+    
+    function getOnBurnTargetValue() public returns (address) { return onBurnTargetValue;}
+
+    function getOnBurnAmountValue() public returns (uint256) { return onBurnAmountValue;}
+
+    function onBurn(address _target, uint256 _amount) internal returns (bool) {
+        onBurnCalledValue = true;
+        onBurnTargetValue = _target;
+        onBurnAmountValue = _amount;
+        return true;
+    }
+    
+    function onTokenTransfer(address _from, address _to, uint256 _value) internal returns (bool) {
+        onTokenTransferValue = true;
+        onTokenTransferFromValue = _from;
+        onTokenTransferToValue = _to;
+        onTokenTransferValueValue = _value;
+        return true;
+    }
+
+    function onMint(address _target, uint256 _amount) internal returns (bool) {
+        onMintCalledValue = true;
+        onMintTargetValue = _target;
+        onMintAmountValue = _amount;
+        return true;
+    }
+}

tests/solidity_test_helpers/MockFeeTokenFactory.sol

@@ -0,0 +1,29 @@
+pragma solidity 0.4.18;
+
+
+import 'libraries/Delegator.sol';
+import 'reporting/IFeeWindow.sol';
+import 'IController.sol';
+
+
+contract MockFeeTokenFactory {
+    IFeeWindow private createFeeTokenFeeWindowValue;
+    IFeeToken private setCreateFeeTokenValue;
+
+    function getCreateFeeToken() public returns(IFeeToken) {
+        return setCreateFeeTokenValue;
+    }
+
+    function setCreateFeeToken(IFeeToken _feeToken) public {
+        setCreateFeeTokenValue = _feeToken;
+    }
+
+    function getCreateFeeTokenFeeWindowValue() public returns(IFeeWindow) {
+        return createFeeTokenFeeWindowValue;
+    }
+    
+    function createFeeToken(IController _controller, IFeeWindow _feeWindow) public returns (IFeeToken) {
+        createFeeTokenFeeWindowValue = _feeWindow;
+        return setCreateFeeTokenValue;
+    }
+}

tests/solidity_test_helpers/MockFeeWindowFactory.sol

@@ -3,23 +3,33 @@ pragma solidity 0.4.18;
 
 import 'IController.sol';
 import 'reporting/IUniverse.sol';
-import 'reporting/IReputationToken.sol';
+import 'reporting/IFeeWindow.sol';
 
 
 contract MockFeeWindowFactory {
     IUniverse private createFeeWindowUniverseValue;
     IFeeWindow private createFeeWindowValue;
+    uint256 private createfeeWindowIdValue;
 
     function getCreateFeeWindowUniverseValue() public returns(IUniverse) {
         return createFeeWindowUniverseValue;
     }
 
+    function getCreateFeeWindowValue(IFeeWindow _feeWindowValue) public returns(IFeeWindow) {
+        return createFeeWindowValue;
+    }
+
+    function getCreatefeeWindowIdValue() public returns(uint256) {
+        return createfeeWindowIdValue;
+    }
+    
     function setCreateFeeWindowValue(IFeeWindow _feeWindowValue) public {
         createFeeWindowValue = _feeWindowValue;
     }
 
     function createFeeWindow(IController _controller, IUniverse _universe, uint256 _feeWindowId) public returns (IFeeWindow) {
         createFeeWindowUniverseValue = _universe;
+        createfeeWindowIdValue = _feeWindowId;
         return createFeeWindowValue;
     }
 }

tests/solidity_test_helpers/MockInitialReporter.sol

@@ -26,6 +26,10 @@ contract MockInitialReporter is IInitialReporter {
         return true;
     }
 
+    function callMintFeeTokens(IFeeWindow _feeWindow, uint256 _amount) public returns (bool) {
+        return _feeWindow.mintFeeTokens(_amount);
+    }
+
     function report(address _reporter, bytes32 _payoutDistributionHash, uint256[] _payoutNumerators, bool _invalid) public returns (bool) {
         return true;
     }

tests/solidity_test_helpers/MockMarket.sol

@@ -32,7 +32,7 @@ contract MockMarket is IMarket {
     uint256 private firstReporterCompCheck;
     bool private migrateDueToNoRep;
     bool private isContForShareToken;
-    bool private isValidValue;
+    bool private isInValidValue;
     address private owner;
     bool private transferOwner;
     IUniverse private initializeUniverseValue;
@@ -44,6 +44,8 @@ contract MockMarket is IMarket {
     address private initializeCreatorValue;
     address private initializeDesignatedReporterAddressValue;
     IMailbox private setMarketCreatorMailbox;
+    bool private setDesignatedReporterWasCorrectValue;
+    bool private setDesignatedReporterShowedValue;
     /*
     * setters to feed the getters and impl of IMarket
     */
@@ -139,8 +141,8 @@ contract MockMarket is IMarket {
         isContForShareToken = _isContForShareToken;
     }
 
-    function setIsValid(bool _isValidValue) public {
-        isValidValue = _isValidValue;
+    function setIsInvalid(bool _isInValidValue) public {
+        isInValidValue = _isInValidValue;
     }
 
     function setOwner(address _owner) public {
@@ -203,6 +205,10 @@ contract MockMarket is IMarket {
         setMarketCreatorMailbox = _setMarketCreatorMailbox;
     }
 
+    function callOnMarketFinalized(IFeeWindow _feeWindow) public returns(bool) {
+        return _feeWindow.onMarketFinalized();
+    }
+
     /*
     * IMarket methods
     */
@@ -329,8 +335,8 @@ contract MockMarket is IMarket {
         return isContForShareToken;
     }
 
-    function isValid() public view returns (bool) {
-        return isValidValue;
+    function isInvalid() public view returns (bool) {
+        return isInValidValue;
     }
 
     function getMarketCreatorMailbox() public view returns (IMailbox) {
@@ -357,20 +363,20 @@ contract MockMarket is IMarket {
         return true;
     }
 
-    function isInvalid() public view returns (bool) {
-        return true;
-    }
-
     function finishedCrowdsourcingDisputeBond() public returns (bool) {
         return true;
     }
 
+    function setDesignatedReporterWasCorrect(bool _designatedReporterWasCorrect) public { setDesignatedReporterWasCorrectValue = _designatedReporterWasCorrect; }
+    
     function designatedReporterWasCorrect() public view returns (bool) {
-        return true;
+        return setDesignatedReporterWasCorrectValue;
     }
 
+    function setDesignatedReporterShowed(bool _designatedReporterShowed) public { setDesignatedReporterShowedValue = _designatedReporterShowed; }
+
     function designatedReporterShowed() public view returns (bool) {
-        return true;
+        return setDesignatedReporterShowedValue;
     }
 
     function isFinalized() public view returns (bool) {

tests/solidity_test_helpers/MockUniverse.sol

@@ -23,7 +23,7 @@ contract MockUniverse is Initializable, IUniverse {
     IMarket private setForkingMarketValue;
     uint256 private setForkEndTimeValue;
     bytes32 private setParentPayoutDistributionHashValue;
-    uint256 private setReportingPeriodDurationInSecondsValue;
+    uint256 private setDisputeRoundDurationInSecondsValue;
     IFeeWindow private setFeeWindowByTimestampValue;
     IFeeWindow private setFeeWindowByMarketEndTimeValue;
     IFeeWindow private setCurrentFeeWindowValue;
@@ -53,6 +53,8 @@ contract MockUniverse is Initializable, IUniverse {
     uint256 private setForkReputationGoalValue;
     MarketFactory private marketFactory;
     Controller private controller;
+    bool private setIsContainerForReportingParticipantValue;
+    bool private setIsForkingValue;
     /*
     * setters to feed the getters and impl of IUniverse
     */
@@ -88,8 +90,8 @@ contract MockUniverse is Initializable, IUniverse {
         setParentPayoutDistributionHashValue = _setParentPayoutDistributionHashValue;
     }
 
-    function setReportingPeriodDurationInSeconds(uint256 _setReportingPeriodDurationInSecondsValue) public {
-        setReportingPeriodDurationInSecondsValue = _setReportingPeriodDurationInSecondsValue;
+    function setDisputeRoundDurationInSeconds(uint256 _setDisputeRoundDurationInSecondsValue) public {
+        setDisputeRoundDurationInSecondsValue = _setDisputeRoundDurationInSecondsValue;
     }
 
     function setFeeWindowByTimestamp(IFeeWindow _setFeeWindowByTimestampValue) public {
@@ -200,6 +202,9 @@ contract MockUniverse is Initializable, IUniverse {
         return initializeParentPayoutDistributionHashValue;
     }
 
+    function setIsContainerForReportingParticipant(bool _value) public {
+        setIsContainerForReportingParticipantValue = _value;
+    }
     /*
     * Impl of IUniverse and ITyped
      */
@@ -247,7 +252,7 @@ contract MockUniverse is Initializable, IUniverse {
     }
 
     function getDisputeRoundDurationInSeconds() public view returns (uint256) {
-        return setReportingPeriodDurationInSecondsValue;
+        return setDisputeRoundDurationInSecondsValue;
     }
 
     function getOrCreateFeeWindowByTimestamp(uint256 _timestamp) public returns (IFeeWindow) {
@@ -396,7 +401,7 @@ contract MockUniverse is Initializable, IUniverse {
     }
 
     function isContainerForReportingParticipant(IReportingParticipant _reportingParticipant) public view returns (bool) {
-        return true;
+        return setIsContainerForReportingParticipantValue;
     }
 
     function addMarketTo() public returns (bool) {
@@ -423,8 +428,10 @@ contract MockUniverse is Initializable, IUniverse {
         return true;
     }
 
+    function setIsForking(bool _isForking) public { setIsForkingValue = _isForking; }
+
     function isForking() public view returns (bool) {
-        return true;
+        return setIsForkingValue;
     }
 
     function updateTentativeWinningChildUniverse(bytes32 _parentPayoutDistributionHash) public returns (bool) {