refactor(ibc-testkit): remove Default from client_state initialization

Author: catconcat

ibc-testkit/src/fixtures/clients/tendermint.rs

@@ -31,8 +31,8 @@ pub fn dummy_tm_client_state_from_header(tm_header: TmHeader) -> TmClientState {
         Duration::from_secs(128000),
         Duration::from_millis(3000),
         Height::new(chain_id.revision_number(), u64::from(tm_header.height)).expect("Never fails"),
-        Default::default(),
-        Default::default(),
+        ProofSpecs::cosmos(),
+        Vec::new(),
         AllowUpdate {
             after_expiry: false,
             after_misbehaviour: false,
@@ -56,8 +56,8 @@ pub fn dummy_raw_tm_client_state(frozen_height: RawHeight) -> RawTmClientState {
         unbonding_period: Some(Duration::from_secs(128000).into()),
         max_clock_drift: Some(Duration::from_millis(3000).into()),
         latest_height: Some(Height::new(0, 10).expect("Never fails").into()),
-        proof_specs: ProofSpecs::default().into(),
-        upgrade_path: Default::default(),
+        proof_specs: ProofSpecs::cosmos().into(),
+        upgrade_path: Vec::new(),
         frozen_height: Some(frozen_height),
         allow_update_after_expiry: false,
         allow_update_after_misbehaviour: false,
@@ -67,7 +67,7 @@ pub fn dummy_raw_tm_client_state(frozen_height: RawHeight) -> RawTmClientState {
 #[derive(typed_builder::TypedBuilder, Debug)]
 pub struct ClientStateConfig {
     pub chain_id: ChainId,
-    #[builder(default)]
+    #[builder(default = TrustThreshold::ONE_THIRD)]
     pub trust_level: TrustThreshold,
     #[builder(default = Duration::from_secs(64000))]
     pub trusting_period: Duration,
@@ -76,7 +76,7 @@ pub struct ClientStateConfig {
     #[builder(default = Duration::from_millis(3000))]
     max_clock_drift: Duration,
     pub latest_height: Height,
-    #[builder(default)]
+    #[builder(default = ProofSpecs::cosmos())]
     pub proof_specs: ProofSpecs,
     #[builder(default)]
     pub upgrade_path: Vec<String>,

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

@@ -267,7 +267,7 @@ mod tests {
         let ibc_event = IbcEvent::SendPacket(SendPacket::new(
             packet,
             Order::Unordered,
-            ConnectionId::default(),
+            ConnectionId::new(0),
         ));
         let _ = tendermint::abci::Event::try_from(ibc_event);
     }

ibc-testkit/src/fixtures/core/connection/conn_open_ack.rs

@@ -2,7 +2,7 @@ use ibc::core::client::types::proto::v1::Height as RawHeight;
 use ibc::core::client::types::Height;
 use ibc::core::connection::types::msgs::MsgConnectionOpenAck;
 use ibc::core::connection::types::proto::v1::MsgConnectionOpenAck as RawMsgConnectionOpenAck;
-use ibc::core::connection::types::version::Version;
+use ibc::core::connection::types::version::get_compatible_versions;
 use ibc::core::host::types::identifiers::ConnectionId;
 use ibc::core::primitives::prelude::*;
 
@@ -38,7 +38,7 @@ pub fn dummy_raw_msg_conn_open_ack(
         }),
         client_state: Some(MockClientState::new(MockHeader::new(client_state_height)).into()),
         proof_client: dummy_proof(),
-        version: Some(Version::default().into()),
+        version: Some(get_compatible_versions()[0].into()),
         signer: dummy_bech32_account(),
         host_consensus_state_proof: vec![],
     }

ibc-testkit/src/fixtures/core/connection/conn_open_init.rs

@@ -2,7 +2,7 @@ use ibc::core::connection::types::msgs::MsgConnectionOpenInit;
 use ibc::core::connection::types::proto::v1::{
     MsgConnectionOpenInit as RawMsgConnectionOpenInit, Version as RawVersion,
 };
-use ibc::core::connection::types::version::Version;
+use ibc::core::connection::types::version::{get_compatible_versions, Version};
 use ibc::core::connection::types::Counterparty;
 use ibc::core::host::types::identifiers::ClientId;
 use ibc::core::primitives::prelude::*;
@@ -71,9 +71,9 @@ pub fn msg_conn_open_with_version(
 /// Returns a dummy `RawMsgConnectionOpenInit`, for testing purposes only!
 pub fn dummy_raw_msg_conn_open_init() -> RawMsgConnectionOpenInit {
     RawMsgConnectionOpenInit {
-        client_id: ClientId::default().to_string(),
+        client_id: ClientId::from("07-tendermint-0").to_string(),
         counterparty: Some(dummy_raw_counterparty_conn(None)),
-        version: Some(Version::default().into()),
+        version: Some(get_compatible_versions()[0].into()),
         delay_period: 0,
         signer: dummy_bech32_account(),
     }

ibc-testkit/src/fixtures/core/connection/conn_open_try.rs

@@ -40,8 +40,8 @@ pub fn dummy_raw_msg_conn_open_try(
 
     #[allow(deprecated)]
     RawMsgConnectionOpenTry {
-        client_id: ClientId::default().to_string(),
-        previous_connection_id: ConnectionId::default().to_string(),
+        client_id: ClientId::from("07-tendermint-0").to_string(),
+        previous_connection_id: ConnectionId::new(0).to_string(),
         client_state: Some(MockClientState::new(MockHeader::new(client_state_height)).into()),
         counterparty: Some(dummy_raw_counterparty_conn(Some(0))),
         delay_period: 0,

ibc-testkit/src/fixtures/core/connection/mod.rs

@@ -42,7 +42,7 @@ pub fn dummy_raw_counterparty_conn(conn_id: Option<u64>) -> RawCounterparty {
         None => "".to_string(),
     };
     RawCounterparty {
-        client_id: ClientId::default().to_string(),
+        client_id: ClientId::from("07-tendermint-0").to_string(),
         connection_id,
         prefix: Some(MerklePrefix {
             key_prefix: b"ibc".to_vec(),

ibc-testkit/tests/core/ics02_client/update_client.rs

@@ -678,7 +678,7 @@ fn test_update_synthetic_tendermint_client_duplicate_ok() {
                     .into(),
                 ),
                 proof_specs: ProofSpecs::default().into(),
-                upgrade_path: Default::default(),
+                upgrade_path: Vec::new(),
                 frozen_height: Some(RawHeight {
                     revision_number: 0,
                     revision_height: 0,