Remove obsolete methods

Fantom-foundation · Oct 24, 2024 · 45c78a3 · 45c78a3
1 parent 8a062f7
commit 45c78a3
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 35 deletions.
diff --git a/contracts/sfc/NodeDriver.sol b/contracts/sfc/NodeDriver.sol
@@ -143,15 +143,6 @@ contract NodeDriver is Initializable {
     }
 
     function sealEpoch(
-        uint256[] calldata offlineTimes,
-        uint256[] calldata offlineBlocks,
-        uint256[] calldata uptimes,
-        uint256[] calldata originatedTxsFee
-    ) external onlyNode {
-        backend.sealEpoch(offlineTimes, offlineBlocks, uptimes, originatedTxsFee, 841669690);
-    }
-
-    function sealEpochV1(
         uint256[] calldata offlineTimes,
         uint256[] calldata offlineBlocks,
         uint256[] calldata uptimes,

diff --git a/contracts/sfc/NodeDriverI.sol b/contracts/sfc/NodeDriverI.sol
@@ -30,13 +30,6 @@ interface NodeDriverI {
     function sealEpochValidators(uint256[] calldata nextValidatorIDs) external;
 
     function sealEpoch(
-        uint256[] calldata offlineTimes,
-        uint256[] calldata offlineBlocks,
-        uint256[] calldata uptimes,
-        uint256[] calldata originatedTxsFee
-    ) external;
-
-    function sealEpochV1(
         uint256[] calldata offlineTimes,
         uint256[] calldata offlineBlocks,
         uint256[] calldata uptimes,

diff --git a/contracts/sfc/SFC.sol b/contracts/sfc/SFC.sol
@@ -133,18 +133,6 @@ contract SFC is SFCBase, Version {
         voteBookAddress = v;
     }
 
-    function migrateValidatorPubkeyUniquenessFlag(uint256 start, uint256 end) external {
-        for (uint256 vid = start; vid < end; vid++) {
-            bytes memory pubkey = getValidatorPubkey[vid];
-            if (pubkey.length > 0 && pubkeyHashToValidatorID[keccak256(pubkey)] != vid) {
-                if (pubkeyHashToValidatorID[keccak256(pubkey)] != 0) {
-                    revert PubkeyExists();
-                }
-                pubkeyHashToValidatorID[keccak256(pubkey)] = vid;
-            }
-        }
-    }
-
     function updateValidatorPubkey(bytes calldata pubkey) external {
         if (pubkey.length != 66 || pubkey[0] != 0xc0) {
             revert MalformedPubkey();

diff --git a/contracts/sfc/SFCI.sol b/contracts/sfc/SFCI.sol
@@ -234,8 +234,6 @@ interface SFCI {
 
     function updateValidatorPubkey(bytes calldata pubkey) external;
 
-    function migrateValidatorPubkeyUniquenessFlag(uint256 start, uint256 end) external;
-
     function setRedirectionAuthorizer(address v) external;
 
     function announceRedirection(address to) external;

diff --git a/test/NodeDriver.ts b/test/NodeDriver.ts
@@ -161,11 +161,7 @@ describe('NodeDriver', () => {
 
   describe('Seal epoch', () => {
     it('Should revert when not node', async function () {
-      await expect(this.nodeDriver.sealEpoch([0, 1], [0, 1], [0, 1], [0, 1])).to.be.revertedWithCustomError(
-        this.nodeDriver,
-        'NotNode',
-      );
-      await expect(this.nodeDriver.sealEpochV1([0, 1], [0, 1], [0, 1], [0, 1], 0)).to.be.revertedWithCustomError(
+      await expect(this.nodeDriver.sealEpoch([0, 1], [0, 1], [0, 1], [0, 1], 0)).to.be.revertedWithCustomError(
         this.nodeDriver,
         'NotNode',
       );