[api] Reduce default page size to 100

Stumble · Oct 4, 2022 · 71bbe54 · 71bbe54
1 parent c2e3c35
commit 71bbe54
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/...aptos_api__tests__transactions_test__test_get_transactions_param_limit_exceeds_limit.json b/...aptos_api__tests__transactions_test__test_get_transactions_param_limit_exceeds_limit.json
@@ -1,5 +1,5 @@
 {
-  "message": "Given limit value (2000) is too large, it must be < 1000",
+  "message": "Given limit value (2000) is too large, it must be <= 100",
   "error_code": "invalid_input",
   "vm_error_code": null
 }
diff --git a/api/src/page.rs b/api/src/page.rs
@@ -73,7 +73,7 @@ impl Page {
         if limit > self.max_page_size {
             return Err(E::bad_request_with_code(
                 &format!(
-                    "Given limit value ({}) is too large, it must be < {}",
+                    "Given limit value ({}) is too large, it must be <= {}",
                     limit, self.max_page_size
                 ),
                 AptosErrorCode::InvalidInput,

diff --git a/config/src/config/api_config.rs b/config/src/config/api_config.rs
@@ -42,7 +42,7 @@ pub const DEFAULT_ADDRESS: &str = "127.0.0.1";
 pub const DEFAULT_PORT: u16 = 8080;
 pub const DEFAULT_REQUEST_CONTENT_LENGTH_LIMIT: u64 = 8 * 1024 * 1024; // 8 MB
 pub const DEFAULT_MAX_SUBMIT_TRANSACTION_BATCH_SIZE: usize = 10;
-pub const DEFAULT_MAX_PAGE_SIZE: u16 = 1000;
+pub const DEFAULT_MAX_PAGE_SIZE: u16 = 100;
 
 fn default_enabled() -> bool {
     true

diff --git a/crates/aptos/src/node/analyze/analyze_validators.rs b/crates/aptos/src/node/analyze/analyze_validators.rs
@@ -195,7 +195,7 @@ pub struct AnalyzeValidators {}
 impl AnalyzeValidators {
     /// Fetch all events from a single epoch from DB.
     pub fn fetch_epoch(epoch: u64, aptos_db: &dyn DbReader) -> Result<Vec<VersionedNewBlockEvent>> {
-        let batch = 1000;
+        let batch = 100;
 
         let mut cursor = u64::max_value();
         let mut result: Vec<VersionedNewBlockEvent> = vec![];

diff --git a/crates/aptos/src/node/analyze/fetch_metadata.rs b/crates/aptos/src/node/analyze/fetch_metadata.rs
@@ -197,7 +197,7 @@ impl FetchMetadata {
             }
         }
 
-        let batch: u16 = 1000;
+        let batch: u16 = 100;
         let mut batch_index = 0;
 
         println!(

diff --git a/testsuite/forge/src/test_utils/consensus_utils.rs b/testsuite/forge/src/test_utils/consensus_utils.rs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use anyhow::{bail, Context, Result};
+use aptos_config::config::DEFAULT_MAX_PAGE_SIZE;
 use aptos_rest_client::Client as RestClient;
 use async_trait::async_trait;
 use chrono::Utc;
@@ -165,10 +166,13 @@ pub async fn test_consensus_fault_tolerance(
     let transactions: Vec<_> =
         join_all(validator_clients.iter().cloned().map(move |v| async move {
             let mut txns =
-                v.1.get_transactions_bcs(Some(target_v.saturating_sub(1000)), Some(1000))
-                    .await
-                    .unwrap()
-                    .into_inner();
+                v.1.get_transactions_bcs(
+                    Some(target_v.saturating_sub(DEFAULT_MAX_PAGE_SIZE as u64)),
+                    Some(DEFAULT_MAX_PAGE_SIZE),
+                )
+                .await
+                .unwrap()
+                .into_inner();
             txns.retain(|t| t.version <= target_v);
             <Result<Vec<_>>>::Ok(txns)
         }))