remove clearVault

opynfinance · Sep 8, 2020 · 8c76daf · 8c76daf
1 parent 088af46
commit 8c76daf
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 38 deletions.
diff --git a/contracts/Controller.sol b/contracts/Controller.sol
@@ -558,11 +558,7 @@ contract Controller is Initializable, OwnableUpgradeSafe, ReentrancyGuardUpgrade
      * @notice settle vault after expiry
      * @param _args SettleVaultArgs structure
      */
-    function _settleVault(Actions.SettleVaultArgs memory _args)
-        internal
-        onlyAuthorized(msg.sender, _args.owner)
-        returns (MarginAccount.Vault memory)
-    {
+    function _settleVault(Actions.SettleVaultArgs memory _args) internal onlyAuthorized(msg.sender, _args.owner) {
         require(_checkVaultId(_args.owner, _args.vaultId), "Controller: invalid vault id");
 
         MarginAccount.Vault memory vault = getVault(_args.owner, _args.vaultId);
@@ -585,7 +581,7 @@ contract Controller is Initializable, OwnableUpgradeSafe, ReentrancyGuardUpgrade
             longOtoken.burnOtoken(address(pool), vault.longAmounts[0]);
         }
 
-        vaults[_args.owner][_args.vaultId]._clearVault();
+        delete vaults[_args.owner][_args.vaultId];
 
         pool.transferToUser(shortOtoken.collateralAsset(), _args.to, payout);
 

diff --git a/contracts/libs/MarginAccount.sol b/contracts/libs/MarginAccount.sol
@@ -201,17 +201,4 @@ library MarginAccount {
             delete _vault.collateralAssets[_index];
         }
     }
-
-    /**
-     * @dev remove everything in a vault. Reset short, long and collateral assets and amounts arrays to an empty array.
-     * @param _vault The vault that the user is clearing.
-     */
-    function _clearVault(Vault storage _vault) external {
-        delete _vault.shortAmounts;
-        delete _vault.longAmounts;
-        delete _vault.collateralAmounts;
-        delete _vault.shortOtokens;
-        delete _vault.longOtokens;
-        delete _vault.collateralAssets;
-    }
 }
diff --git a/contracts/tests/MarginAccountTester.sol b/contracts/tests/MarginAccountTester.sol
@@ -67,8 +67,4 @@ contract MarginAccountTester {
     ) external {
         vault[msg.sender][_vaultIndex]._removeCollateral(_collateralAsset, _amount, _index);
     }
-
-    function testClearVault(uint256 _vaultIndex) external {
-        vault[msg.sender][_vaultIndex]._clearVault();
-    }
 }
diff --git a/test/MarginAccount.test.ts b/test/MarginAccount.test.ts
@@ -393,19 +393,4 @@ contract('MarginAccount', ([deployer, controller]) => {
       )
     })
   })
-
-  describe('Clear vault', () => {
-    it('should clear vault', async () => {
-      const vaultCounter = new BigNumber(0)
-
-      await marginAccountTester.testClearVault(vaultCounter)
-      const vault = await marginAccountTester.getVault(vaultCounter)
-      assert.equal(vault.shortAmounts.length, 0, 'shortAmounts length should be 0')
-      assert.equal(vault.longAmounts.length, 0, 'longAmounts length should be 0')
-      assert.equal(vault.collateralAmounts.length, 0, 'collateralAmounts length should be 0')
-      assert.equal(vault.shortOtokens.length, 0, 'shortOtokens length should be 0')
-      assert.equal(vault.longOtokens.length, 0, 'longOtokens length should be 0')
-      assert.equal(vault.collateralAssets.length, 0, 'collateralAssets length should be 0')
-    })
-  })
 })