chore: use named paramaters

ronin-chain · Sep 13, 2024 · 32401f3 · 32401f3
1 parent b77289f
commit 32401f3
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 6 deletions.
diff --git a/src/REP15.sol b/src/REP15.sol
@@ -134,7 +134,6 @@ abstract contract REP15 is ERC721, IREP15, IREP15Errors {
       _checkAuthorizedOwnershipManager(tokenId, operator);
       _requestDetachContext(ctxHash, tokenId, operator, data);
     } else {
-      // _detachContext(ctxHash, tokenId, operator, data, false, true);
       _detachContext({
         ctxHash: ctxHash,
         tokenId: tokenId,
@@ -154,7 +153,14 @@ abstract contract REP15 is ERC721, IREP15, IREP15Errors {
 
     _checkAuthorizedOwnershipManager(tokenId, operator);
 
-    _detachContext(ctxHash, tokenId, operator, data, true, true);
+    _detachContext({
+      ctxHash: ctxHash,
+      tokenId: tokenId,
+      operator: operator,
+      data: data,
+      checkReadyForDetachment: true,
+      emitEvent: true
+    });
   }
 
   /**
@@ -348,7 +354,14 @@ abstract contract REP15 is ERC721, IREP15, IREP15Errors {
     REP15Utils.TokenContext storage $tokenContext = _requireAttachedTokenContext(ctxHash, tokenId, true);
 
     if (!$tokenContext.locked) {
-      _detachContext(ctxHash, tokenId, operator, data, false, true);
+      _detachContext({
+        ctxHash: ctxHash,
+        tokenId: tokenId,
+        operator: operator,
+        data: data,
+        checkReadyForDetachment: false,
+        emitEvent: true
+      });
       return;
     }
 
@@ -394,7 +407,8 @@ abstract contract REP15 is ERC721, IREP15, IREP15Errors {
 
     address controller = _contexts[ctxHash].controller;
     if (controller.code.length > 0) {
-      try IREP15ContextCallback(controller).onExecDetachContext(ctxHash, tokenId, contextUser, operator, data) { } catch { }
+      try IREP15ContextCallback(controller).onExecDetachContext(ctxHash, tokenId, contextUser, operator, data) { }
+        catch { }
     }
   }
 
@@ -421,7 +435,14 @@ abstract contract REP15 is ERC721, IREP15, IREP15Errors {
       bytes32[] storage attachedContexts = _attachedContexts[tokenId];
       for (int256 i = int256(attachedContexts.length) - 1; i >= 0; --i) {
         bytes32 ctxHash = attachedContexts[uint256(i)];
-        _detachContext(ctxHash, tokenId, auth, "", _tokenContext[tokenId][ctxHash].locked, false);
+        _detachContext({
+          ctxHash: ctxHash,
+          tokenId: tokenId,
+          operator: auth,
+          data: "",
+          checkReadyForDetachment: _tokenContext[tokenId][ctxHash].locked,
+          emitEvent: false
+        });
       }
     }
 

diff --git a/src/mocks/ControllerMock.sol b/src/mocks/ControllerMock.sol
@@ -28,7 +28,9 @@ contract ControllerMock is IREP15ContextCallback {
     if (_reverted) revert("ControllerMock: reverted onDetachRequested");
   }
 
-  function onExecDetachContext(bytes32 ctxHash, uint256 tokenId, address user, address operator, bytes calldata data) external {
+  function onExecDetachContext(bytes32 ctxHash, uint256 tokenId, address user, address operator, bytes calldata data)
+    external
+  {
     emit OnExecDetachContext(ctxHash, tokenId, user, operator, data);
     if (_reverted) revert("ControllerMock: reverted onExecDetachContext");
   }