Remove forceTransferOwnership

OpenZeppelin · Aug 31, 2022 · 84f3b9f · 84f3b9f
1 parent ff44765
commit 84f3b9f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/contracts/access/Ownable2Step.sol b/contracts/access/Ownable2Step.sol
@@ -37,13 +37,6 @@ abstract contract Ownable2Step is Ownable {
         emit OwnershipTransferStarted(owner(), newOwner);
     }
 
-    /**
-     * @dev Make the direct ownership transfer available as a fallback when the receiver cannot accept.
-     */
-    function forceTransferOwnership(address newOwner) public virtual {
-        super.transferOwnership(newOwner);
-    }
-
     /**
      * @dev Transfers ownership of the contract to a new account (`newOwner`) and deletes any pending owner.
      * Internal function without access restriction.

diff --git a/test/access/Ownable2Step.test.js b/test/access/Ownable2Step.test.js
@@ -27,16 +27,18 @@ contract('Ownable2Step', function (accounts) {
       expect(await this.ownable2Step.pendingOwner()).to.not.equal(accountA);
     });
 
-    it('changes owner after force transfer', async function () {
-      await this.ownable2Step.forceTransferOwnership(accountA, { from: owner });
-      expect(await this.ownable2Step.owner()).to.equal(accountA);
-      expect(await this.ownable2Step.pendingOwner()).to.not.equal(accountA);
+    it('changes owner after renouncing ownership', async function () {
+      await this.ownable2Step.renounceOwnership({ from: owner });
+      // If renounceOwnership is removed from parent an alternative is needed ...
+      // without it is difficult to cleanly renounce with the two step process
+      // see: https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3620#discussion_r957930388
+      expect(await this.ownable2Step.owner()).to.equal(ZERO_ADDRESS);
     });
 
-    it('pending owner resets on force transfer', async function () {
+    it('pending owner resets after renouncing ownership', async function () {
       await this.ownable2Step.transferOwnership(accountA, { from: owner });
       expect(await this.ownable2Step.pendingOwner()).to.equal(accountA);
-      await this.ownable2Step.forceTransferOwnership(accountB, { from: owner });
+      await this.ownable2Step.renounceOwnership({ from: owner });
       expect(await this.ownable2Step.pendingOwner()).to.equal(ZERO_ADDRESS);
       await expectRevert(
         this.ownable2Step.acceptOwnership({ from: accountA }),