cargo fmt and clippy

informalsystems · Aug 28, 2023 · 6a1a3b1 · 6a1a3b1
1 parent e86e5d8
commit 6a1a3b1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/src/app/runner.rs b/src/app/runner.rs
@@ -44,7 +44,7 @@ pub async fn default_app_runner(server_cfg: ServerConfig) {
     // instantiate gRPC services for each module
     let auth_service = auth.service();
     let bank_service = bank.service();
-    let ibc_client_service = ibc.client_service();
+    let ibc_client_service = ibc.client_service(&upgrade);
     let ibc_conn_service = ibc.connection_service();
     let ibc_channel_service = ibc.channel_service();
     let governance_service = governance.service();

diff --git a/src/modules/ibc/impls.rs b/src/modules/ibc/impls.rs
@@ -2,18 +2,13 @@ use super::router::IbcRouter;
 use crate::{
     error::Error as AppError,
     helper::{Height, Path, QueryResult},
-    modules::{bank::impls::BankBalanceKeeper, IbcTransferModule, Identifiable, Module},
+    modules::{bank::impls::BankBalanceKeeper, IbcTransferModule, Identifiable, Module, Upgrade},
     store::{
         SharedStore, {BinStore, JsonStore, ProtobufStore, TypedSet, TypedStore},
         {ProvableStore, Store},
     },
 };
 use cosmrs::AccountId;
-use ibc::services::{
-    channel::ChannelQueryServer as ChannelQueryService,
-    client::ClientQueryServer as ClientQueryService,
-    connection::ConnectionQueryServer as ConnectionQueryService,
-};
 use ibc::{
     applications::transfer::msgs::transfer::MsgTransfer,
     clients::ics07_tendermint::{
@@ -55,6 +50,14 @@ use ibc::{
     core::{events::IbcEvent, timestamp::Timestamp},
     Signer,
 };
+use ibc::{
+    core::ics02_client::client_type::ClientType,
+    services::{
+        channel::ChannelQueryServer as ChannelQueryService,
+        client::ClientQueryServer as ClientQueryService,
+        connection::ConnectionQueryServer as ConnectionQueryService,
+    },
+};
 use ibc_proto::{
     google::protobuf::Any,
     ibc::core::{
@@ -124,8 +127,14 @@ where
         }
     }
 
-    pub fn client_service(&self) -> ClientQueryServer<ClientQueryService<IbcContext<S>>> {
-        ClientQueryServer::new(ClientQueryService::new(self.ctx.clone()))
+    pub fn client_service(
+        &self,
+        update_context: &Upgrade<S>,
+    ) -> ClientQueryServer<ClientQueryService<IbcContext<S>, Upgrade<S>>> {
+        ClientQueryServer::new(ClientQueryService::new(
+            self.ctx.clone(),
+            update_context.clone(),
+        ))
     }
 
     pub fn connection_service(
@@ -712,6 +721,10 @@ where
         Ok(client_state.status(self, client_id)?)
     }
 
+    fn allowed_clients(&self) -> Vec<ClientType> {
+        vec![ClientType::new("07-tendermint").expect("no error")]
+    }
+
     fn connection_ends(
         &self,
     ) -> Result<Vec<ibc::core::ics03_connection::connection::IdentifiedConnectionEnd>, ContextError>