Rework channel events (informalsystems#1859)

* refactor events

* fmt

* chore: cleanup

* clippy fixes

* Formatting

* update channel event attributes conversion

* cargo clippy

* minor fix

* add changelog

Co-authored-by: Romain Ruetschi <romain.ruetschi@gmail.com>

.changelog/unreleased/improvements/ibc/718-rework-ics04_channel-events.md

@@ -0,0 +1,2 @@
+- Refactored ics04_channel events
+  ([#718](https://github.com/informalsystems/ibc-rs/issues/718))

relayer/src/channel.rs

@@ -195,8 +195,9 @@ impl<ChainA: ChainHandle, ChainB: ChainHandle> Channel<ChainA, ChainB> {
         channel_open_event: IbcEvent,
     ) -> Result<Channel<ChainA, ChainB>, ChannelError> {
         let channel_event_attributes = channel_open_event
+            .clone()
             .channel_attributes()
-            .ok_or_else(|| ChannelError::invalid_event(channel_open_event.clone()))?;
+            .ok_or_else(|| ChannelError::invalid_event(channel_open_event))?;
 
         let port_id = channel_event_attributes.port_id.clone();
         let channel_id = channel_event_attributes.channel_id.clone();
@@ -232,7 +233,7 @@ impl<ChainA: ChainHandle, ChainB: ChainHandle> Channel<ChainA, ChainB> {
                 connection.counterparty().client_id().clone(),
                 counterparty_connection_id.clone(),
                 channel_event_attributes.counterparty_port_id.clone(),
-                channel_event_attributes.counterparty_channel_id.clone(),
+                channel_event_attributes.counterparty_channel_id,
                 None,
             ),
             connection_delay: connection.delay_period(),

relayer/src/supervisor.rs

@@ -418,34 +418,36 @@ pub fn collect_events(
             }
             IbcEvent::OpenInitChannel(..) | IbcEvent::OpenTryChannel(..) => {
                 collect_event(&mut collected, event, mode.channels.enabled, || {
-                    event.channel_attributes().and_then(|attr| {
-                        Object::channel_from_chan_open_events(attr, src_chain).ok()
+                    event.clone().channel_attributes().and_then(|attr| {
+                        Object::channel_from_chan_open_events(&attr, src_chain).ok()
                     })
                 });
             }
-            IbcEvent::OpenAckChannel(ref open_ack) => {
+            IbcEvent::OpenAckChannel(open_ack) => {
                 // Create client and packet workers here as channel end must be opened
+                let attributes = open_ack.clone().into();
                 collect_event(&mut collected, event, mode.clients.enabled, || {
-                    Object::client_from_chan_open_events(open_ack.attributes(), src_chain).ok()
+                    Object::client_from_chan_open_events(&attributes, src_chain).ok()
                 });
 
                 collect_event(&mut collected, event, mode.packets.enabled, || {
-                    Object::packet_from_chan_open_events(open_ack.attributes(), src_chain).ok()
+                    Object::packet_from_chan_open_events(&attributes, src_chain).ok()
                 });
 
                 // If handshake message relaying is enabled create worker to send the MsgChannelOpenConfirm message
                 collect_event(&mut collected, event, mode.channels.enabled, || {
-                    Object::channel_from_chan_open_events(open_ack.attributes(), src_chain).ok()
+                    Object::channel_from_chan_open_events(&attributes, src_chain).ok()
                 });
             }
-            IbcEvent::OpenConfirmChannel(ref open_confirm) => {
+            IbcEvent::OpenConfirmChannel(open_confirm) => {
+                let attributes = open_confirm.clone().into();
                 // Create client worker here as channel end must be opened
                 collect_event(&mut collected, event, mode.clients.enabled, || {
-                    Object::client_from_chan_open_events(open_confirm.attributes(), src_chain).ok()
+                    Object::client_from_chan_open_events(&attributes, src_chain).ok()
                 });
 
                 collect_event(&mut collected, event, mode.packets.enabled, || {
-                    Object::packet_from_chan_open_events(open_confirm.attributes(), src_chain).ok()
+                    Object::packet_from_chan_open_events(&attributes, src_chain).ok()
                 });
             }
             IbcEvent::SendPacket(ref packet) => {