Fix Router by implementing on storage instead on seperate module (#38)

* impl router on storage instead of another struct * impl router on storage instead of another struct * rm module holder * rm unneccesary logs * fixed merge conflicts * fixed storing client counter * rm unneccesary commented code * added comments * impl storing seq on inner type * fmt * fmt * use btreemap from alloc * fmt * fix borrow * fmt --------- Co-authored-by: Michal Nazarewicz <[email protected]>
ComposableFi · Oct 19, 2023 · 583708d · 583708d
1 parent f276d85
commit 583708d
Show file tree

Hide file tree

Showing 9 changed files with 261 additions and 393 deletions.
diff --git a/common/sealable-trie/src/trie.rs b/common/sealable-trie/src/trie.rs
@@ -59,6 +59,7 @@ pub const EMPTY_TRIE_ROOT: CryptoHash = CryptoHash::DEFAULT;
 ///    a single value at a key whose length is withing 36 bytes has a single
 ///    node however if that key is longer than 36 bytes the trie needs at least
 ///    two nodes.
+#[derive(Debug)]
 pub struct Trie<A> {
     /// Pointer to the root node. `None` if the trie is empty or the root node
     /// has been sealed.

diff --git a/solana/solana-ibc/programs/solana-ibc/src/client_state.rs b/solana/solana-ibc/programs/solana-ibc/src/client_state.rs
@@ -416,7 +416,11 @@ impl ibc::clients::ics07_tendermint::ValidationContext
         height: &Height,
     ) -> Result<Option<Self::AnyConsensusState>, ContextError> {
         let end_height = (height.revision_number() + 1, 1);
-        match self.consensus_states.get(&(client_id.to_string(), end_height)) {
+        let solana_ibc_store = &self.0.borrow().solana_ibc_store;
+        match solana_ibc_store
+            .consensus_states
+            .get(&(client_id.to_string(), end_height))
+        {
             Some(data) => {
                 let result: Self::AnyConsensusState =
                     serde_json::from_str(data).unwrap();
@@ -434,7 +438,11 @@ impl ibc::clients::ics07_tendermint::ValidationContext
         height: &Height,
     ) -> Result<Option<Self::AnyConsensusState>, ContextError> {
         let end_height = (height.revision_number(), 1);
-        match self.consensus_states.get(&(client_id.to_string(), end_height)) {
+        let solana_ibc_store = &self.0.borrow().solana_ibc_store;
+        match solana_ibc_store
+            .consensus_states
+            .get(&(client_id.to_string(), end_height))
+        {
             Some(data) => {
                 let result: Self::AnyConsensusState =
                     serde_json::from_str(data).unwrap();