fix to use own event definition in tests

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

Author: bluele

.gas-snapshot

@@ -2,48 +2,48 @@ IBCTest:testBenchmarkCreateMockClient() (gas: 209341)
 IBCTest:testBenchmarkLCUpdateMockClient() (gas: 39935)
 IBCTest:testBenchmarkRecvPacket() (gas: 137264)
 IBCTest:testBenchmarkSendPacket() (gas: 85111)
-IBCTest:testBenchmarkUpdateMockClient() (gas: 137315)
+IBCTest:testBenchmarkUpdateMockClient() (gas: 137380)
 IBCTest:testToUint128((uint64,uint64)) (runs: 256, μ: 947, ~: 947)
-TestICS02:testCreateClient() (gas: 24730617)
-TestICS02:testInvalidCreateClient() (gas: 24578266)
-TestICS02:testInvalidUpdateClient() (gas: 24581452)
-TestICS02:testRegisterClient() (gas: 24325238)
-TestICS02:testRegisterClientDuplicatedClientType() (gas: 24307288)
-TestICS02:testRegisterClientInvalidClientType() (gas: 24292160)
-TestICS02:testUpdateClient() (gas: 24747541)
-TestICS03Handshake:testConnOpenAck() (gas: 1631286)
-TestICS03Handshake:testConnOpenConfirm() (gas: 1765699)
-TestICS03Handshake:testConnOpenInit() (gas: 1279049)
-TestICS03Handshake:testConnOpenTry() (gas: 2160427)
-TestICS03Handshake:testInvalidConnOpenAck() (gas: 1943429)
-TestICS03Handshake:testInvalidConnOpenConfirm() (gas: 2007619)
-TestICS03Handshake:testInvalidConnOpenInit() (gas: 666461)
-TestICS03Handshake:testInvalidConnOpenTry() (gas: 2073805)
-TestICS03Version:testCopyVersions() (gas: 558658)
-TestICS03Version:testFindSupportedVersion() (gas: 19400)
-TestICS03Version:testIsSupportedVersion() (gas: 7864)
-TestICS03Version:testPickVersion() (gas: 25399)
-TestICS03Version:testVerifyProposedVersion() (gas: 11777)
-TestICS03Version:testVerifySupportedFeature() (gas: 4153)
+TestICS02:testCreateClient() (gas: 24828609)
+TestICS02:testInvalidCreateClient() (gas: 24676246)
+TestICS02:testInvalidUpdateClient() (gas: 24679444)
+TestICS02:testRegisterClient() (gas: 24423230)
+TestICS02:testRegisterClientDuplicatedClientType() (gas: 24405280)
+TestICS02:testRegisterClientInvalidClientType() (gas: 24390152)
+TestICS02:testUpdateClient() (gas: 24845663)
+TestICS03Handshake:testConnOpenAck() (gas: 1636277)
+TestICS03Handshake:testConnOpenConfirm() (gas: 1772310)
+TestICS03Handshake:testConnOpenInit() (gas: 1281190)
+TestICS03Handshake:testConnOpenTry() (gas: 2166092)
+TestICS03Handshake:testInvalidConnOpenAck() (gas: 1951642)
+TestICS03Handshake:testInvalidConnOpenConfirm() (gas: 2017044)
+TestICS03Handshake:testInvalidConnOpenInit() (gas: 666722)
+TestICS03Handshake:testInvalidConnOpenTry() (gas: 2079624)
+TestICS03Version:testCopyVersions() (gas: 560134)
+TestICS03Version:testFindSupportedVersion() (gas: 19740)
+TestICS03Version:testIsSupportedVersion() (gas: 8272)
+TestICS03Version:testPickVersion() (gas: 26823)
+TestICS03Version:testVerifyProposedVersion() (gas: 12185)
+TestICS03Version:testVerifySupportedFeature() (gas: 4357)
 TestICS04Handshake:testBindPort() (gas: 40333)
-TestICS04Handshake:testChanClose() (gas: 8475602)
-TestICS04Handshake:testChanOpenAck() (gas: 2882165)
-TestICS04Handshake:testChanOpenConfirm() (gas: 3062397)
-TestICS04Handshake:testChanOpenInit() (gas: 2197364)
-TestICS04Handshake:testChanOpenTry() (gas: 2655756)
-TestICS04Handshake:testInvalidChanOpenAck() (gas: 2059642)
-TestICS04Handshake:testInvalidChanOpenConfirm() (gas: 2117621)
-TestICS04Handshake:testInvalidChanOpenInit() (gas: 1272924)
-TestICS04Handshake:testInvalidChanOpenTry() (gas: 1348072)
-TestICS04Packet:testAcknowledgementPacket() (gas: 2283020)
-TestICS04Packet:testInvalidSendPacket() (gas: 2294517)
-TestICS04Packet:testRecvPacket() (gas: 7604920)
-TestICS04Packet:testRecvPacketTimeoutHeight() (gas: 2320237)
-TestICS04Packet:testRecvPacketTimeoutTimestamp() (gas: 2318872)
-TestICS04Packet:testSendPacket() (gas: 5093797)
-TestICS04Packet:testTimeoutOnClose() (gas: 2507647)
-TestICS20:testAddressToHex(address) (runs: 256, μ: 22713, ~: 22824)
+TestICS04Handshake:testChanClose() (gas: 8493283)
+TestICS04Handshake:testChanOpenAck() (gas: 2886058)
+TestICS04Handshake:testChanOpenConfirm() (gas: 3067098)
+TestICS04Handshake:testChanOpenInit() (gas: 2199573)
+TestICS04Handshake:testChanOpenTry() (gas: 2658841)
+TestICS04Handshake:testInvalidChanOpenAck() (gas: 2062335)
+TestICS04Handshake:testInvalidChanOpenConfirm() (gas: 2120446)
+TestICS04Handshake:testInvalidChanOpenInit() (gas: 1275021)
+TestICS04Handshake:testInvalidChanOpenTry() (gas: 1350509)
+TestICS04Packet:testAcknowledgementPacket() (gas: 2286474)
+TestICS04Packet:testInvalidSendPacket() (gas: 2297971)
+TestICS04Packet:testRecvPacket() (gas: 7973268)
+TestICS04Packet:testRecvPacketTimeoutHeight() (gas: 2323693)
+TestICS04Packet:testRecvPacketTimeoutTimestamp() (gas: 2322328)
+TestICS04Packet:testSendPacket() (gas: 5793531)
+TestICS04Packet:testTimeoutOnClose() (gas: 2512437)
+TestICS20:testAddressToHex(address) (runs: 256, μ: 22698, ~: 22824)
 TestICS20:testHexToAddress(string) (runs: 256, μ: 4776, ~: 4734)
 TestICS20:testIsEscapedString() (gas: 48979)
 TestICS20:testMarshaling() (gas: 148145)
-TestICS20:testParseAmount(uint256) (runs: 256, μ: 27316, ~: 23633)
+TestICS20:testParseAmount(uint256) (runs: 256, μ: 27053, ~: 22172)

tests/foundry/src/helpers/ICS04PacketTestHelper.t.sol

@@ -251,6 +251,21 @@ abstract contract ICS04PacketEventTestHelper {
         bytes acknowledgement;
     }
 
+    event SendPacket(
+        uint64 sequence,
+        string sourcePort,
+        string sourceChannel,
+        Height.Data timeoutHeight,
+        uint64 timeoutTimestamp,
+        bytes data
+    );
+
+    event WriteAcknowledgement(
+        string destinationPortId, string destinationChannel, uint64 sequence, bytes acknowledgement
+    );
+
+    event RecvPacket(Packet.Data packet);
+
     function getLastSentPacket(IIBCHandler handler, Vm.Log[] memory logs) internal view returns (Packet.Data memory) {
         for (uint256 i = logs.length; i > 0; i--) {
             if (logs[i - 1].emitter == address(handler)) {
@@ -319,7 +334,7 @@ abstract contract ICS04PacketEventTestHelper {
     }
 
     function tryDecodeSendPacketEvent(Vm.Log memory log) internal pure returns (Packet.Data memory p, bool) {
-        if (log.topics[0] != IICS04SendPacket.SendPacket.selector) {
+        if (log.topics[0] != SendPacket.selector) {
             return (p, false);
         }
         return (decodeSendPacketEvent(log.data), true);
@@ -351,7 +366,7 @@ abstract contract ICS04PacketEventTestHelper {
         pure
         returns (WriteAcknolwedgement memory wa, bool)
     {
-        if (log.topics[0] != IICS04WriteAcknowledgement.WriteAcknowledgement.selector) {
+        if (log.topics[0] != WriteAcknowledgement.selector) {
             return (wa, false);
         }
         return (decodeWriteAcknowledgementEvent(log.data), true);
@@ -368,7 +383,7 @@ abstract contract ICS04PacketEventTestHelper {
     }
 
     function tryDecodeRecvPacketEvent(Vm.Log memory log) internal pure returns (Packet.Data memory p, bool) {
-        if (log.topics[0] != IIBCChannelRecvPacket.RecvPacket.selector) {
+        if (log.topics[0] != RecvPacket.selector) {
             return (p, false);
         }
         return (decodeRecvPacketEvent(log.data), true);