Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove duplicate results for same asset_ids in get_assets rpc method #227

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions das_api/src/api/api_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ use sea_orm::{sea_query::ConditionType, ConnectionTrait, DbBackend, Statement};
use crate::error::DasApiError;
use crate::validation::{validate_opt_pubkey, validate_search_with_name};
use open_rpc_schema::document::OpenrpcDocument;
use std::collections::HashSet;
use {
crate::api::*,
crate::config::Config,
Expand Down Expand Up @@ -148,6 +149,11 @@ pub fn not_found(asset_id: &String) -> DbErr {
DbErr::RecordNotFound(format!("Asset Proof for {} Not Found", asset_id))
}

pub fn remove_duplicates_ids(ids: Vec<String>) -> Vec<String> {
let mut hash_set = HashSet::new();
ids.into_iter().filter(|id| hash_set.insert(id.clone())).collect()
}

#[document_rpc]
#[async_trait]
impl ApiContract for DasApi {
Expand Down Expand Up @@ -218,6 +224,7 @@ impl ApiContract for DasApi {
) -> Result<Vec<Option<Asset>>, DasApiError> {
let GetAssets { ids, options } = payload;

let ids = remove_duplicates_ids(ids);
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also dont need to use generic now cause now we filtering only ids, which is Vec

let batch_size = ids.len();
if batch_size > 1000 {
return Err(DasApiError::BatchSizeExceededError);
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions integration_tests/tests/integration_tests/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ mod common;
mod general_scenario_tests;
mod mpl_core_tests;
mod regular_nft_tests;
mod test_get_assets_with_multiple_same_ids;
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
---
source: integration_tests/tests/integration_tests/test_get_assets_with_multiple_same_ids.rs
expression: response
snapshot_kind: text
---
[
{
"interface": "ProgrammableNFT",
"id": "F9Lw3ki3hJ7PF9HQXsBzoY8GyE6sPoEZZdXJBsTTD2rk",
"content": {
"$schema": "https://schema.metaplex.com/nft1.0.json",
"json_uri": "https://madlads.s3.us-west-2.amazonaws.com/json/8420.json",
"files": [],
"metadata": {
"name": "Mad Lads #8420",
"symbol": "MAD",
"token_standard": "ProgrammableNonFungible"
},
"links": {}
},
"authorities": [
{
"address": "2RtGg6fsFiiF1EQzHqbd66AhW7R5bWeQGpTbv2UMkCdW",
"scopes": [
"full"
]
}
],
"compression": {
"eligible": false,
"compressed": false,
"data_hash": "",
"creator_hash": "",
"asset_hash": "",
"tree": "",
"seq": 0,
"leaf_id": 0
},
"grouping": [
{
"group_key": "collection",
"group_value": "J1S9H3QjnRtBbbuD4HjPV6RpRhwuk4zKbxsnCHuTgh9w"
}
],
"royalty": {
"royalty_model": "creators",
"target": null,
"percent": 0.042,
"basis_points": 420,
"primary_sale_happened": true,
"locked": false
},
"creators": [
{
"address": "5XvhfmRjwXkGp3jHGmaKpqeerNYjkuZZBYLVQYdeVcRv",
"share": 0,
"verified": true
},
{
"address": "2RtGg6fsFiiF1EQzHqbd66AhW7R5bWeQGpTbv2UMkCdW",
"share": 100,
"verified": true
}
],
"ownership": {
"frozen": false,
"delegated": false,
"delegate": null,
"ownership_model": "single",
"owner": ""
},
"supply": null,
"mutable": true,
"burnt": false
},
{
"interface": "V1_NFT",
"id": "JEKKtnGvjiZ8GtATnMVgadHU41AuTbFkMW8oD2tdyV9X",
"content": {
"$schema": "https://schema.metaplex.com/nft1.0.json",
"json_uri": "https://nftstorage.link/ipfs/bafkreidgvjw2atmkw2jzkkfi56arfrzaicrebzw5xwfkz3b67fq5gbvlre",
"files": [],
"metadata": {
"name": "TURTLES",
"symbol": "TURTLES",
"token_standard": "NonFungible"
},
"links": {}
},
"authorities": [
{
"address": "J4tNLYMTegHE9nVjpRM17tf1EYwJnA9Crfn3KytRNcGv",
"scopes": [
"full"
]
}
],
"compression": {
"eligible": false,
"compressed": false,
"data_hash": "",
"creator_hash": "",
"asset_hash": "",
"tree": "",
"seq": 0,
"leaf_id": 0
},
"grouping": [],
"royalty": {
"royalty_model": "creators",
"target": null,
"percent": 0.0,
"basis_points": 0,
"primary_sale_happened": true,
"locked": false
},
"creators": [
{
"address": "J4tNLYMTegHE9nVjpRM17tf1EYwJnA9Crfn3KytRNcGv",
"share": 100,
"verified": true
}
],
"ownership": {
"frozen": false,
"delegated": false,
"delegate": null,
"ownership_model": "single",
"owner": ""
},
"supply": {
"print_max_supply": 0,
"print_current_supply": 0,
"edition_nonce": 253
},
"mutable": false,
"burnt": false
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
use function_name::named;

use das_api::api::{self, ApiContract};

use itertools::Itertools;

use serial_test::serial;

use super::common::*;

#[tokio::test]
#[serial]
#[named]
async fn test_get_assets_with_multiple_same_ids() {
let name = trim_test_name(function_name!());
let setup = TestSetup::new(name.clone()).await;

let seeds: Vec<SeedEvent> = seed_accounts([
"F9Lw3ki3hJ7PF9HQXsBzoY8GyE6sPoEZZdXJBsTTD2rk",
"DZAZ3mGuq7nCYGzUyw4MiA74ysr15EfqLpzCzX2cRVng",
"JEKKtnGvjiZ8GtATnMVgadHU41AuTbFkMW8oD2tdyV9X",
"2ecGsTKbj7FecLwxTHaodZRFwza7m7LamqDG4YjczZMj"
]);

apply_migrations_and_delete_data(setup.db.clone()).await;
index_seed_events(&setup, seeds.iter().collect_vec()).await;

let request = r#"
{
"ids": [
"F9Lw3ki3hJ7PF9HQXsBzoY8GyE6sPoEZZdXJBsTTD2rk",
"F9Lw3ki3hJ7PF9HQXsBzoY8GyE6sPoEZZdXJBsTTD2rk",
"JEKKtnGvjiZ8GtATnMVgadHU41AuTbFkMW8oD2tdyV9X",
"JEKKtnGvjiZ8GtATnMVgadHU41AuTbFkMW8oD2tdyV9X"
]
}
"#;

let request: api::GetAssets = serde_json::from_str(request).unwrap();
let response = setup.das_api.get_assets(request).await.unwrap();
insta::assert_json_snapshot!(name, response);
}