Set pagination limit to u64::MAX for all queries that support it to e…

…nsure we get all results at once See #811
informalsystems · Apr 9, 2021 · d7293dd · d7293dd
1 parent 7361934
commit d7293dd
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 11 deletions.
diff --git a/proto/src/lib.rs b/proto/src/lib.rs
@@ -38,6 +38,17 @@ pub mod cosmos {
             pub mod v1beta1 {
                 include!("prost/cosmos.base.query.v1beta1.rs");
             }
+
+            pub mod pagination {
+                use super::v1beta1::PageRequest;
+
+                pub fn all() -> Option<PageRequest> {
+                    Some(PageRequest {
+                        limit: u64::MAX,
+                        ..Default::default()
+                    })
+                }
+            }
         }
         pub mod reflection {
             pub mod v1beta1 {

diff --git a/relayer-cli/src/commands/query/client.rs b/relayer-cli/src/commands/query/client.rs
@@ -128,7 +128,7 @@ impl Runnable for QueryClientConsensusCmd {
             None => {
                 let res = chain.query_consensus_states(QueryConsensusStatesRequest {
                     client_id: self.client_id.to_string(),
-                    pagination: None,
+                    pagination: ibc_proto::cosmos::base::query::pagination::all(),
                 });
 
                 match res {

diff --git a/relayer-cli/src/commands/query/clients.rs b/relayer-cli/src/commands/query/clients.rs
@@ -40,7 +40,9 @@ impl Runnable for QueryAllClientsCmd {
         let rt = Arc::new(TokioRuntime::new().unwrap());
         let chain = CosmosSdkChain::bootstrap(chain_config.clone(), rt).unwrap();
 
-        let req = QueryClientStatesRequest { pagination: None };
+        let req = QueryClientStatesRequest {
+            pagination: ibc_proto::cosmos::base::query::pagination::all(),
+        };
 
         let res: Result<_, Error> = chain
             .query_clients(req)

diff --git a/relayer-cli/src/commands/query/connection.rs b/relayer-cli/src/commands/query/connection.rs
@@ -93,7 +93,7 @@ impl Runnable for QueryConnectionChannelsCmd {
 
         let req = QueryConnectionChannelsRequest {
             connection: self.connection_id.to_string(),
-            pagination: None,
+            pagination: ibc_proto::cosmos::base::query::pagination::all(),
         };
 
         let res: Result<_, Error> = chain

diff --git a/relayer-cli/src/commands/query/connections.rs b/relayer-cli/src/commands/query/connections.rs
@@ -36,7 +36,9 @@ impl Runnable for QueryConnectionsCmd {
         let rt = Arc::new(TokioRuntime::new().unwrap());
         let chain = CosmosSdkChain::bootstrap(chain_config.clone(), rt).unwrap();
 
-        let req = QueryConnectionsRequest { pagination: None };
+        let req = QueryConnectionsRequest {
+            pagination: ibc_proto::cosmos::base::query::pagination::all(),
+        };
 
         let res = chain.query_connections(req);
 

diff --git a/relayer-cli/src/commands/query/packet.rs b/relayer-cli/src/commands/query/packet.rs
@@ -68,7 +68,7 @@ impl Runnable for QueryPacketCommitmentsCmd {
         let grpc_request = QueryPacketCommitmentsRequest {
             port_id: opts.port_id.to_string(),
             channel_id: opts.channel_id.to_string(),
-            pagination: None,
+            pagination: ibc_proto::cosmos::base::query::pagination::all(),
         };
 
         let res: Result<(Vec<PacketState>, Height), Error> = chain
@@ -266,7 +266,7 @@ impl Runnable for QueryUnreceivedPacketsCmd {
         let commitments_request = QueryPacketCommitmentsRequest {
             port_id: opts.port_id.to_string(),
             channel_id: opts.channel_id.to_string(),
-            pagination: None,
+            pagination: ibc_proto::cosmos::base::query::pagination::all(),
         };
 
         let seq_res = src_chain
@@ -363,7 +363,7 @@ impl Runnable for QueryPacketAcknowledgementsCmd {
         let grpc_request = QueryPacketAcknowledgementsRequest {
             port_id: opts.port_id.to_string(),
             channel_id: opts.channel_id.to_string(),
-            pagination: None,
+            pagination: ibc_proto::cosmos::base::query::pagination::all(),
         };
 
         let res: Result<(Vec<PacketState>, Height), Error> = chain
@@ -561,7 +561,7 @@ impl Runnable for QueryUnreceivedAcknowledgementCmd {
         let acks_request = QueryPacketAcknowledgementsRequest {
             port_id: opts.port_id.to_string(),
             channel_id: opts.channel_id.to_string(),
-            pagination: None,
+            pagination: ibc_proto::cosmos::base::query::pagination::all(),
         };
 
         let seq_res = src_chain

diff --git a/relayer/src/foreign_client.rs b/relayer/src/foreign_client.rs
@@ -523,7 +523,7 @@ impl ForeignClient {
             .dst_chain
             .query_consensus_states(QueryConsensusStatesRequest {
                 client_id: self.id.to_string(),
-                pagination: None,
+                pagination: ibc_proto::cosmos::base::query::pagination::all(),
             })
             .map_err(|e| {
                 ForeignClientError::ClientQuery(

diff --git a/relayer/src/link.rs b/relayer/src/link.rs
@@ -545,7 +545,7 @@ impl RelayPath {
         let pc_request = QueryPacketCommitmentsRequest {
             port_id: self.src_port_id().to_string(),
             channel_id: self.src_channel_id().to_string(),
-            pagination: None,
+            pagination: ibc_proto::cosmos::base::query::pagination::all(),
         };
         let (packet_commitments, query_height) =
             self.src_chain.query_packet_commitments(pc_request)?;
@@ -615,7 +615,7 @@ impl RelayPath {
         let pc_request = QueryPacketAcknowledgementsRequest {
             port_id: self.src_port_id().to_string(),
             channel_id: self.src_channel_id().to_string(),
-            pagination: None,
+            pagination: ibc_proto::cosmos::base::query::pagination::all(),
         };
         let (acks_on_source, query_height) = self
             .src_chain