implement getIBCModuleBy{Port,Channel} for IBCQuerier

Signed-off-by: Jun Kimura <[email protected]>

Author: bluele

.gas-snapshot

@@ -1,71 +1,71 @@
-IBCMockAppTest:testHandshake() (gas: 4420356)
-IBCMockAppTest:testHandshakeBetweenDifferentPorts() (gas: 3334286)
-IBCMockAppTest:testPacketRelay() (gas: 13932025)
-IBCMockAppTest:testPacketTimeout() (gas: 4279264)
+IBCMockAppTest:testHandshake() (gas: 4420488)
+IBCMockAppTest:testHandshakeBetweenDifferentPorts() (gas: 3334373)
+IBCMockAppTest:testPacketRelay() (gas: 13931365)
+IBCMockAppTest:testPacketTimeout() (gas: 4279263)
 IBCTest:testBenchmarkCreateMockClient() (gas: 233366)
 IBCTest:testBenchmarkLCUpdateMockClient() (gas: 62005)
-IBCTest:testBenchmarkRecvPacket() (gas: 158921)
+IBCTest:testBenchmarkRecvPacket() (gas: 158899)
 IBCTest:testBenchmarkSendPacket() (gas: 128432)
 IBCTest:testBenchmarkUpdateMockClient() (gas: 160229)
 IBCTest:testToUint128((uint64,uint64)) (runs: 256, μ: 947, ~: 947)
-TestICS02:testCreateClient() (gas: 36491844)
-TestICS02:testInvalidCreateClient() (gas: 36389119)
-TestICS02:testInvalidUpdateClient() (gas: 36387971)
-TestICS02:testRegisterClient() (gas: 36043570)
-TestICS02:testRegisterClientDuplicatedClientType() (gas: 36028879)
-TestICS02:testRegisterClientInvalidClientType() (gas: 36058206)
-TestICS02:testUpdateClient() (gas: 36556171)
-TestICS03Handshake:testConnOpenAck() (gas: 1858296)
-TestICS03Handshake:testConnOpenConfirm() (gas: 2054231)
-TestICS03Handshake:testConnOpenInit() (gas: 1429882)
-TestICS03Handshake:testConnOpenTry() (gas: 2398932)
-TestICS03Handshake:testInvalidConnOpenAck() (gas: 2421932)
-TestICS03Handshake:testInvalidConnOpenConfirm() (gas: 2535700)
+TestICS02:testCreateClient() (gas: 36551707)
+TestICS02:testInvalidCreateClient() (gas: 36448926)
+TestICS02:testInvalidUpdateClient() (gas: 36447834)
+TestICS02:testRegisterClient() (gas: 36103500)
+TestICS02:testRegisterClientDuplicatedClientType() (gas: 36088809)
+TestICS02:testRegisterClientInvalidClientType() (gas: 36118270)
+TestICS02:testUpdateClient() (gas: 36616034)
+TestICS03Handshake:testConnOpenAck() (gas: 1858230)
+TestICS03Handshake:testConnOpenConfirm() (gas: 2054143)
+TestICS03Handshake:testConnOpenInit() (gas: 1429838)
+TestICS03Handshake:testConnOpenTry() (gas: 2398844)
+TestICS03Handshake:testInvalidConnOpenAck() (gas: 2421822)
+TestICS03Handshake:testInvalidConnOpenConfirm() (gas: 2535568)
 TestICS03Handshake:testInvalidConnOpenInit() (gas: 783147)
-TestICS03Handshake:testInvalidConnOpenTry() (gas: 2342609)
+TestICS03Handshake:testInvalidConnOpenTry() (gas: 2342543)
 TestICS03Version:testCopyVersions() (gas: 558658)
 TestICS03Version:testFindSupportedVersion() (gas: 19400)
 TestICS03Version:testIsSupportedVersion() (gas: 7864)
 TestICS03Version:testPickVersion() (gas: 25327)
 TestICS03Version:testVerifyProposedVersion() (gas: 11777)
 TestICS03Version:testVerifySupportedFeature() (gas: 4153)
 TestICS04Handshake:testBindPort() (gas: 124350)
-TestICS04Handshake:testChanClose() (gas: 12938710)
-TestICS04Handshake:testChanOpenAck() (gas: 3459608)
-TestICS04Handshake:testChanOpenConfirm() (gas: 3770921)
-TestICS04Handshake:testChanOpenInit() (gas: 2543726)
-TestICS04Handshake:testChanOpenTry() (gas: 3100014)
-TestICS04Handshake:testInvalidChanOpenAck() (gas: 2439820)
-TestICS04Handshake:testInvalidChanOpenConfirm() (gas: 2517409)
-TestICS04Handshake:testInvalidChanOpenInit() (gas: 1758661)
-TestICS04Handshake:testInvalidChanOpenTry() (gas: 1773244)
-TestICS04Packet:testAcknowledgementPacket() (gas: 3351462)
-TestICS04Packet:testInvalidSendPacket() (gas: 3551893)
-TestICS04Packet:testRecvPacket() (gas: 10996621)
-TestICS04Packet:testRecvPacketTimeoutHeight() (gas: 3260169)
-TestICS04Packet:testRecvPacketTimeoutTimestamp() (gas: 3279319)
-TestICS04Packet:testSendPacket() (gas: 6413456)
-TestICS04Packet:testTimeoutOnClose() (gas: 3553819)
-TestICS04Upgrade:testUpgradeAuthorityCancel() (gas: 46740549)
+TestICS04Handshake:testChanClose() (gas: 12938854)
+TestICS04Handshake:testChanOpenAck() (gas: 3459404)
+TestICS04Handshake:testChanOpenConfirm() (gas: 3770673)
+TestICS04Handshake:testChanOpenInit() (gas: 2543524)
+TestICS04Handshake:testChanOpenTry() (gas: 3099898)
+TestICS04Handshake:testInvalidChanOpenAck() (gas: 2439749)
+TestICS04Handshake:testInvalidChanOpenConfirm() (gas: 2517338)
+TestICS04Handshake:testInvalidChanOpenInit() (gas: 1758704)
+TestICS04Handshake:testInvalidChanOpenTry() (gas: 1773674)
+TestICS04Packet:testAcknowledgementPacket() (gas: 3351152)
+TestICS04Packet:testInvalidSendPacket() (gas: 3551583)
+TestICS04Packet:testRecvPacket() (gas: 10995054)
+TestICS04Packet:testRecvPacketTimeoutHeight() (gas: 3259727)
+TestICS04Packet:testRecvPacketTimeoutTimestamp() (gas: 3278877)
+TestICS04Packet:testSendPacket() (gas: 6412442)
+TestICS04Packet:testTimeoutOnClose() (gas: 3553289)
+TestICS04Upgrade:testUpgradeAuthorityCancel() (gas: 46737910)
 TestICS04Upgrade:testUpgradeCannotCancelWithOldErrorReceipt() (gas: 3455585)
-TestICS04Upgrade:testUpgradeCannotRecvNextUpgradePacket() (gas: 5266813)
-TestICS04Upgrade:testUpgradeCounterpartyAdvanceNextSequenceBeforeOpen() (gas: 5235961)
-TestICS04Upgrade:testUpgradeCrossingHelloIncompatibleProposals() (gas: 4405943)
-TestICS04Upgrade:testUpgradeFull() (gas: 57782504)
-TestICS04Upgrade:testUpgradeInit() (gas: 3068733)
-TestICS04Upgrade:testUpgradeNoChanges() (gas: 2471886)
-TestICS04Upgrade:testUpgradeOutOfSync() (gas: 3902195)
-TestICS04Upgrade:testUpgradeRelaySuccessAtCounterpartyFlushComplete() (gas: 5238577)
-TestICS04Upgrade:testUpgradeRelaySuccessAtFlushing() (gas: 5612554)
-TestICS04Upgrade:testUpgradeSendPacketFailAtFlushingOrFlushComplete() (gas: 4070944)
-TestICS04Upgrade:testUpgradeTimeoutAbortAck() (gas: 17679407)
-TestICS04Upgrade:testUpgradeTimeoutAbortConfirm() (gas: 21317099)
-TestICS04Upgrade:testUpgradeTimeoutUpgrade() (gas: 44263811)
-TestICS04Upgrade:testUpgradeToOrdered() (gas: 56495273)
-TestICS04Upgrade:testUpgradeToUnordered() (gas: 45104027)
-TestICS04UpgradeApp:testUpgradeAuthorizationChanneNotFound() (gas: 61712)
-TestICS04UpgradeApp:testUpgradeAuthorizationRePropose() (gas: 2565510)
-TestICS04UpgradeApp:testUpgradeAuthorizationRemove() (gas: 2473948)
+TestICS04Upgrade:testUpgradeCannotRecvNextUpgradePacket() (gas: 5266374)
+TestICS04Upgrade:testUpgradeCounterpartyAdvanceNextSequenceBeforeOpen() (gas: 5235544)
+TestICS04Upgrade:testUpgradeCrossingHelloIncompatibleProposals() (gas: 4405811)
+TestICS04Upgrade:testUpgradeFull() (gas: 57775990)
+TestICS04Upgrade:testUpgradeInit() (gas: 3068711)
+TestICS04Upgrade:testUpgradeNoChanges() (gas: 2471930)
+TestICS04Upgrade:testUpgradeOutOfSync() (gas: 3902151)
+TestICS04Upgrade:testUpgradeRelaySuccessAtCounterpartyFlushComplete() (gas: 5238138)
+TestICS04Upgrade:testUpgradeRelaySuccessAtFlushing() (gas: 5612071)
+TestICS04Upgrade:testUpgradeSendPacketFailAtFlushingOrFlushComplete() (gas: 4070658)
+TestICS04Upgrade:testUpgradeTimeoutAbortAck() (gas: 17677097)
+TestICS04Upgrade:testUpgradeTimeoutAbortConfirm() (gas: 21313205)
+TestICS04Upgrade:testUpgradeTimeoutUpgrade() (gas: 44260340)
+TestICS04Upgrade:testUpgradeToOrdered() (gas: 56489888)
+TestICS04Upgrade:testUpgradeToUnordered() (gas: 45099675)
+TestICS04UpgradeApp:testUpgradeAuthorizationChanneNotFound() (gas: 61690)
+TestICS04UpgradeApp:testUpgradeAuthorizationRePropose() (gas: 2565532)
+TestICS04UpgradeApp:testUpgradeAuthorizationRemove() (gas: 2473992)
 TestICS20:testAddressToHex(address) (runs: 256, μ: 22726, ~: 22867)
 TestICS20:testHexToAddress(string) (runs: 256, μ: 4776, ~: 4734)
 TestICS20:testIsEscapedString() (gas: 48979)

contracts/core/25-handler/IBCQuerier.sol

@@ -6,8 +6,9 @@ import {ConnectionEnd} from "../../proto/Connection.sol";
 import {Channel, Upgrade} from "../../proto/Channel.sol";
 import {IBCChannelLib} from "../04-channel/IBCChannelLib.sol";
 import {IBCCommitment} from "../24-host/IBCCommitment.sol";
-import {IIBCQuerier} from "./IIBCQuerier.sol";
+import {IIBCModule} from "../26-router/IIBCModule.sol";
 import {IBCModuleManager} from "../26-router/IBCModuleManager.sol";
+import {IIBCQuerier} from "./IIBCQuerier.sol";
 
 contract IBCQuerier is IBCModuleManager, IIBCQuerier {
     function getCommitmentPrefix() public view override returns (bytes memory) {
@@ -22,6 +23,19 @@ contract IBCQuerier is IBCModuleManager, IIBCQuerier {
         return expectedTimePerBlock;
     }
 
+    function getIBCModuleByPort(string calldata portId) public view override returns (IIBCModule) {
+        return lookupModuleByPort(portId);
+    }
+
+    function getIBCModuleByChannel(string calldata portId, string calldata channelId)
+        public
+        view
+        override
+        returns (IIBCModule)
+    {
+        return lookupModuleByChannel(portId, channelId);
+    }
+
     function getClientByType(string calldata clientType) public view override returns (address) {
         return clientRegistry[clientType];
     }

contracts/core/25-handler/IIBCQuerier.sol

@@ -5,6 +5,7 @@ import {Height} from "../../proto/Client.sol";
 import {ConnectionEnd} from "../../proto/Connection.sol";
 import {Channel, Upgrade} from "../../proto/Channel.sol";
 import {IBCChannelLib} from "../04-channel/IBCChannelLib.sol";
+import {IIBCModule} from "../26-router/IIBCModule.sol";
 
 interface IIBCQuerier {
     function getCommitmentPrefix() external view returns (bytes memory);
@@ -13,6 +14,13 @@ interface IIBCQuerier {
 
     function getExpectedTimePerBlock() external view returns (uint64);
 
+    function getIBCModuleByPort(string calldata portId) external view returns (IIBCModule);
+
+    function getIBCModuleByChannel(string calldata portId, string calldata channelId)
+        external
+        view
+        returns (IIBCModule);
+
     function getClientByType(string calldata clientType) external view returns (address);
 
     function getClientType(string calldata clientId) external view returns (string memory);