Refactored and completed Path; added query to Chain trait; refactored query code into TendermintChain

modules/src/ics02_client/mod.rs

@@ -5,5 +5,4 @@ pub mod error;
 pub mod events;
 pub mod header;
 pub mod msgs;
-pub mod query;
 pub mod state;

modules/src/ics23_commitment/mod.rs

@@ -1,6 +1,5 @@
 use serde_derive::{Deserialize, Serialize};
 
-use crate::path::Path;
 use std::fmt;
 use tendermint::merkle::proof::Proof;
 
@@ -10,15 +9,6 @@ pub struct CommitmentRoot;
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct CommitmentPath;
 
-impl CommitmentPath {
-    pub fn from_path<P>(_p: P) -> Self
-    where
-        P: Path,
-    {
-        CommitmentPath {}
-    }
-}
-
 pub type CommitmentProof = Proof;
 /*
 impl CommitmentProof {

modules/src/ics24_host/mod.rs

@@ -2,4 +2,6 @@
 
 pub mod error;
 pub mod identifier;
+mod path;
+pub use path::{Path, IBC_QUERY_PATH};
 pub mod validate;

modules/src/ics24_host/path.rs

@@ -0,0 +1,86 @@
+/// Path-space as listed in ICS-024
+/// https://github.com/cosmos/ics/tree/master/spec/ics-024-host-requirements#path-space
+/// Some of these are implemented in other ICSs, but ICS-024 has a nice summary table.
+use crate::ics24_host::identifier::{ChannelId, ClientId, ConnectionId, PortId};
+use std::fmt::{Display, Formatter, Result};
+
+/// IBC Query Path is hard-coded
+pub const IBC_QUERY_PATH: &str = "store/ibc/key";
+
+/// The Path enum abstracts out the different sub-paths
+pub enum Path {
+    ClientType(ClientId),
+    ClientState(ClientId),
+    ConsensusState(ClientId, u64),
+    ClientConnections(ClientId),
+    Connections(ConnectionId),
+    Ports(PortId),
+    ChannelEnds(PortId, ChannelId),
+    SeqSends(PortId, ChannelId),
+    SeqRecvs(PortId, ChannelId),
+    SeqAcks(PortId, ChannelId),
+    Commitments(PortId, ChannelId, u64),
+    Acks(PortId, ChannelId, u64),
+}
+
+impl Path {
+    /// Indication if the path is provable.
+    pub fn is_provable(&self) -> bool {
+        match &self {
+            Path::ClientState(_) => false,
+            Path::ClientConnections(_) => false,
+            Path::Ports(_) => false,
+            _ => true,
+        }
+    }
+
+    /// into_bytes implementation
+    pub fn into_bytes(self) -> Vec<u8> {
+        self.to_string().into_bytes()
+    }
+}
+
+/// The Display trait adds the `.to_string()` method to the Path struct
+/// This is where the different path strings are constructed
+impl Display for Path {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result {
+        match &self {
+            Path::ClientType(id) => write!(f, "clients/{}/clientType", id),
+            Path::ClientState(id) => write!(f, "clients/{}/clientState", id),
+            Path::ConsensusState(id, height) => {
+                write!(f, "clients/{}/consensusState/{}", id, height)
+            }
+            Path::ClientConnections(id) => write!(f, "clients/{}/connections", id),
+            Path::Connections(id) => write!(f, "connections/{}", id),
+            Path::Ports(id) => write!(f, "ports/{}", id),
+            Path::ChannelEnds(port_id, channel_id) => {
+                write!(f, "channelEnds/ports/{}/channels/{}", port_id, channel_id)
+            }
+            Path::SeqSends(port_id, channel_id) => write!(
+                f,
+                "seqSends/ports/{}/channels/{}/nextSequenceSend",
+                port_id, channel_id
+            ),
+            Path::SeqRecvs(port_id, channel_id) => write!(
+                f,
+                "seqRecvs/ports/{}/channels/{}/nextSequenceRecv",
+                port_id, channel_id
+            ),
+            Path::SeqAcks(port_id, channel_id) => write!(
+                f,
+                "seqAcks/ports/{}/channels/{}/nextSequenceAck",
+                port_id, channel_id
+            ),
+            Path::Commitments(port_id, channel_id, seq) => write!(
+                f,
+                "commitments/ports/{}/channels/{}/packets/{}",
+                port_id, channel_id, seq
+            ),
+            Path::Acks(port_id, channel_id, seq) => write!(
+                f,
+                "acks/ports/{}/channels/{}/acknowledgements/{}",
+                port_id, channel_id, seq
+            ),
+        }
+    }
+}

modules/src/lib.rs

@@ -19,7 +19,6 @@
 //! - ICS 23: Vector Commitment Scheme
 //! - ICS 24: Host Requirements
 
-pub mod error;
 pub mod events;
 pub mod ics02_client;
 pub mod ics03_connection;
@@ -29,7 +28,6 @@ pub mod ics20_fungible_token_transfer;
 pub mod ics23_commitment;
 pub mod ics24_host;
 pub mod keys;
-pub mod path;
 pub mod proofs;
 pub mod try_from_raw;
 pub mod tx_msg;