Re-running npm format across the codebase (#1194)

Synthetixio · Apr 10, 2021 · b7f93c7 · b7f93c7
1 parent 13df268
commit b7f93c7
Show file tree

Hide file tree

Showing 148 changed files with 164 additions and 340 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -90,7 +90,7 @@ jobs:
           command: npx hardhat node
           background: true
       - cmd-wait-for-port:
-            port: 8545
+          port: 8545
       - run: node publish deploy --network local --fresh-deploy --yes --use-ovm --ignore-safety-checks --ignore-custom-parameters --deployment-path ./publish/deployed/local-ovm
       - run: npm run test:prod -- --no-compile --use-ovm --patch-fresh-deployment --deployment-path ./publish/deployed/local-ovm
   job-prod-diff-tests-local:
@@ -109,7 +109,7 @@ jobs:
           command: npx hardhat node
           background: true
       - cmd-wait-for-port:
-            port: 8545
+          port: 8545
       - run: node publish deploy --network local --fresh-deploy --yes
       - run: npm run test:prod -- --patch-fresh-deployment
   job-prod-diff-tests:
@@ -129,7 +129,7 @@ jobs:
           command: npx hardhat node --target-network mainnet
           background: true
       - cmd-wait-for-port:
-            port: 8545
+          port: 8545
       - run: node publish prepare-deploy --network mainnet
       - run: node publish deploy --ignore-safety-checks --add-new-synths --use-fork --yes --network mainnet
       - run: npm run test:prod:gas -- --target-network mainnet --patch-fresh-deployment
@@ -159,9 +159,9 @@ jobs:
             cd optimism-integration
             ./up.sh
       - cmd-wait-for-port:
-            port: 8545
+          port: 8545
       - cmd-wait-for-port:
-            port: 9545
+          port: 9545
       - run:
           name: Deploy OVM Synthetix instances
           command: |
@@ -185,7 +185,7 @@ jobs:
           command: npx hardhat node --target-network mainnet
           background: true
       - cmd-wait-for-port:
-            port: 8545
+          port: 8545
       - run: npm run test:prod:gas -- --target-network mainnet
       - run: npx codechecks codechecks.prod.yml
       - store_artifacts:

diff --git a/README.md b/README.md
@@ -81,7 +81,6 @@ pragma solidity 0.5.16;
 import 'synthetix/contracts/interfaces/IAddressResolver.sol';
 import 'synthetix/contracts/interfaces/ISynthetix.sol';
 
-
 contract MyContract {
   // This should be instantiated with our ReadProxyAddressResolver
   // it's a ReadProxy that won't change, so safe to code it here without a setter

diff --git a/contracts/AddressResolver.sol b/contracts/AddressResolver.sol
@@ -8,7 +8,6 @@ import "./interfaces/IAddressResolver.sol";
 import "./interfaces/IIssuer.sol";
 import "./MixinResolver.sol";
 
-
 // https://docs.synthetix.io/contracts/source/contracts/addressresolver
 contract AddressResolver is Owned, IAddressResolver {
     mapping(bytes32 => address) public repository;

diff --git a/contracts/AddressSetLib.sol b/contracts/AddressSetLib.sol
@@ -1,6 +1,5 @@
 pragma solidity ^0.5.16;
 
-
 // https://docs.synthetix.io/contracts/source/libraries/addresssetlib/
 library AddressSetLib {
     struct AddressSet {

diff --git a/contracts/BaseDebtCache.sol b/contracts/BaseDebtCache.sol
@@ -19,7 +19,6 @@ import "./interfaces/IEtherCollateralsUSD.sol";
 import "./interfaces/IERC20.sol";
 import "./interfaces/ICollateralManager.sol";
 
-
 // https://docs.synthetix.io/contracts/source/contracts/debtcache
 contract BaseDebtCache is Owned, MixinSystemSettings, IDebtCache {
     using SafeMath for uint;
@@ -150,9 +149,8 @@ contract BaseDebtCache is Owned, MixinSystemSettings, IDebtCache {
 
             bool isSUSD = key == sUSD;
             if (isSUSD || key == sETH) {
-                IEtherCollateral etherCollateralContract = isSUSD
-                    ? IEtherCollateral(address(etherCollateralsUSD()))
-                    : etherCollateral();
+                IEtherCollateral etherCollateralContract =
+                    isSUSD ? IEtherCollateral(address(etherCollateralsUSD())) : etherCollateral();
                 uint etherCollateralSupply = etherCollateralContract.totalIssuedSynths();
                 supply = supply.sub(etherCollateralSupply);
             }

diff --git a/contracts/BaseRewardEscrowV2.sol b/contracts/BaseRewardEscrowV2.sol
@@ -16,7 +16,6 @@ import "./interfaces/IFeePool.sol";
 import "./interfaces/ISynthetix.sol";
 import "./interfaces/IIssuer.sol";
 
-
 // https://docs.synthetix.io/contracts/RewardEscrow
 contract BaseRewardEscrowV2 is Owned, IRewardEscrowV2, LimitedSetup(8 weeks), MixinResolver {
     using SafeMath for uint;

diff --git a/contracts/BaseSynthetix.sol b/contracts/BaseSynthetix.sol
@@ -16,7 +16,6 @@ import "./interfaces/IIssuer.sol";
 import "./interfaces/IRewardsDistribution.sol";
 import "./interfaces/IVirtualSynth.sol";
 
-
 contract BaseSynthetix is IERC20, ExternStateToken, MixinResolver, ISynthetix {
     // ========== STATE VARIABLES ==========
 
@@ -151,10 +150,8 @@ contract BaseSynthetix is IERC20, ExternStateToken, MixinResolver, ISynthetix {
         (uint initialDebtOwnership, ) = synthetixState().issuanceData(account);
 
         if (initialDebtOwnership > 0) {
-            (uint transferable, bool anyRateIsInvalid) = issuer().transferableSynthetixAndAnyRateIsInvalid(
-                account,
-                tokenState.balanceOf(account)
-            );
+            (uint transferable, bool anyRateIsInvalid) =
+                issuer().transferableSynthetixAndAnyRateIsInvalid(account, tokenState.balanceOf(account));
             require(value <= transferable, "Cannot transfer staked or escrowed SNX");
             require(!anyRateIsInvalid, "A synth or SNX rate is invalid");
         }
@@ -373,9 +370,8 @@ contract BaseSynthetix is IERC20, ExternStateToken, MixinResolver, ISynthetix {
         uint256 toAmount,
         address toAddress
     );
-    bytes32 internal constant SYNTHEXCHANGE_SIG = keccak256(
-        "SynthExchange(address,bytes32,uint256,bytes32,uint256,address)"
-    );
+    bytes32 internal constant SYNTHEXCHANGE_SIG =
+        keccak256("SynthExchange(address,bytes32,uint256,bytes32,uint256,address)");
 
     function emitSynthExchange(
         address account,

diff --git a/contracts/BinaryOption.sol b/contracts/BinaryOption.sol
@@ -10,7 +10,6 @@ import "./SafeDecimalMath.sol";
 // Internal references
 import "./BinaryOptionMarket.sol";
 
-
 // https://docs.synthetix.io/contracts/source/contracts/binaryoption
 contract BinaryOption is IERC20, IBinaryOption {
     /* ========== LIBRARIES ========== */

diff --git a/contracts/BinaryOptionMarket.sol b/contracts/BinaryOptionMarket.sol
@@ -15,7 +15,6 @@ import "./interfaces/IExchangeRates.sol";
 import "./interfaces/IERC20.sol";
 import "./interfaces/IFeePool.sol";
 
-
 // https://docs.synthetix.io/contracts/source/contracts/binaryoptionmarket
 contract BinaryOptionMarket is Owned, MixinResolver, IBinaryOptionMarket {
     /* ========== LIBRARIES ========== */

diff --git a/contracts/BinaryOptionMarketData.sol b/contracts/BinaryOptionMarketData.sol
@@ -6,7 +6,6 @@ import "./BinaryOption.sol";
 import "./BinaryOptionMarket.sol";
 import "./BinaryOptionMarketManager.sol";
 
-
 // https://docs.synthetix.io/contracts/source/contracts/binaryoptionmarketdata
 contract BinaryOptionMarketData {
     struct OptionValues {
@@ -63,14 +62,15 @@ contract BinaryOptionMarketData {
         (bytes32 key, uint strikePrice, uint finalPrice) = market.oracleDetails();
         (uint poolFee, uint creatorFee, uint refundFee) = market.fees();
 
-        MarketParameters memory data = MarketParameters(
-            market.creator(),
-            BinaryOptionMarket.Options(long, short),
-            BinaryOptionMarket.Times(biddingEndDate, maturityDate, expiryDate),
-            BinaryOptionMarket.OracleDetails(key, strikePrice, finalPrice),
-            BinaryOptionMarketManager.Fees(poolFee, creatorFee, refundFee),
-            BinaryOptionMarketManager.CreatorLimits(0, 0)
-        );
+        MarketParameters memory data =
+            MarketParameters(
+                market.creator(),
+                BinaryOptionMarket.Options(long, short),
+                BinaryOptionMarket.Times(biddingEndDate, maturityDate, expiryDate),
+                BinaryOptionMarket.OracleDetails(key, strikePrice, finalPrice),
+                BinaryOptionMarketManager.Fees(poolFee, creatorFee, refundFee),
+                BinaryOptionMarketManager.CreatorLimits(0, 0)
+            );
 
         // Stack too deep otherwise.
         (uint capitalRequirement, uint skewLimit) = market.creatorLimits();

diff --git a/contracts/BinaryOptionMarketFactory.sol b/contracts/BinaryOptionMarketFactory.sol
@@ -7,7 +7,6 @@ import "./MixinResolver.sol";
 // Internal references
 import "./BinaryOptionMarket.sol";
 
-
 // https://docs.synthetix.io/contracts/source/contracts/binaryoptionmarketfactory
 contract BinaryOptionMarketFactory is Owned, MixinResolver {
     /* ========== STATE VARIABLES ========== */

diff --git a/contracts/BinaryOptionMarketManager.sol b/contracts/BinaryOptionMarketManager.sol
@@ -18,7 +18,6 @@ import "./interfaces/IExchangeRates.sol";
 import "./interfaces/ISystemStatus.sol";
 import "./interfaces/IERC20.sol";
 
-
 // https://docs.synthetix.io/contracts/source/contracts/binaryoptionmarketmanager
 contract BinaryOptionMarketManager is Owned, Pausable, MixinResolver, IBinaryOptionMarketManager {
     /* ========== LIBRARIES ========== */
@@ -262,16 +261,17 @@ contract BinaryOptionMarketManager is Owned, Pausable, MixinResolver, IBinaryOpt
         // Fees being in range are checked in the setters.
         // The market itself validates the capital and skew requirements.
 
-        BinaryOptionMarket market = _factory().createMarket(
-            msg.sender,
-            [creatorLimits.capitalRequirement, creatorLimits.skewLimit],
-            oracleKey,
-            strikePrice,
-            refundsEnabled,
-            [biddingEnd, maturity, expiry],
-            bids,
-            [fees.poolFee, fees.creatorFee, fees.refundFee]
-        );
+        BinaryOptionMarket market =
+            _factory().createMarket(
+                msg.sender,
+                [creatorLimits.capitalRequirement, creatorLimits.skewLimit],
+                oracleKey,
+                strikePrice,
+                refundsEnabled,
+                [biddingEnd, maturity, expiry],
+                bids,
+                [fees.poolFee, fees.creatorFee, fees.refundFee]
+            );
         market.rebuildCache();
         _activeMarkets.add(address(market));
 
@@ -325,10 +325,8 @@ contract BinaryOptionMarketManager is Owned, Pausable, MixinResolver, IBinaryOpt
 
             if (!success) {
                 // handle legacy markets that used an old cache rebuilding logic
-                bytes memory payloadForLegacyCache = abi.encodeWithSignature(
-                    "setResolverAndSyncCache(address)",
-                    address(resolver)
-                );
+                bytes memory payloadForLegacyCache =
+                    abi.encodeWithSignature("setResolverAndSyncCache(address)", address(resolver));
 
                 // solhint-disable avoid-low-level-calls
                 (bool legacySuccess, ) = market.call(payloadForLegacyCache);

diff --git a/contracts/Bytes32SetLib.sol b/contracts/Bytes32SetLib.sol
@@ -1,6 +1,5 @@
 pragma solidity ^0.5.16;
 
-
 // https://docs.synthetix.io/contracts/source/libraries/bytes32setlib/
 library Bytes32SetLib {
     struct Bytes32Set {

diff --git a/contracts/Collateral.sol b/contracts/Collateral.sol
@@ -21,7 +21,6 @@ import "./interfaces/IExchangeRates.sol";
 import "./interfaces/IExchanger.sol";
 import "./interfaces/IShortingRewards.sol";
 
-
 contract Collateral is ICollateralLoan, Owned, MixinSystemSettings {
     /* ========== LIBRARIES ========== */
     using SafeMath for uint;
@@ -324,17 +323,18 @@ contract Collateral is ICollateralLoan, Owned, MixinSystemSettings {
         id = _manager().getNewLoanId();
 
         // 10. Create the loan struct.
-        Loan memory loan = Loan({
-            id: id,
-            account: msg.sender,
-            collateral: collateral,
-            currency: currency,
-            amount: amount,
-            short: short,
-            accruedInterest: 0,
-            interestIndex: 0,
-            lastInteraction: block.timestamp
-        });
+        Loan memory loan =
+            Loan({
+                id: id,
+                account: msg.sender,
+                collateral: collateral,
+                currency: currency,
+                amount: amount,
+                short: short,
+                accruedInterest: 0,
+                interestIndex: 0,
+                lastInteraction: block.timestamp
+            });
 
         // 11. Accrue interest on the loan.
         loan = accrueInterest(loan);
@@ -684,14 +684,14 @@ contract Collateral is ICollateralLoan, Owned, MixinSystemSettings {
         loanAfter = loan;
 
         // 1. Get the rates we need.
-        (uint entryRate, uint lastRate, uint lastUpdated, uint newIndex) = loan.short
-            ? _manager().getShortRatesAndTime(loan.currency, loan.interestIndex)
-            : _manager().getRatesAndTime(loan.interestIndex);
+        (uint entryRate, uint lastRate, uint lastUpdated, uint newIndex) =
+            loan.short
+                ? _manager().getShortRatesAndTime(loan.currency, loan.interestIndex)
+                : _manager().getRatesAndTime(loan.interestIndex);
 
         // 2. Get the instantaneous rate.
-        (uint rate, bool invalid) = loan.short
-            ? _manager().getShortRate(synthsByKey[loan.currency])
-            : _manager().getBorrowRate();
+        (uint rate, bool invalid) =
+            loan.short ? _manager().getShortRate(synthsByKey[loan.currency]) : _manager().getBorrowRate();
 
         require(!invalid, "Rates are invalid");
 

diff --git a/contracts/CollateralErc20.sol b/contracts/CollateralErc20.sol
@@ -10,7 +10,6 @@ import "./interfaces/ICollateralErc20.sol";
 import "./CollateralState.sol";
 import "./interfaces/IERC20.sol";
 
-
 // This contract handles the specific ERC20 implementation details of managing a loan.
 contract CollateralErc20 is ICollateralErc20, Collateral {
     // The underlying asset for this ERC20 collateral

diff --git a/contracts/CollateralEth.sol b/contracts/CollateralEth.sol
@@ -10,7 +10,6 @@ import "./interfaces/ICollateralEth.sol";
 // Internal references
 import "./CollateralState.sol";
 
-
 // This contract handles the payable aspects of eth loans.
 contract CollateralEth is Collateral, ICollateralEth, ReentrancyGuard {
     mapping(address => uint) public pendingWithdrawals;

diff --git a/contracts/CollateralManager.sol b/contracts/CollateralManager.sol
@@ -18,7 +18,6 @@ import "./interfaces/IExchangeRates.sol";
 import "./interfaces/IERC20.sol";
 import "./interfaces/ISynth.sol";
 
-
 contract CollateralManager is ICollateralManager, Owned, Pausable, MixinResolver {
     /* ========== LIBRARIES ========== */
     using SafeMath for uint;

diff --git a/contracts/CollateralManagerState.sol b/contracts/CollateralManagerState.sol
@@ -9,7 +9,6 @@ import "./State.sol";
 // Libraries
 import "./SafeDecimalMath.sol";
 
-
 contract CollateralManagerState is Owned, State {
     using SafeMath for uint;
     using SafeDecimalMath for uint;

diff --git a/contracts/CollateralShort.sol b/contracts/CollateralShort.sol
@@ -8,7 +8,6 @@ import "./Collateral.sol";
 // Internal references
 import "./CollateralState.sol";
 
-
 contract CollateralShort is Collateral {
     constructor(
         CollateralState _state,

diff --git a/contracts/CollateralState.sol b/contracts/CollateralState.sol
@@ -10,7 +10,6 @@ import "./interfaces/ICollateralLoan.sol";
 // Libraries
 import "./SafeDecimalMath.sol";
 
-
 contract CollateralState is Owned, State, ICollateralLoan {
     using SafeMath for uint;
     using SafeDecimalMath for uint;

diff --git a/contracts/ContractStorage.sol b/contracts/ContractStorage.sol
@@ -3,7 +3,6 @@ pragma solidity ^0.5.16;
 // Internal References
 import "./interfaces/IAddressResolver.sol";
 
-
 // https://docs.synthetix.io/contracts/source/contracts/contractstorage
 contract ContractStorage {
     IAddressResolver public resolverProxy;
@@ -50,10 +49,8 @@ contract ContractStorage {
     /* ========== MODIFIERS ========== */
 
     modifier onlyContract(bytes32 contractName) {
-        address callingContract = resolverProxy.requireAndGetAddress(
-            contractName,
-            "Cannot find contract in Address Resolver"
-        );
+        address callingContract =
+            resolverProxy.requireAndGetAddress(contractName, "Cannot find contract in Address Resolver");
         require(callingContract == msg.sender, "Can only be invoked by the configured contract");
         _;
     }

diff --git a/contracts/DappMaintenance.sol b/contracts/DappMaintenance.sol
@@ -2,7 +2,6 @@ pragma solidity ^0.5.16;
 
 import "./Owned.sol";
 
-
 // https://docs.synthetix.io/contracts/source/contracts/dappmaintenance
 
 /**

diff --git a/contracts/DebtCache.sol b/contracts/DebtCache.sol
@@ -3,7 +3,6 @@ pragma solidity ^0.5.16;
 // Inheritance
 import "./BaseDebtCache.sol";
 
-
 // https://docs.synthetix.io/contracts/source/contracts/debtcache
 contract DebtCache is BaseDebtCache {
     constructor(address _owner, address _resolver) public BaseDebtCache(_owner, _resolver) {}

diff --git a/contracts/DelegateApprovals.sol b/contracts/DelegateApprovals.sol
@@ -7,7 +7,6 @@ import "./interfaces/IDelegateApprovals.sol";
 // Internal references
 import "./EternalStorage.sol";
 
-
 // https://docs.synthetix.io/contracts/source/contracts/delegateapprovals
 contract DelegateApprovals is Owned, IDelegateApprovals {
     bytes32 public constant BURN_FOR_ADDRESS = "BurnForAddress";
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,7 +2,6 @@ pragma solidity ^0.5.16;

		import "./Owned.sol";


		// https://docs.synthetix.io/contracts/source/contracts/dappmaintenance

		/**
Expand Down