refactor: improve import formatting and function definitions for clarity

Author: YukiTsuchida

script/DeployAll.s.sol

@@ -7,15 +7,25 @@ import {Config} from "forge-std/src/Config.sol";
 
 // === Core ===
 import {IBCClient} from "@hyperledger-labs/yui-ibc-solidity/contracts/core/02-client/IBCClient.sol";
-import {IBCConnectionSelfStateNoValidation as IBCConnection} from "@hyperledger-labs/yui-ibc-solidity/contracts/core/03-connection/IBCConnectionSelfStateNoValidation.sol";
-import {IBCChannelHandshake} from "@hyperledger-labs/yui-ibc-solidity/contracts/core/04-channel/IBCChannelHandshake.sol";
-import {IBCChannelPacketSendRecv} from "@hyperledger-labs/yui-ibc-solidity/contracts/core/04-channel/IBCChannelPacketSendRecv.sol";
-import {IBCChannelPacketTimeout} from "@hyperledger-labs/yui-ibc-solidity/contracts/core/04-channel/IBCChannelPacketTimeout.sol";
+import {
+    IBCConnectionSelfStateNoValidation as IBCConnection
+} from "@hyperledger-labs/yui-ibc-solidity/contracts/core/03-connection/IBCConnectionSelfStateNoValidation.sol";
+import {
+    IBCChannelHandshake
+} from "@hyperledger-labs/yui-ibc-solidity/contracts/core/04-channel/IBCChannelHandshake.sol";
+import {
+    IBCChannelPacketSendRecv
+} from "@hyperledger-labs/yui-ibc-solidity/contracts/core/04-channel/IBCChannelPacketSendRecv.sol";
+import {
+    IBCChannelPacketTimeout
+} from "@hyperledger-labs/yui-ibc-solidity/contracts/core/04-channel/IBCChannelPacketTimeout.sol";
 import {
     IBCChannelUpgradeInitTryAck,
     IBCChannelUpgradeConfirmOpenTimeoutCancel
 } from "@hyperledger-labs/yui-ibc-solidity/contracts/core/04-channel/IBCChannelUpgrade.sol";
-import {OwnableIBCHandler as IBCHandler} from "@hyperledger-labs/yui-ibc-solidity/contracts/core/25-handler/OwnableIBCHandler.sol";
+import {
+    OwnableIBCHandler as IBCHandler
+} from "@hyperledger-labs/yui-ibc-solidity/contracts/core/25-handler/OwnableIBCHandler.sol";
 
 // === App ===
 import {IContractModule} from "src/core/IContractModule.sol";

src/core/CrossModule.sol

@@ -3,7 +3,10 @@ pragma solidity ^0.8.20;
 
 import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";
 import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
-import {IIBCModule, IIBCModuleInitializer} from "@hyperledger-labs/yui-ibc-solidity/contracts/core/26-router/IIBCModule.sol";
+import {
+    IIBCModule,
+    IIBCModuleInitializer
+} from "@hyperledger-labs/yui-ibc-solidity/contracts/core/26-router/IIBCModule.sol";
 import {IIBCHandler} from "@hyperledger-labs/yui-ibc-solidity/contracts/core/25-handler/IIBCHandler.sol";
 import {Packet} from "@hyperledger-labs/yui-ibc-solidity/contracts/core/04-channel/IIBCChannel.sol";
 
@@ -17,21 +20,15 @@ abstract contract CrossModule is AccessControl, IIBCModule, IBCKeeper, PacketHan
         _grantRole(IBC_ROLE, address(ibcHandler_));
     }
 
-    // ---- ERC165 ----
-    function supportsInterface(bytes4 interfaceId)
-        public
-        view
-        virtual
-        override(AccessControl, IERC165)
-        returns (bool)
-    {
-        return
-            interfaceId == type(IIBCModule).interfaceId ||
-            interfaceId == type(IIBCModuleInitializer).interfaceId ||
-            super.supportsInterface(interfaceId);
+    function supportsInterface(bytes4 interfaceId) public view virtual override(AccessControl, IERC165) returns (bool) {
+        return interfaceId == type(IIBCModule).interfaceId || interfaceId == type(IIBCModuleInitializer).interfaceId
+            || super.supportsInterface(interfaceId);
     }
 
-    // ---- Packet callbacks (ICS-04) ----
+    // function initiateTx() external {}
+
+    /// Module callbacks ///
+
     function onRecvPacket(Packet calldata packet, address relayer)
         public
         virtual
@@ -51,16 +48,11 @@ abstract contract CrossModule is AccessControl, IIBCModule, IBCKeeper, PacketHan
         handleAcknowledgement(packet, acknowledgement);
     }
 
-    function onTimeoutPacket(Packet calldata packet, address relayer)
-        public
-        virtual
-        override
-    {
+    function onTimeoutPacket(Packet calldata packet, address relayer) public virtual override {
         require(hasRole(IBC_ROLE, _msgSender()), "caller must have the IBC role");
         handleTimeout(packet);
     }
 
-    // ---- Channel handshake (ICS-26) ----
     function onChanOpenInit(IIBCModuleInitializer.MsgOnChanOpenInit calldata msg_)
         external
         virtual

src/core/CrossSimpleModule.sol

@@ -32,10 +32,30 @@ contract CrossSimpleModule is CrossModule, SimpleContractRegistry, TxAtomicSimpl
         return (address(this), msg_.counterpartyVersion);
     }
 
-    function onChanOpenAck(IIBCModule.MsgOnChanOpenAck calldata /*msg_*/) external override {}
-    function onChanOpenConfirm(IIBCModule.MsgOnChanOpenConfirm calldata /*msg_*/) external override {}
-    function onChanCloseInit(IIBCModule.MsgOnChanCloseInit calldata /*msg_*/) external override {}
-    function onChanCloseConfirm(IIBCModule.MsgOnChanCloseConfirm calldata /*msg_*/) external override {}
+    function onChanOpenAck(
+        IIBCModule.MsgOnChanOpenAck calldata /*msg_*/
+    )
+        external
+        override
+    {}
+    function onChanOpenConfirm(
+        IIBCModule.MsgOnChanOpenConfirm calldata /*msg_*/
+    )
+        external
+        override
+    {}
+    function onChanCloseInit(
+        IIBCModule.MsgOnChanCloseInit calldata /*msg_*/
+    )
+        external
+        override
+    {}
+    function onChanCloseConfirm(
+        IIBCModule.MsgOnChanCloseConfirm calldata /*msg_*/
+    )
+        external
+        override
+    {}
 
     // ---- debug for serialization ----
     function getPacketAcknowledgementCall(PacketAcknowledgementCall.CommitStatus status)

src/core/SimpleContractRegistry.sol

@@ -15,7 +15,14 @@ abstract contract SimpleContractRegistry is ContractRegistry {
         contractModule = module;
     }
 
-    function getModule(Packet memory /*packet*/) internal virtual override returns (IContractModule) {
+    function getModule(
+        Packet memory /*packet*/
+    )
+        internal
+        virtual
+        override
+        returns (IContractModule)
+    {
         require(address(contractModule) != address(0), "contractModule is not initialized yet");
         return contractModule;
     }

src/core/TxAtomicSimple.sol

@@ -23,12 +23,7 @@ abstract contract TxAtomicSimple is IBCKeeper, PacketHandler, ContractRegistry {
     event OnTimeoutPacket(bytes tx_id, uint8 tx_index, uint64 sequence);
 
     /// @inheritdoc PacketHandler
-    function handlePacket(Packet memory packet)
-        internal
-        virtual
-        override
-        returns (bytes memory acknowledgement)
-    {
+    function handlePacket(Packet memory packet) internal virtual override returns (bytes memory acknowledgement) {
         // ルーティング先モジュール解決（1回だけ）
         IContractModule module = getModule(packet);
 
@@ -49,8 +44,7 @@ abstract contract TxAtomicSimple is IBCKeeper, PacketHandler, ContractRegistry {
         // コール実行 & ACK 生成
         PacketAcknowledgementCall.Data memory ack;
         try module.onContractCall(
-            CrossContext(pdc.tx_id, txIndexParticipant, pdc.tx.signers),
-            pdc.tx.call_info
+            CrossContext(pdc.tx_id, txIndexParticipant, pdc.tx.signers), pdc.tx.call_info
         ) returns (bytes memory ret) {
             ack.status = PacketAcknowledgementCall.CommitStatus.COMMIT_STATUS_OK;
             emit OnContractCall(pdc.tx_id, txIndexParticipant, true, ret);
@@ -63,7 +57,11 @@ abstract contract TxAtomicSimple is IBCKeeper, PacketHandler, ContractRegistry {
     }
 
     /// @inheritdoc PacketHandler
-    function handleAcknowledgement(Packet memory /*packet*/, bytes memory /*acknowledgement*/)
+    function handleAcknowledgement(
+        Packet memory,
+        /*packet*/
+        bytes memory /*acknowledgement*/
+    )
         internal
         virtual
         override