test: add diamond cut initializer tests

Both added tests verify that revert happens when facet initializer function reverts, with and without error message. Resolves: ubiquity#838
gitcoindev · Dec 27, 2023 · 5bc784c · 5bc784c
1 parent c8bedfe
commit 5bc784c
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 3 deletions.
diff --git a/packages/contracts/src/dollar/mocks/MockFacet.sol b/packages/contracts/src/dollar/mocks/MockFacet.sol
@@ -36,10 +36,8 @@ contract MockFacetInitializer {
         revert();
     }
 
-    error MockCustomError(string);
-
     function initializeRevertWithMessage() external pure returns (uint256) {
-        revert MockCustomError("MockFacetError");
+        revert("MockFacetError");
     }
 }
 

diff --git a/packages/contracts/test/diamond/DiamondTest.t.sol b/packages/contracts/test/diamond/DiamondTest.t.sol
@@ -113,6 +113,48 @@ contract TestDiamond is DiamondTestSetup {
         diamondCutFacet.diamondCut(facetCut, address(0x0), "");
     }
 
+    function testCutFacetShouldRevertWhenFacetInitializerReverts() public {
+        FacetCut[] memory facetCut = new FacetCut[](1);
+        facetCut[0] = FacetCut({
+            facetAddress: address(pureFacet),
+            action: FacetCutAction.Replace,
+            functionSelectors: selectorsOfCollectableDustFacet
+        });
+
+        vm.expectRevert();
+
+        vm.prank(owner);
+        diamondCutFacet.diamondCut(
+            facetCut,
+            facetInitializer,
+            abi.encodeWithSelector(
+                MockFacetInitializer.initializeRevert.selector
+            )
+        );
+    }
+
+    function testCutFacetShouldRevertWithMessageWhenFacetInitializerWithMessageReverts()
+        public
+    {
+        FacetCut[] memory facetCut = new FacetCut[](1);
+        facetCut[0] = FacetCut({
+            facetAddress: address(pureFacet),
+            action: FacetCutAction.Replace,
+            functionSelectors: selectorsOfCollectableDustFacet
+        });
+
+        vm.expectRevert("MockFacetError");
+
+        vm.prank(owner);
+        diamondCutFacet.diamondCut(
+            facetCut,
+            facetInitializer,
+            abi.encodeWithSelector(
+                MockFacetInitializer.initializeRevertWithMessage.selector
+            )
+        );
+    }
+
     function testSelectors_ShouldBeAssociatedWithCorrectFacet() public {
         for (uint256 i; i < facetAddressList.length; i++) {
             if (compareStrings(facetNames[i], "DiamondCutFacet")) {