Fix Synthetix.isWaitingPeriod() and run format

jjgonecrypto · jjgonecrypto · commit 2f4791a10b1d · 2020-02-17T15:16:47.000+07:00
diff --git a/contracts/AddressResolver.sol b/contracts/AddressResolver.sol
@@ -2,6 +2,7 @@ pragma solidity 0.4.25;
 
 import "./Owned.sol";
 
+
 contract AddressResolver is Owned {
     mapping(bytes32 => address) public repository;
 
diff --git a/contracts/EtherCollateral.sol b/contracts/EtherCollateral.sol
@@ -10,6 +10,7 @@ import "./interfaces/IERC20.sol";
 import "./interfaces/IDepot.sol";
 import "./MixinResolver.sol";
 
+
 contract EtherCollateral is Owned, Pausable, ReentrancyGuard, MixinResolver {
     using SafeMath for uint256;
     using SafeDecimalMath for uint256;
@@ -390,21 +391,18 @@ contract EtherCollateral is Owned, Pausable, ReentrancyGuard, MixinResolver {
         address _foundAddress = resolver.getAddress("SynthsETH");
         require(_foundAddress != address(0), "Resolver is missing SynthsETH address");
         return ISynth(_foundAddress);
-
     }
 
     function synthsUSD() internal view returns (ISynth) {
         address _foundAddress = resolver.getAddress("SynthsUSD");
         require(_foundAddress != address(0), "Resolver is missing SynthsUSD address");
         return ISynth(_foundAddress);
-
     }
 
     function depot() internal view returns (IDepot) {
         address _foundAddress = resolver.getAddress("Depot");
         require(_foundAddress != address(0), "Resolver is missing Depot address");
         return IDepot(_foundAddress);
-
     }
 
     // ========== EVENTS ==========
diff --git a/contracts/ExchangeRates.sol b/contracts/ExchangeRates.sol
@@ -7,6 +7,7 @@ import "./SelfDestructible.sol";
 // AggregatorInterface from Chainlink represents a decentralized pricing network for a single currency key
 import "chainlink/contracts/interfaces/AggregatorInterface.sol";
 
+
 /**
  * @title The repository for exchange rates
  */
diff --git a/contracts/ExchangeState.sol b/contracts/ExchangeState.sol
@@ -2,6 +2,7 @@ pragma solidity 0.4.25;
 
 import "./State.sol";
 
+
 contract ExchangeState is State {
     struct ExchangeEntry {
         bytes32 src;
diff --git a/contracts/Exchanger.sol b/contracts/Exchanger.sol
@@ -9,6 +9,7 @@ import "./interfaces/ISynthetix.sol";
 import "./interfaces/IFeePool.sol";
 import "./interfaces/IIssuer.sol";
 
+
 contract Exchanger is MixinResolver {
     using SafeMath for uint;
     using SafeDecimalMath for uint;
@@ -30,28 +31,24 @@ contract Exchanger is MixinResolver {
         address _foundAddress = resolver.getAddress("ExchangeState");
         require(_foundAddress != address(0), "Resolver is missing ExchangeState address");
         return IExchangeState(_foundAddress);
-
     }
 
     function exchangeRates() internal view returns (IExchangeRates) {
         address _foundAddress = resolver.getAddress("ExchangeRates");
         require(_foundAddress != address(0), "Resolver is missing ExchangeRates address");
         return IExchangeRates(_foundAddress);
-
     }
 
     function synthetix() internal view returns (ISynthetix) {
         address _foundAddress = resolver.getAddress("Synthetix");
         require(_foundAddress != address(0), "Resolver is missing Synthetix address");
         return ISynthetix(_foundAddress);
-
     }
 
     function feePool() internal view returns (IFeePool) {
         address _foundAddress = resolver.getAddress("FeePool");
         require(_foundAddress != address(0), "Resolver is missing FeePool address");
         return IFeePool(_foundAddress);
-
     }
 
     function maxSecsLeftInWaitingPeriod(address account, bytes32 currencyKey) public view returns (uint) {
diff --git a/contracts/FeePool.sol b/contracts/FeePool.sol
@@ -16,6 +16,7 @@ import "./FeePoolState.sol";
 import "./FeePoolEternalStorage.sol";
 import "./DelegateApprovals.sol";
 
+
 contract FeePool is Proxyable, SelfDestructible, LimitedSetup, MixinResolver {
     using SafeMath for uint;
     using SafeDecimalMath for uint;
@@ -93,14 +94,12 @@ contract FeePool is Proxyable, SelfDestructible, LimitedSetup, MixinResolver {
         address _foundAddress = resolver.getAddress("Synthetix");
         require(_foundAddress != address(0), "Resolver is missing Synthetix address");
         return ISynthetix(_foundAddress);
-
     }
 
     function feePoolState() internal view returns (FeePoolState) {
         address _foundAddress = resolver.getAddress("FeePoolState");
         require(_foundAddress != address(0), "Resolver is missing FeePoolState address");
         return FeePoolState(_foundAddress);
-
     }
 
     function feePoolEternalStorage() internal view returns (FeePoolEternalStorage) {
@@ -115,35 +114,30 @@ contract FeePool is Proxyable, SelfDestructible, LimitedSetup, MixinResolver {
         address _foundAddress = resolver.getAddress("Exchanger");
         require(_foundAddress != address(0), "Resolver is missing Exchanger address");
         return IExchanger(_foundAddress);
-
     }
 
     function issuer() internal view returns (IIssuer) {
         address _foundAddress = resolver.getAddress("Issuer");
         require(_foundAddress != address(0), "Resolver is missing Issuer address");
         return IIssuer(_foundAddress);
-
     }
 
     function synthetixState() internal view returns (ISynthetixState) {
         address _foundAddress = resolver.getAddress("SynthetixState");
         require(_foundAddress != address(0), "Resolver is missing the SynthetixState address");
         return ISynthetixState(_foundAddress);
-
     }
 
     function rewardEscrow() internal view returns (ISynthetixEscrow) {
         address _foundAddress = resolver.getAddress("RewardEscrow");
         require(_foundAddress != address(0), "Resolver is missing RewardEscrow address");
         return ISynthetixEscrow(_foundAddress);
-
     }
 
     function delegateApprovals() internal view returns (DelegateApprovals) {
         address _foundAddress = resolver.getAddress("DelegateApprovals");
         require(_foundAddress != address(0), "Resolver is missing DelegateApprovals address");
         return DelegateApprovals(_foundAddress);
-
     }
 
     function recentFeePeriods(uint index)
@@ -587,7 +581,6 @@ contract FeePool is Proxyable, SelfDestructible, LimitedSetup, MixinResolver {
         //          return _value;
         //      }
         //      return fee;
-
     }
 
     /**
diff --git a/contracts/Issuer.sol b/contracts/Issuer.sol
@@ -8,6 +8,7 @@ import "./interfaces/IFeePool.sol";
 import "./interfaces/ISynthetixState.sol";
 import "./interfaces/IExchanger.sol";
 
+
 contract Issuer is MixinResolver {
     using SafeMath for uint;
     using SafeDecimalMath for uint;
@@ -21,28 +22,24 @@ contract Issuer is MixinResolver {
         address _foundAddress = resolver.getAddress("Synthetix");
         require(_foundAddress != address(0), "Resolver is missing Synthetix address");
         return ISynthetix(_foundAddress);
-
     }
 
     function exchanger() internal view returns (IExchanger) {
         address _foundAddress = resolver.getAddress("Exchanger");
         require(_foundAddress != address(0), "Resolver is missing Exchanger address");
         return IExchanger(_foundAddress);
-
     }
 
     function synthetixState() internal view returns (ISynthetixState) {
         address _foundAddress = resolver.getAddress("SynthetixState");
         require(_foundAddress != address(0), "Resolver is missing the SynthetixState address");
         return ISynthetixState(_foundAddress);
-
     }
 
     function feePool() internal view returns (IFeePool) {
         address _foundAddress = resolver.getAddress("FeePool");
         require(_foundAddress != address(0), "Resolver is missing FeePool address");
         return IFeePool(_foundAddress);
-
     }
 
     /* ========== SETTERS ========== */
diff --git a/contracts/MixinResolver.sol b/contracts/MixinResolver.sol
@@ -3,6 +3,7 @@ pragma solidity 0.4.25;
 import "./Owned.sol";
 import "./AddressResolver.sol";
 
+
 contract MixinResolver is Owned {
     AddressResolver public resolver;
 
diff --git a/contracts/MultiCollateralSynth.sol b/contracts/MultiCollateralSynth.sol
@@ -19,6 +19,7 @@ pragma solidity 0.4.25;
 
 import "./Synth.sol";
 
+
 contract MultiCollateralSynth is Synth {
     /* ========== CONSTRUCTOR ========== */
     bytes32 public multiCollateralKey;
diff --git a/contracts/PurgeableSynth.sol b/contracts/PurgeableSynth.sol
@@ -5,6 +5,7 @@ import "./Synth.sol";
 import "./interfaces/IExchangeRates.sol";
 import "./interfaces/ISynthetix.sol";
 
+
 contract PurgeableSynth is Synth {
     using SafeDecimalMath for uint;
 
@@ -30,7 +31,6 @@ contract PurgeableSynth is Synth {
         address _foundAddress = resolver.getAddress("ExchangeRates");
         require(_foundAddress != address(0), "Resolver is missing ExchangeRates address");
         return IExchangeRates(_foundAddress);
-
     }
 
     /* ========== MUTATIVE FUNCTIONS ========== */
diff --git a/contracts/Synth.sol b/contracts/Synth.sol
@@ -7,6 +7,7 @@ import "./interfaces/IExchanger.sol";
 import "./interfaces/IIssuer.sol";
 import "./MixinResolver.sol";
 
+
 contract Synth is ExternStateToken, MixinResolver {
     /* ========== STATE VARIABLES ========== */
 
@@ -141,28 +142,24 @@ contract Synth is ExternStateToken, MixinResolver {
         address _foundAddress = resolver.getAddress("Synthetix");
         require(_foundAddress != address(0), "Resolver is missing Synthetix address");
         return ISynthetix(_foundAddress);
-
     }
 
     function feePool() internal view returns (IFeePool) {
         address _foundAddress = resolver.getAddress("FeePool");
         require(_foundAddress != address(0), "Resolver is missing FeePool address");
         return IFeePool(_foundAddress);
-
     }
 
     function exchanger() internal view returns (IExchanger) {
         address _foundAddress = resolver.getAddress("Exchanger");
         require(_foundAddress != address(0), "Resolver is missing Exchanger address");
         return IExchanger(_foundAddress);
-
     }
 
     function issuer() internal view returns (IIssuer) {
         address _foundAddress = resolver.getAddress("Issuer");
         require(_foundAddress != address(0), "Resolver is missing Issuer address");
         return IIssuer(_foundAddress);
-
     }
 
     function _ensureCanTransfer(address from, uint value) internal view {
diff --git a/contracts/Synthetix.sol b/contracts/Synthetix.sol
@@ -14,6 +14,7 @@ import "./interfaces/IExchanger.sol";
 import "./interfaces/IIssuer.sol";
 import "./interfaces/IEtherCollateral.sol";
 
+
 /**
  * @title Synthetix ERC20 contract.
  * @notice The Synthetix contracts not only facilitates transfers, exchanges, and tracks balances,
@@ -54,70 +55,60 @@ contract Synthetix is ExternStateToken, MixinResolver {
         address _foundAddress = resolver.getAddress("Exchanger");
         require(_foundAddress != address(0), "Resolver is missing Exchanger address");
         return IExchanger(_foundAddress);
-
     }
 
     function etherCollateral() internal view returns (IEtherCollateral) {
         address _foundAddress = resolver.getAddress("EtherCollateral");
         require(_foundAddress != address(0), "Resolver is missing EtherCollateral address");
         return IEtherCollateral(_foundAddress);
-
     }
 
     function issuer() internal view returns (IIssuer) {
         address _foundAddress = resolver.getAddress("Issuer");
         require(_foundAddress != address(0), "Resolver is missing Issuer address");
         return IIssuer(_foundAddress);
-
     }
 
     function synthetixState() internal view returns (ISynthetixState) {
         address _foundAddress = resolver.getAddress("SynthetixState");
         require(_foundAddress != address(0), "Resolver is missing the SynthetixState address");
         return ISynthetixState(_foundAddress);
-
     }
 
     function exchangeRates() internal view returns (IExchangeRates) {
         address _foundAddress = resolver.getAddress("ExchangeRates");
         require(_foundAddress != address(0), "Resolver is missing ExchangeRates address");
         return IExchangeRates(_foundAddress);
-
     }
 
     function feePool() internal view returns (IFeePool) {
         address _foundAddress = resolver.getAddress("FeePool");
         require(_foundAddress != address(0), "Resolver is missing FeePool address");
         return IFeePool(_foundAddress);
-
     }
 
     function supplySchedule() internal view returns (SupplySchedule) {
         address _foundAddress = resolver.getAddress("SupplySchedule");
         require(_foundAddress != address(0), "Resolver is missing SupplySchedule address");
         return SupplySchedule(_foundAddress);
-
     }
 
     function rewardEscrow() internal view returns (ISynthetixEscrow) {
         address _foundAddress = resolver.getAddress("RewardEscrow");
         require(_foundAddress != address(0), "Resolver is missing RewardEscrow address");
         return ISynthetixEscrow(_foundAddress);
-
     }
 
     function synthetixEscrow() internal view returns (ISynthetixEscrow) {
         address _foundAddress = resolver.getAddress("SynthetixEscrow");
         require(_foundAddress != address(0), "Resolver is missing SynthetixEscrow address");
         return ISynthetixEscrow(_foundAddress);
-
     }
 
     function rewardsDistribution() internal view returns (IRewardsDistribution) {
         address _foundAddress = resolver.getAddress("RewardsDistribution");
         require(_foundAddress != address(0), "Resolver is missing RewardsDistribution address");
         return IRewardsDistribution(_foundAddress);
-
     }
 
     /**
@@ -188,7 +179,7 @@ contract Synthetix is ExternStateToken, MixinResolver {
     }
 
     function isWaitingPeriod(bytes32 currencyKey) external view returns (bool) {
-        return exchanger().maxSecsLeftInWaitingPeriod(messageSender, currencyKey) == 0;
+        return exchanger().maxSecsLeftInWaitingPeriod(messageSender, currencyKey) > 0;
     }
 
     // ========== MUTATIVE FUNCTIONS ==========
@@ -244,7 +235,6 @@ contract Synthetix is ExternStateToken, MixinResolver {
         // Note: No event here as Synthetix contract exceeds max contract size
         // with these events, and it's unlikely people will need to
         // track these events specifically.
-
     }
 
     /**
diff --git a/contracts/SynthetixState.sol b/contracts/SynthetixState.sol
@@ -40,6 +40,7 @@ import "./LimitedSetup.sol";
 import "./SafeDecimalMath.sol";
 import "./State.sol";
 
+
 /**
  * @title Synthetix State
  * @notice Stores issuance information and preferred currency information of the Synthetix contract.
diff --git a/contracts/interfaces/IDepot.sol b/contracts/interfaces/IDepot.sol
@@ -1,17 +1,22 @@
 pragma solidity 0.4.25;
 
+
 /**
  * @title Synthetix Depot interface
  */
 contract IDepot {
     function exchangeEtherForSynths() public payable returns (uint);
+
     function exchangeEtherForSynthsAtRate(uint guaranteedRate) external payable returns (uint);
 
     function depositSynths(uint amount) external;
+
     function withdrawMyDepositedSynths() external;
 
     // Deprecated ABI for MAINNET. Only used on Testnets
     function exchangeEtherForSNX() external payable returns (uint);
+
     function exchangeEtherForSNXAtRate(uint guaranteedRate) external payable returns (uint);
+
     function exchangeSynthsForSNX() external payable returns (uint);
 }
diff --git a/contracts/interfaces/IExchangeState.sol b/contracts/interfaces/IExchangeState.sol
@@ -1,5 +1,6 @@
 pragma solidity 0.4.25;
 
+
 interface IExchangeState {
     function appendExchangeEntry(
         address account,
diff --git a/contracts/interfaces/IExchanger.sol b/contracts/interfaces/IExchanger.sol
diff --git a/contracts/interfaces/ISynthetix.sol b/contracts/interfaces/ISynthetix.sol
diff --git a/contracts/test-helpers/MockEtherCollateral.sol b/contracts/test-helpers/MockEtherCollateral.sol
