fix(refactor): remove cancancelresubscribe

meTokens · May 6, 2022 · 61dd983 · 61dd983
1 parent e305865
commit 61dd983
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 51 deletions.
diff --git a/contracts/facets/MeTokenRegistryFacet.sol b/contracts/facets/MeTokenRegistryFacet.sol
@@ -153,7 +153,7 @@ contract MeTokenRegistryFacet is
         require(LibMeta.msgSender() == meTokenInfo.owner, "!owner");
         require(meTokenInfo.targetHubId != 0, "!resubscribing");
         require(
-            IMigration(meTokenInfo.migration).canCancelResubscribe(meToken),
+            !IMigration(meTokenInfo.migration).isStarted(meToken),
             "cannot cancel resubscribe"
         );
 

diff --git a/contracts/interfaces/IMigration.sol b/contracts/interfaces/IMigration.sol
@@ -22,14 +22,4 @@ interface IMigration {
     ///         target hub
     /// @param meToken      Address of meToken
     function finishMigration(address meToken) external;
-
-    /// @notice Method returns bool if migration started
-    /// @param meToken  Address of meToken
-    /// @return started True if migration started else false
-    function migrationStarted(address meToken)
-        external
-        view
-        returns (bool started);
-
-    function canCancelResubscribe(address meToken) external view returns (bool);
 }
diff --git a/contracts/migrations/SameAssetTransferMigration.sol b/contracts/migrations/SameAssetTransferMigration.sol
@@ -115,25 +115,6 @@ contract SameAssetTransferMigration is ReentrancyGuard, Vault, IMigration {
         usts = _sameAssetMigration[meToken];
     }
 
-    /// @inheritdoc IMigration
-    function migrationStarted(address meToken)
-        external
-        view
-        override
-        returns (bool started)
-    {
-        return _sameAssetMigration[meToken].started;
-    }
-
-    function canCancelResubscribe(address meToken)
-        external
-        view
-        override
-        returns (bool)
-    {
-        return !_sameAssetMigration[meToken].started;
-    }
-
     /// @inheritdoc Vault
     function isValid(
         bytes memory /* encodedArgs */

diff --git a/contracts/migrations/UniswapSingleTransferMigration.sol b/contracts/migrations/UniswapSingleTransferMigration.sol
@@ -139,27 +139,6 @@ contract UniswapSingleTransferMigration is ReentrancyGuard, Vault, IMigration {
         usts = _uniswapSingleTransfers[meToken];
     }
 
-    /// @inheritdoc IMigration
-    function migrationStarted(address meToken)
-        external
-        view
-        override
-        returns (bool started)
-    {
-        return _uniswapSingleTransfers[meToken].started;
-    }
-
-    // TODO: inherit
-    function canCancelResubscribe(address meToken)
-        external
-        view
-        returns (bool)
-    {
-        UniswapSingleTransfer storage usts = _uniswapSingleTransfers[meToken];
-        // Only applies if a metoken is in a state of resubscription and assets haven't moved to migration vault
-        return (usts.fee != 0 && !usts.started);
-    }
-
     /// @inheritdoc Vault
     function isValid(bytes memory encodedArgs)
         external