Merge 42fe870 into 7e4b309

contracts/application/versioning/FreezableImplementationDirectory.sol

@@ -6,7 +6,7 @@ import "./ImplementationDirectory.sol";
  * @title FreezableImplementationDirectory
  * @dev Implementation directory which can be made irreversibly immutable by the owner.
  */
- contract FreezableImplementationDirectory is ImplementationDirectory {
+contract FreezableImplementationDirectory is ImplementationDirectory {
   /// @dev Mutability state of the directory.
   bool public frozen;
 
@@ -35,4 +35,13 @@ import "./ImplementationDirectory.sol";
   function setImplementation(string contractName, address implementation) public whenNotFrozen {
     super.setImplementation(contractName, implementation);
   }
+
+  /**
+   * @dev Unsets the implementation of a contract.
+   * It overrides the parent function to prevent it from running if the directory is frozen.
+   * @param contractName Name of the contract.
+   */
+  function unsetImplementation(string contractName) public whenNotFrozen {
+    super.unsetImplementation(contractName);
+  }
 }

test/contracts/application/versioning/FreezableImplementationDirectory.test.js

@@ -70,4 +70,20 @@ contract('FreezableImplementationDirectory', ([_, owner, anotherAddress]) => {
       })
     })
   })
+
+  describe('unsetImplementation', function () {
+    describe('when it is not frozen', function () {
+      shouldBehaveLikeImplementationDirectory(owner, anotherAddress)
+    })
+
+    describe('when it is frozen', function () {
+      beforeEach(async function () {
+        await this.directory.freeze({ from: owner })
+      })
+
+      it('reverts', async function () {
+        await assertRevert(this.directory.unsetImplementation('ERC721', { from: owner }))
+      })
+    })
+  })
 })