default tags at function args

Author: rnbguy

ibc-testkit/src/fixtures/applications/transfer.rs

@@ -12,18 +12,18 @@ use crate::fixtures::core::signer::dummy_account_id;
 /// Returns a dummy [`MsgTransfer`], for testing purposes only!
 #[builder(finish_fn = build)]
 pub fn dummy_msg_transfer(
-    port_id_on_a: Option<PortId>,
-    chan_id_on_a: Option<ChannelId>,
+    #[builder(default = PortId::transfer())] port_id_on_a: PortId,
+    #[builder(default = ChannelId::zero())] chan_id_on_a: ChannelId,
     packet_data: PacketData,
-    timeout_height_on_b: Option<TimeoutHeight>,
-    timeout_timestamp_on_b: Option<TimeoutTimestamp>,
+    #[builder(default = TimeoutHeight::Never)] timeout_height_on_b: TimeoutHeight,
+    #[builder(default = TimeoutTimestamp::Never)] timeout_timestamp_on_b: TimeoutTimestamp,
 ) -> MsgTransfer {
     MsgTransfer {
-        port_id_on_a: port_id_on_a.unwrap_or_else(PortId::transfer),
-        chan_id_on_a: chan_id_on_a.unwrap_or_else(ChannelId::zero),
+        port_id_on_a,
+        chan_id_on_a,
         packet_data,
-        timeout_height_on_b: timeout_height_on_b.unwrap_or(TimeoutHeight::Never),
-        timeout_timestamp_on_b: timeout_timestamp_on_b.unwrap_or(TimeoutTimestamp::Never),
+        timeout_height_on_b,
+        timeout_timestamp_on_b,
     }
 }
 
@@ -47,14 +47,14 @@ pub fn extract_transfer_packet(msg: &MsgTransfer, sequence: Sequence) -> Packet
 #[builder(finish_fn = build)]
 pub fn dummy_packet_data(
     token: PrefixedCoin,
-    sender: Option<Signer>,
-    receiver: Option<Signer>,
-    memo: Option<Memo>,
+    #[builder(default = dummy_account_id())] sender: Signer,
+    #[builder(default = dummy_account_id())] receiver: Signer,
+    #[builder(default = "".into())] memo: Memo,
 ) -> PacketData {
     PacketData {
         token,
-        sender: sender.unwrap_or_else(dummy_account_id),
-        receiver: receiver.unwrap_or_else(dummy_account_id),
-        memo: memo.unwrap_or_else(|| "".into()),
+        sender,
+        receiver,
+        memo,
     }
 }

ibc-testkit/src/fixtures/core/channel/packet.rs

@@ -9,24 +9,24 @@ use ibc::core::primitives::prelude::*;
 /// Returns a dummy [`Packet`], for testing purposes only!
 #[builder(finish_fn = build)]
 pub fn dummy_packet(
-    seq_on_a: Option<Sequence>,
-    port_id_on_a: Option<PortId>,
-    chan_id_on_a: Option<ChannelId>,
-    port_id_on_b: Option<PortId>,
-    chan_id_on_b: Option<ChannelId>,
-    data: Option<Vec<u8>>,
-    timeout_height_on_b: Option<TimeoutHeight>,
-    timeout_timestamp_on_b: Option<TimeoutTimestamp>,
+    #[builder(default = Sequence::from(0))] seq_on_a: Sequence,
+    #[builder(default = PortId::transfer())] port_id_on_a: PortId,
+    #[builder(default = ChannelId::zero())] chan_id_on_a: ChannelId,
+    #[builder(default = PortId::transfer())] port_id_on_b: PortId,
+    #[builder(default = ChannelId::zero())] chan_id_on_b: ChannelId,
+    #[builder(default)] data: Vec<u8>,
+    #[builder(default = TimeoutHeight::Never)] timeout_height_on_b: TimeoutHeight,
+    #[builder(default = TimeoutTimestamp::Never)] timeout_timestamp_on_b: TimeoutTimestamp,
 ) -> Packet {
     Packet {
-        seq_on_a: seq_on_a.unwrap_or(Sequence::from(0)),
-        port_id_on_a: port_id_on_a.unwrap_or_else(PortId::transfer),
-        chan_id_on_a: chan_id_on_a.unwrap_or_else(ChannelId::zero),
-        port_id_on_b: port_id_on_b.unwrap_or_else(PortId::transfer),
-        chan_id_on_b: chan_id_on_b.unwrap_or_else(ChannelId::zero),
-        data: data.unwrap_or_default(),
-        timeout_height_on_b: timeout_height_on_b.unwrap_or(TimeoutHeight::Never),
-        timeout_timestamp_on_b: timeout_timestamp_on_b.unwrap_or(TimeoutTimestamp::Never),
+        seq_on_a,
+        port_id_on_a,
+        chan_id_on_a,
+        port_id_on_b,
+        chan_id_on_b,
+        data,
+        timeout_height_on_b,
+        timeout_timestamp_on_b,
     }
 }
 

ibc-testkit/src/fixtures/core/context.rs

@@ -17,23 +17,17 @@ use crate::utils::year_2023;
 /// Returns a dummy [`StoreGenericTestContext`], for testing purposes only!
 #[builder(finish_fn = build)]
 pub fn dummy_store_generic_test_context<S, H>(
-    host: Option<H>,
-    block_time: Option<Duration>,
-    latest_timestamp: Option<Timestamp>,
-    block_params_history: Option<Vec<H::BlockParams>>,
-    latest_height: Option<Height>,
+    #[builder(default)] host: H,
+    #[builder(default = Duration::from_secs(DEFAULT_BLOCK_TIME_SECS))] block_time: Duration,
+    #[builder(default = year_2023())] latest_timestamp: Timestamp,
+    #[builder(default)] block_params_history: Vec<H::BlockParams>,
+    #[builder(default = Height::new(0, 5).expect("Never fails"))] latest_height: Height,
 ) -> StoreGenericTestContext<S, H>
 where
     S: ProvableStore + Debug + Default,
     H: TestHost,
     HostClientState<H>: ClientStateValidation<MockIbcStore<S>>,
 {
-    let host = host.unwrap_or_default();
-    let block_time = block_time.unwrap_or_else(|| Duration::from_secs(DEFAULT_BLOCK_TIME_SECS));
-    let latest_timestamp = latest_timestamp.unwrap_or_else(year_2023);
-    let block_params_history = block_params_history.unwrap_or_default();
-    let latest_height = latest_height.unwrap_or_else(|| Height::new(0, 5).expect("Never fails"));
-
     assert_ne!(
         latest_height.revision_height(),
         0,