minor cleanup

equilibria-xyz · Jan 13, 2023 · 6832873 · 6832873
1 parent b72a35a
commit 6832873
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 32 deletions.
diff --git a/packages/perennial/contracts/Market.sol b/packages/perennial/contracts/Market.sol
@@ -18,31 +18,6 @@ import "hardhat/console.sol";
  * @dev Cloned by the Factory contract to launch new market markets.
  */
 contract Market is IMarket, UInitializable, UOwnable {
-    struct CurrentContext {
-        /* Global Parameters */
-        ProtocolParameter protocolParameter;
-
-        /* Market Parameters */
-        MarketParameter marketParameter;
-
-        /* Current Global State */
-        OracleVersion currentOracleVersion;
-
-        Version version;
-
-        Position position;
-
-        Fee fee;
-
-        /* Current Account State */
-        Account account;
-
-        /* Debugging */
-        uint256 gasCounter;
-
-        string gasCounterMessage;
-    }
-
     /// @dev The name of the market
     string public name;
 

diff --git a/packages/perennial/contracts/interfaces/IMarket.sol b/packages/perennial/contracts/interfaces/IMarket.sol
@@ -19,6 +19,19 @@ interface IMarket is IOwnable {
         Token18 reward;
     }
 
+    struct CurrentContext {
+        ProtocolParameter protocolParameter;
+        MarketParameter marketParameter;
+        OracleVersion currentOracleVersion;
+        Version version;
+        Position position;
+        Fee fee;
+        Account account;
+
+        uint256 gasCounter;
+        string gasCounterMessage;
+    }
+
     event Settle(uint256 preVersion, uint256 toVersion);
     event AccountSettle(address indexed account, uint256 preVersion, uint256 toVersion);
     event Updated(address indexed account, uint256 version, UFixed6 newMaker, UFixed6 newTaker, Fixed6 newCollateral);

diff --git a/packages/perennial/contracts/types/Version.sol b/packages/perennial/contracts/types/Version.sol
@@ -71,6 +71,8 @@ library VersionLib {
         ProtocolParameter memory protocolParameter,
         MarketParameter memory marketParameter
     ) internal pure returns (UFixed6 fundingFeeAmount) {
+        if (marketParameter.closed) return UFixed6Lib.ZERO;
+
         // accumulate funding
         fundingFeeAmount =
             _accumulateFunding(self, position, fromOracleVersion, toOracleVersion, protocolParameter, marketParameter);
@@ -97,9 +99,7 @@ library VersionLib {
         ProtocolParameter memory protocolParameter,
         MarketParameter memory marketParameter
     ) private pure returns (UFixed6 fundingFeeAmount) {
-        if (marketParameter.closed) return UFixed6Lib.ZERO;
-        if (position.taker.isZero()) return UFixed6Lib.ZERO;
-        if (position.maker.isZero()) return UFixed6Lib.ZERO;
+        if (position.taker.isZero() || position.maker.isZero()) return UFixed6Lib.ZERO;
 
         UFixed6 takerNotional = Fixed6Lib.from(position.taker).mul(fromOracleVersion.price).abs();
         UFixed6 socializedTakerNotional = takerNotional.mul(position.socializationFactor());
@@ -134,9 +134,7 @@ library VersionLib {
         OracleVersion memory toOracleVersion,
         MarketParameter memory marketParameter
     ) private pure {
-        if (marketParameter.closed) return;
-        if (position.taker.isZero()) return;
-        if (position.maker.isZero()) return;
+        if (position.taker.isZero() || position.maker.isZero()) return;
 
         Fixed6 totalTakerDelta =
             toOracleVersion.price.sub(fromOracleVersion.price).mul(Fixed6Lib.from(position.taker));

diff --git a/packages/perennial/test/integration/core/happyPath.test.ts b/packages/perennial/test/integration/core/happyPath.test.ts
@@ -6,7 +6,7 @@ import { InstanceVars, deployProtocol, createMarket, INITIAL_VERSION } from '../
 import { expectPositionEq, parse6decimal } from '../../../../common/testutil/types'
 import { Market__factory } from '../../../types/generated'
 
-describe('Happy Path', () => {
+describe.only('Happy Path', () => {
   let instanceVars: InstanceVars
 
   beforeEach(async () => {