Merge pull request #522 from AugurProject/feature/add_mailbox

Move Mailbox to Reporting

Author: pgebheim

source/contracts/factories/MailboxFactory.sol

@@ -3,7 +3,7 @@ pragma solidity 0.4.18;
 
 import 'libraries/Delegator.sol';
 import 'IController.sol';
-import 'libraries/IMailbox.sol';
+import 'reporting/IMailbox.sol';
 
 
 contract MailboxFactory {

source/contracts/libraries/IMailbox.sol renamed to source/contracts/reporting/IMailbox.sol

@@ -10,7 +10,7 @@ import 'reporting/IFeeWindow.sol';
 import 'trading/IShareToken.sol';
 import 'reporting/IReportingParticipant.sol';
 import 'reporting/IReputationToken.sol';
-import 'libraries/IMailbox.sol';
+import 'reporting/IMailbox.sol';
 
 
 contract IMarket is ITyped, IOwnable {

source/contracts/reporting/IMarket.sol

@@ -3,8 +3,8 @@ pragma solidity 0.4.18;
 import 'libraries/DelegationTarget.sol';
 import 'libraries/Ownable.sol';
 import 'libraries/token/ERC20Basic.sol';
-import 'libraries/IMailbox.sol';
 import 'libraries/Initializable.sol';
+import 'reporting/IMailbox.sol';
 import 'trading/ICash.sol';
 
 

source/contracts/libraries/Mailbox.sol renamed to source/contracts/reporting/Mailbox.sol

@@ -21,7 +21,7 @@ import 'libraries/math/SafeMathUint256.sol';
 import 'libraries/math/SafeMathInt256.sol';
 import 'libraries/Extractable.sol';
 import 'factories/MailboxFactory.sol';
-import 'libraries/IMailbox.sol';
+import 'reporting/IMailbox.sol';
 import 'reporting/Reporting.sol';
 import 'reporting/IInitialReporter.sol';
 import 'Augur.sol';
@@ -167,7 +167,7 @@ contract Market is DelegationTarget, Extractable, ITyped, Initializable, Ownable
 
     function finalize() public onlyInGoodTimes returns (bool) {
         require(winningPayoutDistributionHash == bytes32(0));
-        
+
         if (universe.getForkingMarket() == this) {
             return finalizeFork();
         }

source/contracts/reporting/Market.sol

@@ -76,7 +76,7 @@ def localSnapshot(fixture, controllerSnapshot):
     # Upload the mailbox
     name = "Mailbox"
     targetName = "MailboxTarget"
-    fixture.uploadAndAddToController("../source/contracts/libraries/Mailbox.sol", targetName, name)
+    fixture.uploadAndAddToController("../source/contracts/reporting/Mailbox.sol", targetName, name)
     fixture.uploadAndAddToController("../source/contracts/libraries/Delegator.sol", name, "delegator", constructorArgs=[fixture.contracts['Controller'].address, stringToBytes(targetName)])
     fixture.contracts[name] = fixture.applySignature(name, fixture.contracts[name].address)
     fixture.contracts[name].initialize(tester.a0)

tests/libraries/test_mailbox.py

@@ -2,8 +2,8 @@ pragma solidity ^0.4.18;
 
 import 'reporting/IMarket.sol';
 import 'reporting/IUniverse.sol';
+import 'reporting/IMailbox.sol';
 import 'libraries/ITyped.sol';
-import 'libraries/IMailbox.sol';
 
 
 contract MockMarket is IMarket {
@@ -368,7 +368,7 @@ contract MockMarket is IMarket {
     }
 
     function setDesignatedReporterWasCorrect(bool _designatedReporterWasCorrect) public { setDesignatedReporterWasCorrectValue = _designatedReporterWasCorrect; }
-    
+
     function designatedReporterWasCorrect() public view returns (bool) {
         return setDesignatedReporterWasCorrectValue;
     }