Last riff on Mock Context cleanup (#310)

* Cleaning up ICS26 tests with global mock context & better coverage. * ICS26 adapted (ICS18 and general cleanup left todo) * ICS18 context mock cleanup done. * Nuked inter-dependent mock contexts * Housekeeping, last bits. * Nuked Chain* traits and unused types. * Addressing Anca's comments from prior PR * Ressurect is_epoch_format * Simplify MockContext construction. * Added mock context validation. Better constructor for ChainId. * Fixed a few of Anca's comments * Reintroduced max_history_size in MockContext constructor * Missing test case for conn_open_try * Fix host_header arithmetic, added tests for mock context. * Consistent Height construction. Fixed old comments & error messages
informalsystems · Oct 20, 2020 · f0feb0c · f0feb0c
1 parent 750a87b
commit f0feb0c
Show file tree

Hide file tree

Showing 36 changed files with 606 additions and 1,002 deletions.
diff --git a/modules/src/context.rs b/modules/src/context.rs
diff --git a/modules/src/context_mock.rs b/modules/src/context_mock.rs
diff --git a/modules/src/ics02_client/client_def.rs b/modules/src/ics02_client/client_def.rs
@@ -485,9 +485,10 @@ impl ClientDef for AnyClient {
 #[cfg(test)]
 mod tests {
     use crate::ics02_client::client_def::AnyClientState;
-    use crate::ics02_client::height::{chain_version, Height};
+    use crate::ics02_client::height::Height;
     use crate::ics07_tendermint::client_state::ClientState;
     use crate::ics07_tendermint::header::test_util::get_dummy_header;
+    use crate::ics24_host::identifier::ChainId;
     use prost_types::Any;
     use std::convert::TryFrom;
     use std::time::Duration;
@@ -500,10 +501,10 @@ mod tests {
             trusting_period: Duration::from_secs(64000),
             unbonding_period: Duration::from_secs(128000),
             max_clock_drift: Duration::from_millis(3000),
-            latest_height: Height {
-                version_number: chain_version(tm_header.signed_header.header.chain_id.to_string()),
-                version_height: u64::from(tm_header.signed_header.header.height),
-            },
+            latest_height: Height::new(
+                ChainId::chain_version(tm_header.signed_header.header.chain_id.to_string()),
+                u64::from(tm_header.signed_header.header.height),
+            ),
             frozen_height: Height::zero(),
             allow_update_after_expiry: false,
             allow_update_after_misbehaviour: false,