From f206ad56434d554d029b360552d0d177f325c4f2 Mon Sep 17 00:00:00 2001 From: "[the Minister]" Date: Fri, 29 Dec 2023 12:35:42 +0100 Subject: [PATCH 1/5] Change assets endpoint "AssetsInner" to "Asset" --- src/api/endpoints/assets.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/api/endpoints/assets.rs b/src/api/endpoints/assets.rs index 3972ce3..0d71954 100644 --- a/src/api/endpoints/assets.rs +++ b/src/api/endpoints/assets.rs @@ -2,16 +2,16 @@ use crate::*; use blockfrost_openapi::models::{ asset_addresses_inner::AssetAddressesInner, asset_history_inner::AssetHistoryInner, asset_policy_inner::AssetPolicyInner, asset_transactions_inner::AssetTransactionsInner, - assets_inner::AssetsInner, + asset::Asset, }; impl BlockfrostAPI { - pub async fn assets_by_id(&self, asset: &str) -> BlockfrostResult { + pub async fn assets_by_id(&self, asset: &str) -> BlockfrostResult { self.call_endpoint(format!("/assets/{}", asset).as_str()) .await } - pub async fn assets(&self, pagination: Pagination) -> BlockfrostResult> { + pub async fn assets(&self, pagination: Pagination) -> BlockfrostResult> { self.call_paged_endpoint("/assets", pagination).await } @@ -72,7 +72,7 @@ mod tests { } ]); - serde_json::from_value::>(json_value).unwrap(); + serde_json::from_value::>(json_value).unwrap(); } #[tokio::test] From 948357c8bce722170273855961af3667b7f60eab Mon Sep 17 00:00:00 2001 From: "[the Minister]" Date: Fri, 29 Dec 2023 12:59:33 +0100 Subject: [PATCH 2/5] Change transaction endpoint return types Transaction by hash should use TxContent as this is the correct model for `GET /txs/{hash}`. Transaction utxos should use TxContentUtxos as this is the correct model for `GET /txs/{hash}/utxos` --- src/api/endpoints/transactions.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/api/endpoints/transactions.rs b/src/api/endpoints/transactions.rs index d47fbda..1396de5 100644 --- a/src/api/endpoints/transactions.rs +++ b/src/api/endpoints/transactions.rs @@ -1,6 +1,7 @@ use crate::{request::send_request, url::Url, *}; use blockfrost_openapi::models::{ - address_transactions_content_inner::AddressTransactionsContentInner, tx_content::TxContent, + tx_content::TxContent, + tx_content_utxo::TxContentUtxo, tx_content_delegations_inner::TxContentDelegationsInner, tx_content_metadata_cbor_inner::TxContentMetadataCborInner, tx_content_metadata_inner::TxContentMetadataInner, tx_content_mirs_inner::TxContentMirsInner, @@ -44,11 +45,11 @@ impl BlockfrostAPI { pub async fn transaction_by_hash( &self, hash: &str, - ) -> BlockfrostResult { + ) -> BlockfrostResult { self.call_endpoint(format!("/txs/{}", hash).as_str()).await } - pub async fn transactions_utxos(&self, hash: &str) -> BlockfrostResult { + pub async fn transactions_utxos(&self, hash: &str) -> BlockfrostResult { self.call_endpoint(format!("/txs/{}/utxos", hash).as_str()) .await } From 9b0542d4d24b8a902d7226346e73813fd4cd5fb9 Mon Sep 17 00:00:00 2001 From: "[the Minister]" Date: Fri, 29 Dec 2023 13:19:58 +0100 Subject: [PATCH 3/5] Exposing Order for pagination --- src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib.rs b/src/lib.rs index 29d33f9..c24aa22 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -16,6 +16,7 @@ pub use api::*; pub use error::*; pub use ipfs::BlockfrostIPFS; pub use pagination::Pagination; +pub use pagination::Order; pub use settings::*; pub use types::*; From bf656f614354f8938c3af3fc4f19881e81ebdd13 Mon Sep 17 00:00:00 2001 From: "[the Minister]" Date: Fri, 29 Dec 2023 13:34:39 +0100 Subject: [PATCH 4/5] Revert Asset to AssetInner for the asset endpoint --- src/api/endpoints/assets.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/api/endpoints/assets.rs b/src/api/endpoints/assets.rs index 0d71954..5d3c29a 100644 --- a/src/api/endpoints/assets.rs +++ b/src/api/endpoints/assets.rs @@ -3,6 +3,7 @@ use blockfrost_openapi::models::{ asset_addresses_inner::AssetAddressesInner, asset_history_inner::AssetHistoryInner, asset_policy_inner::AssetPolicyInner, asset_transactions_inner::AssetTransactionsInner, asset::Asset, + assets_inner::AssetsInner, }; impl BlockfrostAPI { @@ -11,7 +12,7 @@ impl BlockfrostAPI { .await } - pub async fn assets(&self, pagination: Pagination) -> BlockfrostResult> { + pub async fn assets(&self, pagination: Pagination) -> BlockfrostResult> { self.call_paged_endpoint("/assets", pagination).await } From cd1dc12e5e27f7c1fefdd831007b5ceb3e24ecc0 Mon Sep 17 00:00:00 2001 From: "[the Minister]" Date: Fri, 29 Dec 2023 13:38:54 +0100 Subject: [PATCH 5/5] Fix test --- src/api/endpoints/assets.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/api/endpoints/assets.rs b/src/api/endpoints/assets.rs index 5d3c29a..238f3c2 100644 --- a/src/api/endpoints/assets.rs +++ b/src/api/endpoints/assets.rs @@ -52,7 +52,9 @@ impl BlockfrostAPI { mod tests { use super::*; use blockfrost_openapi::models::{ - asset::Asset, asset_transactions_inner::AssetTransactionsInner, + asset::Asset, + asset_transactions_inner::AssetTransactionsInner, + assets_inner::AssetsInner, }; use serde_json::json; @@ -73,7 +75,7 @@ mod tests { } ]); - serde_json::from_value::>(json_value).unwrap(); + serde_json::from_value::>(json_value).unwrap(); } #[tokio::test]