Merge pull request #404 from andrii-kl/test/MTG-1225_showzerobalance-false

test: MTG-1225_MTG-1276 test searchAssets by owner with  ShowZeroBalance: false

Author: andrii-kl

integration_tests/src/account_update_tests.rs

@@ -1,4 +1,4 @@
-use std::sync::Arc;
+use std::{collections::HashMap, sync::Arc};
 
 use borsh::BorshSerialize;
 use entities::api_req_params::{GetAsset, Options};
@@ -116,7 +116,11 @@ async fn test_account_updates() {
     let name = trim_test_name(function_name!());
     let setup = TestSetup::new_with_options(
         name.clone(),
-        TestSetupOptions { network: None, clear_db: true },
+        TestSetupOptions {
+            network: None,
+            clear_db: true,
+            well_known_fungible_accounts: HashMap::new(),
+        },
     )
     .await;
     let mint = Pubkey::try_from("843gdpsTE4DoJz3ZoBsEjAqT8UgAcyF5YojygGgGZE1f").unwrap();

integration_tests/src/cnft_tests.rs

@@ -1,4 +1,4 @@
-use std::{str::FromStr, sync::Arc};
+use std::{collections::HashMap, str::FromStr, sync::Arc};
 
 use entities::api_req_params::{GetAsset, Options, SearchAssets};
 use function_name::named;
@@ -44,7 +44,11 @@ async fn test_asset_decompress() {
     let name = trim_test_name(function_name!());
     let setup = TestSetup::new_with_options(
         name.clone(),
-        TestSetupOptions { network: None, clear_db: true },
+        TestSetupOptions {
+            network: None,
+            clear_db: true,
+            well_known_fungible_accounts: HashMap::new(),
+        },
     )
     .await;
     let asset_id = "Az9QTysJj1LW1F7zkYF21HgBj3FRpq3zpxTFdPnAJYm8";
@@ -79,7 +83,11 @@ async fn test_cnft_scenario_mint_update_metadata() {
     let name = trim_test_name(function_name!());
     let setup = TestSetup::new_with_options(
         name.clone(),
-        TestSetupOptions { network: Some(Network::Devnet), clear_db: true },
+        TestSetupOptions {
+            network: Some(Network::Devnet),
+            clear_db: true,
+            well_known_fungible_accounts: HashMap::new(),
+        },
     )
     .await;
 
@@ -109,7 +117,11 @@ async fn test_cnft_scenario_mint_update_metadata_remove_creators() {
     let name = trim_test_name(function_name!());
     let setup = TestSetup::new_with_options(
         name.clone(),
-        TestSetupOptions { network: Some(Network::Devnet), clear_db: true },
+        TestSetupOptions {
+            network: Some(Network::Devnet),
+            clear_db: true,
+            well_known_fungible_accounts: HashMap::new(),
+        },
     )
     .await;
 
@@ -141,7 +153,11 @@ async fn test_cnft_owners_table() {
     let name = trim_test_name(function_name!());
     let setup = TestSetup::new_with_options(
         name.clone(),
-        TestSetupOptions { network: None, clear_db: true },
+        TestSetupOptions {
+            network: None,
+            clear_db: true,
+            well_known_fungible_accounts: HashMap::new(),
+        },
     )
     .await;
 
@@ -189,7 +205,11 @@ async fn test_mint_no_json_uri() {
     let name = trim_test_name(function_name!());
     let setup = TestSetup::new_with_options(
         name.clone(),
-        TestSetupOptions { network: None, clear_db: true },
+        TestSetupOptions {
+            network: None,
+            clear_db: true,
+            well_known_fungible_accounts: HashMap::new(),
+        },
     )
     .await;
     let seeds = vec![seed_txn(
@@ -212,7 +232,11 @@ async fn test_mint_delegate_transfer() {
     let name = trim_test_name(function_name!());
     let setup = TestSetup::new_with_options(
         name.clone(),
-        TestSetupOptions { network: Some(Network::Devnet), clear_db: true },
+        TestSetupOptions {
+            network: Some(Network::Devnet),
+            clear_db: true,
+            well_known_fungible_accounts: HashMap::new(),
+        },
     )
     .await;
 
@@ -241,7 +265,11 @@ async fn test_mint_redeem_cancel_redeem() {
     let name = trim_test_name(function_name!());
     let setup = TestSetup::new_with_options(
         name.clone(),
-        TestSetupOptions { network: Some(Network::Devnet), clear_db: true },
+        TestSetupOptions {
+            network: Some(Network::Devnet),
+            clear_db: true,
+            well_known_fungible_accounts: HashMap::new(),
+        },
     )
     .await;
 
@@ -270,7 +298,11 @@ async fn test_mint_redeem() {
     let name = trim_test_name(function_name!());
     let setup = TestSetup::new_with_options(
         name.clone(),
-        TestSetupOptions { network: None, clear_db: true },
+        TestSetupOptions {
+            network: None,
+            clear_db: true,
+            well_known_fungible_accounts: HashMap::new(),
+        },
     )
     .await;
 
@@ -304,7 +336,11 @@ async fn test_mint_transfer_burn() {
     let name = trim_test_name(function_name!());
     let setup = TestSetup::new_with_options(
         name.clone(),
-        TestSetupOptions { network: Some(Network::Devnet), clear_db: true },
+        TestSetupOptions {
+            network: Some(Network::Devnet),
+            clear_db: true,
+            well_known_fungible_accounts: HashMap::new(),
+        },
     )
     .await;
 
@@ -333,7 +369,11 @@ async fn test_mint_transfer_noop() {
     let name = trim_test_name(function_name!());
     let setup = TestSetup::new_with_options(
         name.clone(),
-        TestSetupOptions { network: None, clear_db: true },
+        TestSetupOptions {
+            network: None,
+            clear_db: true,
+            well_known_fungible_accounts: HashMap::new(),
+        },
     )
     .await;
 
@@ -362,7 +402,11 @@ async fn test_mint_transfer_transfer() {
     let name = trim_test_name(function_name!());
     let setup = TestSetup::new_with_options(
         name.clone(),
-        TestSetupOptions { network: Some(Network::Devnet), clear_db: true },
+        TestSetupOptions {
+            network: Some(Network::Devnet),
+            clear_db: true,
+            well_known_fungible_accounts: HashMap::new(),
+        },
     )
     .await;
 
@@ -391,7 +435,11 @@ async fn test_mint_verify_creator() {
     let name = trim_test_name(function_name!());
     let setup = TestSetup::new_with_options(
         name.clone(),
-        TestSetupOptions { network: Some(Network::Devnet), clear_db: true },
+        TestSetupOptions {
+            network: Some(Network::Devnet),
+            clear_db: true,
+            well_known_fungible_accounts: HashMap::new(),
+        },
     )
     .await;
 
@@ -419,7 +467,11 @@ async fn test_mint_verify_collection() {
     let name = trim_test_name(function_name!());
     let setup = TestSetup::new_with_options(
         name.clone(),
-        TestSetupOptions { network: Some(Network::Devnet), clear_db: true },
+        TestSetupOptions {
+            network: Some(Network::Devnet),
+            clear_db: true,
+            well_known_fungible_accounts: HashMap::new(),
+        },
     )
     .await;
 
@@ -447,7 +499,11 @@ async fn test_mint_transfer_mpl_programs() {
     let name = trim_test_name(function_name!());
     let setup = TestSetup::new_with_options(
         name.clone(),
-        TestSetupOptions { network: Some(Network::Devnet), clear_db: true },
+        TestSetupOptions {
+            network: Some(Network::Devnet),
+            clear_db: true,
+            well_known_fungible_accounts: HashMap::new(),
+        },
     )
     .await;
 
@@ -476,7 +532,11 @@ async fn test_mint_to_collection_unverify_collection() {
     let name = trim_test_name(function_name!());
     let setup = TestSetup::new_with_options(
         name.clone(),
-        TestSetupOptions { network: Some(Network::Devnet), clear_db: true },
+        TestSetupOptions {
+            network: Some(Network::Devnet),
+            clear_db: true,
+            well_known_fungible_accounts: HashMap::new(),
+        },
     )
     .await;
 
@@ -509,7 +569,11 @@ async fn test_mint_verify_collection_unverify_collection() {
     let name = trim_test_name(function_name!());
     let setup = TestSetup::new_with_options(
         name.clone(),
-        TestSetupOptions { network: Some(Network::Devnet), clear_db: true },
+        TestSetupOptions {
+            network: Some(Network::Devnet),
+            clear_db: true,
+            well_known_fungible_accounts: HashMap::new(),
+        },
     )
     .await;
 

integration_tests/src/common.rs

@@ -70,6 +70,14 @@ const SYNCHRONIZER_DUMP_PATH: &str = "./rocks_dump";
 const POSTGRE_MIGRATIONS_PATH: &str = "../migrations";
 const POSTGRE_BASE_DUMP_PATH: &str = "/aura/integration_tests/";
 
+pub fn well_known_fungible_tokens() -> HashMap<String, String> {
+    let mut map = HashMap::new();
+    map.insert("HxhWkVpk5NS4Ltg5nij2G671CKXFRKPK8vy271Ub4uEK".to_string(), "Hxro".to_string());
+    map.insert("EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v".to_string(), "USDC".to_string());
+    map.insert("METAewgxyPbgwsseH8T16a39CQ5VyVxZi9zXiDPY18m".to_string(), "MPLX".to_string());
+    map
+}
+
 pub struct TestSetup {
     pub name: String,
     pub client: Arc<RpcClient>,
@@ -140,6 +148,7 @@ impl TestSetup {
             client.clone(),
             mutexed_tasks.clone(),
             None,
+            opts.well_known_fungible_accounts,
         )
         .await
         .unwrap();
@@ -214,10 +223,11 @@ impl TestSetup {
     }
 }
 
-#[derive(Clone, Copy, Default)]
+#[derive(Clone, Default)]
 pub struct TestSetupOptions {
     pub network: Option<Network>,
     pub clear_db: bool,
+    pub well_known_fungible_accounts: HashMap<String, String>,
 }
 
 pub async fn get_transaction(
@@ -673,9 +683,7 @@ async fn index_account_with_ordered_slot(setup: &TestSetup, account: Pubkey) {
 }
 
 async fn index_token_mint(setup: &TestSetup, mint: Pubkey) {
-    let token_account = cached_fetch_largest_token_account_id(&setup.client, mint).await;
     index_account(setup, mint).await;
-    index_account(setup, token_account).await;
 
     // If we used different slots for accounts, then it becomes harder to test updates of related
     // accounts because we need to factor the fact that some updates can be disregarded because

integration_tests/src/data/accounts/process_previously_unparseable_account/FfYZYTVhCEK3YmZm1is59ove86eiXWU2yizpqRLVGSN

@@ -0,0 +1 @@
+�Sn2���7Lٲ�@��[�zH
Xw\�WA�MR

integration_tests/src/data/accounts/recognise_popular_fungible_tokens/5x38Kp4hvdomTCnCrAny4UtMUt5rQBdB6px2K1Ui45Wq

@@ -1,4 +1,4 @@
-use std::sync::Arc;
+use std::{collections::HashMap, sync::Arc};
 
 use entities::{
     api_req_params::{GetAsset, GetAssetsByOwner, SearchAssets},
@@ -11,8 +11,8 @@ use serial_test::serial;
 use tokio::{sync::Mutex, task::JoinSet};
 
 use crate::common::{
-    index_seed_events, seed_accounts, seed_nfts, trim_test_name, Network, SeedEvent, TestSetup,
-    TestSetupOptions,
+    index_seed_events, seed_accounts, seed_nfts, trim_test_name, well_known_fungible_tokens,
+    Network, SeedEvent, TestSetup, TestSetupOptions,
 };
 
 #[tokio::test]
@@ -22,7 +22,11 @@ async fn test_asset_parsing() {
     let name = trim_test_name(function_name!());
     let setup = TestSetup::new_with_options(
         name.clone(),
-        TestSetupOptions { network: None, clear_db: true },
+        TestSetupOptions {
+            network: None,
+            clear_db: true,
+            well_known_fungible_accounts: HashMap::new(),
+        },
     )
     .await;
 
@@ -50,7 +54,11 @@ async fn test_get_different_assets_by_owner() {
     let name = trim_test_name(function_name!());
     let setup = TestSetup::new_with_options(
         name.clone(),
-        TestSetupOptions { network: Some(Network::Devnet), clear_db: true },
+        TestSetupOptions {
+            network: Some(Network::Devnet),
+            clear_db: true,
+            well_known_fungible_accounts: HashMap::new(),
+        },
     )
     .await;
 
@@ -114,7 +122,11 @@ async fn test_process_previously_unparseable_account() {
     let name = trim_test_name(function_name!());
     let setup = TestSetup::new_with_options(
         name.clone(),
-        TestSetupOptions { network: Some(Network::Devnet), clear_db: true },
+        TestSetupOptions {
+            network: Some(Network::Devnet),
+            clear_db: true,
+            well_known_fungible_accounts: HashMap::new(),
+        },
     )
     .await;