Skip to content

Do not return duplicate token ids from the api server #2101

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.

Sign up for GitHub

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

Open
oliv3rdrt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Do not return duplicate token ids from the api server #2101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions api-server/api-server-common/src/storage/impls/postgres/queries.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2527,15 +2527,15 @@ impl<'a, 'b> QueryFromConnection<'a, 'b> {
.query(
r#"
WITH count_tokens AS (
SELECT count(token_id) FROM ml.fungible_token
SELECT count(DISTINCT token_id) FROM ml.fungible_token
)
(SELECT token_id
(SELECT DISTINCT token_id
FROM ml.fungible_token
ORDER BY token_id
OFFSET $1
LIMIT $2)
UNION ALL
(SELECT nft_id
(SELECT DISTINCT nft_id
FROM ml.nft_issuance
ORDER BY nft_id
OFFSET GREATEST($1 - (SELECT * FROM count_tokens), 0)
Expand Down Expand Up @@ -2572,16 +2572,16 @@ impl<'a, 'b> QueryFromConnection<'a, 'b> {
.query(
r#"
WITH count_tokens AS (
SELECT count(token_id) FROM ml.fungible_token WHERE ticker ILIKE $3
SELECT count(DISTINCT token_id) FROM ml.fungible_token WHERE ticker ILIKE $3
)
(SELECT token_id
(SELECT DISTINCT token_id
FROM ml.fungible_token
WHERE ticker ILIKE $3
ORDER BY token_id
OFFSET $1
LIMIT $2)
UNION ALL
(SELECT nft_id
(SELECT DISTINCT nft_id
FROM ml.nft_issuance
WHERE ticker ILIKE $3
ORDER BY nft_id
Expand Down
32 changes: 31 additions & 1 deletion api-server/storage-test-suite/src/basic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
// limitations under the License.

use serialization::extras::non_empty_vec::DataOrNoVec;
use std::{collections::BTreeMap, sync::Arc};
use std::{
collections::{BTreeMap, BTreeSet},
sync::Arc,
};

use crate::helpers::make_trial;
use crate::make_test;
Expand Down Expand Up @@ -1858,6 +1861,33 @@ where
let ids = db_tx.get_token_ids_by_ticker(6, 0, &format!("A{c}")).await.unwrap();
assert!(ids.is_empty());
}

// Fungible token data is stored per block height, so a token that gets updated has
// a row for every height it changed at. It must still be listed only once.
db_tx
.set_fungible_token_issuance(
random_token_id1,
block_height.next_height(),
token_data.clone(),
)
.await
.unwrap();

let ids = db_tx.get_token_ids(6, 0).await.unwrap();
let unique_ids: BTreeSet<_> = ids.iter().collect();
assert_eq!(
ids.len(),
unique_ids.len(),
"get_token_ids returned duplicates"
);

let ids = db_tx.get_token_ids_by_ticker(6, 0, &token_ticker).await.unwrap();
let unique_ids: BTreeSet<_> = ids.iter().collect();
assert_eq!(
ids.len(),
unique_ids.len(),
"get_token_ids_by_ticker returned duplicates"
);
}

// test coin and token statistics
Expand Down