Merge pull request #46 from the-Minister-0001/master

Adjust return types for asset and tx endpoints

src/api/endpoints/assets.rs

@@ -2,11 +2,12 @@ use crate::*;
 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 {
-    pub async fn assets_by_id(&self, asset: &str) -> BlockfrostResult<AssetsInner> {
+    pub async fn assets_by_id(&self, asset: &str) -> BlockfrostResult<Asset> {
         self.call_endpoint(format!("/assets/{}", asset).as_str())
             .await
     }
@@ -51,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;
 

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<AddressTransactionsContentInner> {
+    ) -> BlockfrostResult<TxContent> {
         self.call_endpoint(format!("/txs/{}", hash).as_str()).await
     }
 
-    pub async fn transactions_utxos(&self, hash: &str) -> BlockfrostResult<TxContent> {
+    pub async fn transactions_utxos(&self, hash: &str) -> BlockfrostResult<TxContentUtxo> {
         self.call_endpoint(format!("/txs/{}/utxos", hash).as_str())
             .await
     }

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::*;