improve tests

Signed-off-by: Jun Kimura <jun.kimura@datachain.jp>

Author: bluele

.gas-snapshot

@@ -5,8 +5,8 @@ IBCBenchmarks:testRecvPacket() (gas: 154889)
 IBCBenchmarks:testSendPacket() (gas: 94843)
 IBCBenchmarks:testUpdateMockClientDirectly() (gas: 64879)
 IBCBenchmarks:testUpdateMockClientViaHandler() (gas: 148239)
-IBCMockAppFactoryTest:testHandshake() (gas: 8675737)
-IBCMockAppFactoryTest:testPacketRelay() (gas: 15995797)
+IBCMockAppFactoryTest:testHandshake() (gas: 8710771)
+IBCMockAppFactoryTest:testPacketRelay() (gas: 15995791)
 IBCMockAppTest:testHandshake() (gas: 4183963)
 IBCMockAppTest:testHandshakeBetweenDifferentPorts() (gas: 3130978)
 IBCMockAppTest:testPacketRelay() (gas: 11493798)
@@ -52,24 +52,24 @@ TestICS04Packet:testRecvPacketTimeoutTimestamp() (gas: 3107997)
 TestICS04Packet:testSendPacket() (gas: 4425319)
 TestICS04Packet:testTimeoutOnClose() (gas: 3335905)
 TestICS04Upgrade:testCrossingHelloInconsistentVersions() (gas: 9761065)
-TestICS04Upgrade:testUpgradeAuthorityCancel() (gas: 45179910)
+TestICS04Upgrade:testUpgradeAuthorityCancel() (gas: 45179742)
 TestICS04Upgrade:testUpgradeCannotCancelWithOldErrorReceipt() (gas: 3309916)
-TestICS04Upgrade:testUpgradeCannotRecvNextUpgradePacket() (gas: 5142540)
-TestICS04Upgrade:testUpgradeCounterpartyAdvanceNextSequenceBeforeOpen() (gas: 5101912)
+TestICS04Upgrade:testUpgradeCannotRecvNextUpgradePacket() (gas: 5142516)
+TestICS04Upgrade:testUpgradeCounterpartyAdvanceNextSequenceBeforeOpen() (gas: 5101888)
 TestICS04Upgrade:testUpgradeCrossingHelloIncompatibleProposals() (gas: 4859793)
-TestICS04Upgrade:testUpgradeFull() (gas: 55736704)
+TestICS04Upgrade:testUpgradeFull() (gas: 55736320)
 TestICS04Upgrade:testUpgradeInit() (gas: 2937759)
 TestICS04Upgrade:testUpgradeNoChanges() (gas: 2354426)
 TestICS04Upgrade:testUpgradeNotUpgradableModule() (gas: 3470809)
 TestICS04Upgrade:testUpgradeOutOfSync() (gas: 3741133)
-TestICS04Upgrade:testUpgradeRelaySuccessAtCounterpartyFlushComplete() (gas: 5115138)
-TestICS04Upgrade:testUpgradeRelaySuccessAtFlushing() (gas: 5487371)
-TestICS04Upgrade:testUpgradeSendPacketFailAtFlushingOrFlushComplete() (gas: 3920282)
+TestICS04Upgrade:testUpgradeRelaySuccessAtCounterpartyFlushComplete() (gas: 5115114)
+TestICS04Upgrade:testUpgradeRelaySuccessAtFlushing() (gas: 5487347)
+TestICS04Upgrade:testUpgradeSendPacketFailAtFlushingOrFlushComplete() (gas: 3920258)
 TestICS04Upgrade:testUpgradeTimeoutAbortAck() (gas: 17345060)
 TestICS04Upgrade:testUpgradeTimeoutAbortConfirm() (gas: 20945649)
-TestICS04Upgrade:testUpgradeTimeoutUpgrade() (gas: 69105638)
-TestICS04Upgrade:testUpgradeToOrdered() (gas: 53030999)
-TestICS04Upgrade:testUpgradeToUnordered() (gas: 42323384)
+TestICS04Upgrade:testUpgradeTimeoutUpgrade() (gas: 69105350)
+TestICS04Upgrade:testUpgradeToOrdered() (gas: 53030759)
+TestICS04Upgrade:testUpgradeToUnordered() (gas: 42323192)
 TestICS04UpgradeApp:testUpgradeAuthorizationChanneNotFound() (gas: 62062)
 TestICS04UpgradeApp:testUpgradeAuthorizationRePropose() (gas: 2376902)
 TestICS04UpgradeApp:testUpgradeAuthorizationRemove() (gas: 2357348)

tests/foundry/src/IBCMockAppFactory.t.sol

@@ -36,7 +36,11 @@ contract IBCMockAppFactoryTest is IBCTestHelper, ICS04PacketEventTestHelper {
     function testHandshake() public {
         Channel.Order[2] memory orders = [Channel.Order.ORDER_UNORDERED, Channel.Order.ORDER_ORDERED];
         for (uint256 i = 0; i < orders.length; i++) {
-            createMockAppChannel(orders[i]);
+            (ChannelInfo memory channel0, ChannelInfo memory channel1) = createMockAppChannel(orders[i]);
+            assertEq(address(ibcHandler.getIBCModuleByPort(channel0.portId)), address(mockAppFactory));
+            assertEq(address(ibcHandler.getIBCModuleByChannel(channel0.portId, channel0.channelId)), address(mockAppFactory.lookupApp(channel0.channelId)));
+            assertEq(address(ibcHandler.getIBCModuleByPort(channel1.portId)), address(mockAppFactory));
+            assertEq(address(ibcHandler.getIBCModuleByChannel(channel1.portId, channel1.channelId)), address(mockAppFactory.lookupApp(channel1.channelId)));
         }
     }