From 6013e6f44da699c84e7ccb1f1dd3ef9ff96bdde1 Mon Sep 17 00:00:00 2001 From: patrick Date: Tue, 13 Dec 2022 21:49:54 +0000 Subject: [PATCH] address PR comments --- crates/sui-json-rpc/src/api.rs | 6 +++--- crates/sui-open-rpc/spec/openrpc.json | 6 +++--- crates/sui-sdk/src/apis.rs | 21 +++++++++++++++++---- crates/sui-sdk/src/lib.rs | 6 +----- crates/sui-types/src/base_types.rs | 2 -- 5 files changed, 24 insertions(+), 17 deletions(-) diff --git a/crates/sui-json-rpc/src/api.rs b/crates/sui-json-rpc/src/api.rs index ae55fecbce9bd..b5abf3496aee9 100644 --- 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, - /// Maximum item returned per page + /// Maximum item returned per page, default to [QUERY_MAX_RESULT_LIMIT] if not specified. limit: Option, ) -> RpcResult; @@ -215,7 +215,7 @@ pub trait RpcFullNodeReadApi { query: TransactionQuery, /// Optional paging cursor cursor: Option, - /// Maximum item returned per page + /// Maximum item returned per page, default to [QUERY_MAX_RESULT_LIMIT] if not specified. limit: Option, /// query result ordering, default to false (ascending order), oldest record first. descending_order: Option, @@ -494,7 +494,7 @@ pub trait EventReadApi { query: EventQuery, /// optional paging cursor cursor: Option, - /// maximum number of items per page + /// maximum number of items per page, default to [QUERY_MAX_RESULT_LIMIT] if not specified. limit: Option, /// query result ordering, default to false (ascending order), oldest record first. descending_order: Option, diff --git a/crates/sui-open-rpc/spec/openrpc.json b/crates/sui-open-rpc/spec/openrpc.json index 2a64536af28cf..96238075aea8d 100644 --- 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 index 5fe7be7603be3..f1a8584f96221 100644 --- 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, + limit: Option, + ) -> SuiRpcResult { + 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 index bd3aa06aced3d..65d73c938cc3d 100644 --- 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 index 682c16055159a..cc723412d15bd 100644 --- 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};