address PR comments

MystenLabs · Dec 15, 2022 · 6013e6f · 6013e6f
1 parent bda0c6a
commit 6013e6f
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 17 deletions.
diff --git a/crates/sui-json-rpc/src/api.rs b/crates/sui-json-rpc/src/api.rs
@@ -105,7 +105,7 @@ pub trait RpcReadApi {
         parent_object_id: ObjectID,
         /// Optional paging cursor
         cursor: Option<ObjectID>,
-        /// Maximum item returned per page
+        /// Maximum item returned per page, default to [QUERY_MAX_RESULT_LIMIT] if not specified.
         limit: Option<usize>,
     ) -> RpcResult<DynamicFieldPage>;
 
@@ -215,7 +215,7 @@ pub trait RpcFullNodeReadApi {
         query: TransactionQuery,
         /// Optional paging cursor
         cursor: Option<TransactionDigest>,
-        /// Maximum item returned per page
+        /// Maximum item returned per page, default to [QUERY_MAX_RESULT_LIMIT] if not specified.
         limit: Option<usize>,
         /// query result ordering, default to false (ascending order), oldest record first.  
         descending_order: Option<bool>,
@@ -494,7 +494,7 @@ pub trait EventReadApi {
         query: EventQuery,
         /// optional paging cursor
         cursor: Option<EventID>,
-        /// maximum number of items per page
+        /// maximum number of items per page, default to [QUERY_MAX_RESULT_LIMIT] if not specified.
         limit: Option<usize>,
         /// query result ordering, default to false (ascending order), oldest record first.  
         descending_order: Option<bool>,

diff --git a/crates/sui-open-rpc/spec/openrpc.json b/crates/sui-open-rpc/spec/openrpc.json
@@ -717,7 +717,7 @@
         },
         {
           "name": "limit",
-          "description": "Maximum item returned per page",
+          "description": "Maximum item returned per page, default to [QUERY_MAX_RESULT_LIMIT] if not specified.",
           "schema": {
             "type": "integer",
             "format": "uint",
@@ -759,7 +759,7 @@
         },
         {
           "name": "limit",
-          "description": "maximum number of items per page",
+          "description": "maximum number of items per page, default to [QUERY_MAX_RESULT_LIMIT] if not specified.",
           "schema": {
             "type": "integer",
             "format": "uint",
@@ -1606,7 +1606,7 @@
         },
         {
           "name": "limit",
-          "description": "Maximum item returned per page",
+          "description": "Maximum item returned per page, default to [QUERY_MAX_RESULT_LIMIT] if not specified.",
           "schema": {
             "type": "integer",
             "format": "uint",

diff --git a/crates/sui-sdk/src/apis.rs b/crates/sui-sdk/src/apis.rs
@@ -10,10 +10,10 @@ use std::collections::BTreeMap;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 use sui_json_rpc_types::{
-    Balance, Coin, CoinPage, EventPage, GetObjectDataResponse, GetPastObjectDataResponse,
-    GetRawObjectDataResponse, SuiCoinMetadata, SuiEventEnvelope, SuiEventFilter,
-    SuiExecuteTransactionResponse, SuiMoveNormalizedModule, SuiObjectInfo, SuiTransactionResponse,
-    TransactionsPage,
+    Balance, Coin, CoinPage, DynamicFieldPage, EventPage, GetObjectDataResponse,
+    GetPastObjectDataResponse, GetRawObjectDataResponse, SuiCoinMetadata, SuiEventEnvelope,
+    SuiEventFilter, SuiExecuteTransactionResponse, SuiMoveNormalizedModule, SuiObjectInfo,
+    SuiTransactionResponse, TransactionsPage,
 };
 use sui_types::balance::Supply;
 use sui_types::base_types::{ObjectID, SequenceNumber, SuiAddress, TransactionDigest};
@@ -56,6 +56,19 @@ impl ReadApi {
         Ok(self.api.http.get_objects_owned_by_object(object_id).await?)
     }
 
+    pub async fn get_dynamic_fields(
+        &self,
+        object_id: ObjectID,
+        cursor: Option<ObjectID>,
+        limit: Option<usize>,
+    ) -> SuiRpcResult<DynamicFieldPage> {
+        Ok(self
+            .api
+            .http
+            .get_dynamic_fields(object_id, cursor, limit)
+            .await?)
+    }
+
     pub async fn get_parsed_object(
         &self,
         object_id: ObjectID,

diff --git a/crates/sui-sdk/src/lib.rs b/crates/sui-sdk/src/lib.rs
@@ -19,11 +19,7 @@ pub use sui_json as json;
 
 use crate::apis::{CoinReadApi, EventApi, QuorumDriver, ReadApi};
 pub use sui_json_rpc_types as rpc_types;
-use sui_json_rpc_types::{
-    DynamicFieldPage, EventPage, GetObjectDataResponse, GetRawObjectDataResponse, SuiEventEnvelope,
-    SuiEventFilter, SuiMoveNormalizedModule, SuiObjectInfo, SuiTransactionResponse,
-    TransactionsPage,
-};
+use sui_json_rpc_types::{GetRawObjectDataResponse, SuiObjectInfo};
 use sui_transaction_builder::{DataReader, TransactionBuilder};
 pub use sui_types as types;
 use sui_types::base_types::{ObjectID, SuiAddress, TransactionDigest};

diff --git a/crates/sui-types/src/base_types.rs b/crates/sui-types/src/base_types.rs
@@ -34,8 +34,6 @@ use crate::error::SuiError;
 use crate::gas_coin::GasCoin;
 use crate::object::{Object, Owner};
 use crate::sui_serde::Readable;
-use crate::waypoint::IntoPoint;
-use crate::SUI_FRAMEWORK_ADDRESS;
 use fastcrypto::encoding::{Base58, Base64, Encoding, Hex};
 use fastcrypto::hash::{HashFunction, Sha3_256};