- removed TokenDataWithMerkleContext from the client/indexer module a

- updated `e2e_test_env.rs` accordingly
Lightprotocol · Jan 9, 2025 · f3e4ab9 · f3e4ab9
1 parent 06da6c4
commit f3e4ab9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/program-tests/utils/src/e2e_test_env.rs b/program-tests/utils/src/e2e_test_env.rs
@@ -87,7 +87,6 @@ use light_client::{
 // context trait: send_transaction -> return transaction result, get_account_info -> return account info
 // indexer trait: get_compressed_accounts_by_owner -> return compressed accounts,
 // refactor all tests to work with that so that we can run all tests with a test validator and concurrency
-use light_compressed_token::token_data::AccountState;
 use light_hasher::Poseidon;
 use light_indexed_merkle_tree::{
     array::IndexedArray, reference::IndexedMerkleTree, HIGHEST_ADDRESS_PLUS_ONE,
@@ -121,9 +120,10 @@ use solana_sdk::{
     signer::{SeedDerivable, Signer},
 };
 use spl_token::solana_program::native_token::LAMPORTS_PER_SOL;
-use light_client::indexer::{AddressMerkleTreeAccounts, AddressMerkleTreeBundle, Indexer, StateMerkleTreeAccounts, StateMerkleTreeBundle, TokenDataWithMerkleContext};
+use light_client::indexer::{AddressMerkleTreeAccounts, AddressMerkleTreeBundle, Indexer, StateMerkleTreeAccounts, StateMerkleTreeBundle};
 use light_client::rpc::merkle_tree::MerkleTreeExt;
 use light_program_test::indexer::{TestIndexer, TestIndexerExtensions};
+use light_sdk::token::{AccountState, TokenDataWithMerkleContext};
 use crate::{
     address_tree_rollover::{
         assert_rolled_over_address_merkle_tree_and_queue,

diff --git a/sdk-libs/client/src/indexer/mod.rs b/sdk-libs/client/src/indexer/mod.rs
@@ -113,11 +113,11 @@ pub trait Indexer<R: RpcConnection>: Sync + Send + Debug + 'static {
     fn get_address_merkle_trees(&self) -> &Vec<AddressMerkleTreeBundle>;
 }
 
-#[derive(Debug, Clone)]
-pub struct TokenDataWithMerkleContext {
-    pub token_data: TokenData,
-    pub compressed_account: CompressedAccountWithMerkleContext,
-}
+// #[derive(Debug, Clone)]
+// pub struct TokenDataWithMerkleContext {
+//     pub token_data: TokenData,
+//     pub compressed_account: CompressedAccountWithMerkleContext,
+// }
 
 #[derive(Debug, Clone)]
 pub struct MerkleProof {