From 0c92d323b0f560b5f8601a831a36520ad9b72d68 Mon Sep 17 00:00:00 2001 From: Yuun Lim <38443641+yuunlimm@users.noreply.github.com> Date: Thu, 16 Jan 2025 12:03:31 -0800 Subject: [PATCH] update test transaction dependency (#676) --- rust/Cargo.lock | 25 +++++++++++++------ rust/Cargo.toml | 2 +- .../src/sanity_test/sanity_tests.rs | 2 +- .../account_transaction_processor_tests.rs | 2 +- .../src/sdk_tests/ans_processor_tests.rs | 2 +- .../src/sdk_tests/default_processor_tests.rs | 2 +- .../src/sdk_tests/events_processor_tests.rs | 2 +- .../fungible_asset_processor_tests.rs | 2 +- .../src/sdk_tests/objects_processor_tests.rs | 2 +- .../src/sdk_tests/stake_processor_tests.rs | 2 +- .../src/sdk_tests/token_v2_processor_tests.rs | 21 ++++++++-------- .../user_transaction_processor_tests.rs | 2 +- 12 files changed, 39 insertions(+), 27 deletions(-) diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 328ecb18a..4225ba782 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -146,7 +146,7 @@ dependencies = [ "ahash", "anyhow", "aptos-indexer-transaction-stream", - "aptos-protos", + "aptos-protos 1.3.1 (git+https://github.com/aptos-labs/aptos-core.git?rev=6116af69aa173ca49e1761daabd6fe103fe2c65e)", "async-trait", "bcs", "bigdecimal", @@ -198,9 +198,9 @@ dependencies = [ [[package]] name = "aptos-indexer-test-transactions" version = "1.0.0" -source = "git+https://github.com/aptos-labs/aptos-core.git?rev=6116af69aa173ca49e1761daabd6fe103fe2c65e#6116af69aa173ca49e1761daabd6fe103fe2c65e" +source = "git+https://github.com/aptos-labs/aptos-core.git?rev=60262d93f9a16b286034227018807610f35ceba5#60262d93f9a16b286034227018807610f35ceba5" dependencies = [ - "aptos-protos", + "aptos-protos 1.3.1 (git+https://github.com/aptos-labs/aptos-core.git?rev=60262d93f9a16b286034227018807610f35ceba5)", "serde_json", ] @@ -211,7 +211,7 @@ source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev= dependencies = [ "anyhow", "aptos-indexer-processor-sdk", - "aptos-protos", + "aptos-protos 1.3.1 (git+https://github.com/aptos-labs/aptos-core.git?rev=6116af69aa173ca49e1761daabd6fe103fe2c65e)", "async-trait", "diesel", "diesel-async", @@ -239,7 +239,7 @@ source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev= dependencies = [ "anyhow", "aptos-moving-average 0.1.0 (git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=a56b641a6aaca60092fcc9bbd98252f3cd703299)", - "aptos-protos", + "aptos-protos 1.3.1 (git+https://github.com/aptos-labs/aptos-core.git?rev=6116af69aa173ca49e1761daabd6fe103fe2c65e)", "chrono", "futures-util", "once_cell", @@ -294,6 +294,17 @@ dependencies = [ "regex", ] +[[package]] +name = "aptos-protos" +version = "1.3.1" +source = "git+https://github.com/aptos-labs/aptos-core.git?rev=60262d93f9a16b286034227018807610f35ceba5#60262d93f9a16b286034227018807610f35ceba5" +dependencies = [ + "pbjson", + "prost 0.13.4", + "serde", + "tonic 0.12.3", +] + [[package]] name = "aptos-protos" version = "1.3.1" @@ -2286,7 +2297,7 @@ dependencies = [ "aptos-indexer-processor-sdk", "aptos-indexer-test-transactions", "aptos-indexer-testing-framework", - "aptos-protos", + "aptos-protos 1.3.1 (git+https://github.com/aptos-labs/aptos-core.git?rev=6116af69aa173ca49e1761daabd6fe103fe2c65e)", "assert-json-diff", "bigdecimal", "chrono", @@ -3377,7 +3388,7 @@ dependencies = [ "allocative_derive", "anyhow", "aptos-moving-average 0.1.0", - "aptos-protos", + "aptos-protos 1.3.1 (git+https://github.com/aptos-labs/aptos-core.git?rev=6116af69aa173ca49e1761daabd6fe103fe2c65e)", "async-trait", "bcs", "bigdecimal", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index b0dc24011..08a193584 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -31,7 +31,7 @@ anyhow = "1.0.86" aptos-indexer-processor-sdk = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "a56b641a6aaca60092fcc9bbd98252f3cd703299" } aptos-indexer-processor-sdk-server-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "a56b641a6aaca60092fcc9bbd98252f3cd703299" } aptos-protos = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "6116af69aa173ca49e1761daabd6fe103fe2c65e" } -aptos-indexer-test-transactions = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "6116af69aa173ca49e1761daabd6fe103fe2c65e" } +aptos-indexer-test-transactions = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "60262d93f9a16b286034227018807610f35ceba5" } aptos-indexer-testing-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "a56b641a6aaca60092fcc9bbd98252f3cd703299" } async-trait = "0.1.53" backtrace = "0.3.58" diff --git a/rust/integration-tests/src/sanity_test/sanity_tests.rs b/rust/integration-tests/src/sanity_test/sanity_tests.rs index 5f1f6bd97..7aa2efadb 100644 --- a/rust/integration-tests/src/sanity_test/sanity_tests.rs +++ b/rust/integration-tests/src/sanity_test/sanity_tests.rs @@ -26,7 +26,7 @@ mod tests { user_transaction_processor_tests::setup_user_txn_processor_config, }, }; - use aptos_indexer_test_transactions::{ + use aptos_indexer_test_transactions::json_transactions::generated_transactions::{ ALL_IMPORTED_MAINNET_TXNS, ALL_IMPORTED_TESTNET_TXNS, ALL_SCRIPTED_TRANSACTIONS, }; use aptos_indexer_testing_framework::{ diff --git a/rust/integration-tests/src/sdk_tests/account_transaction_processor_tests.rs b/rust/integration-tests/src/sdk_tests/account_transaction_processor_tests.rs index a5e1b6995..074ff6a2e 100644 --- a/rust/integration-tests/src/sdk_tests/account_transaction_processor_tests.rs +++ b/rust/integration-tests/src/sdk_tests/account_transaction_processor_tests.rs @@ -47,7 +47,7 @@ mod tests { run_processor_test, setup_test_environment, validate_json, DEFAULT_OUTPUT_FOLDER, }, }; - use aptos_indexer_test_transactions::{ + use aptos_indexer_test_transactions::json_transactions::generated_transactions::{ IMPORTED_MAINNET_TXNS_145959468_ACCOUNT_TRANSACTION, IMPORTED_MAINNET_TXNS_423176063_ACCOUNT_TRANSACTION_DELETE, }; diff --git a/rust/integration-tests/src/sdk_tests/ans_processor_tests.rs b/rust/integration-tests/src/sdk_tests/ans_processor_tests.rs index b3b472769..c6bf33a95 100644 --- a/rust/integration-tests/src/sdk_tests/ans_processor_tests.rs +++ b/rust/integration-tests/src/sdk_tests/ans_processor_tests.rs @@ -59,7 +59,7 @@ mod tests { setup_test_environment, validate_json, DEFAULT_OUTPUT_FOLDER, }, }; - use aptos_indexer_test_transactions::{ + use aptos_indexer_test_transactions::json_transactions::generated_transactions::{ IMPORTED_MAINNET_TXNS_1056780409_ANS_CURRENT_ANS_PRIMARY_NAME_V2, IMPORTED_MAINNET_TXNS_303690531_ANS_LOOKUP_V2, IMPORTED_MAINNET_TXNS_438536688_ANS_CURRENT_ANS_LOOKUP_V2, diff --git a/rust/integration-tests/src/sdk_tests/default_processor_tests.rs b/rust/integration-tests/src/sdk_tests/default_processor_tests.rs index 673002203..2355eac60 100644 --- a/rust/integration-tests/src/sdk_tests/default_processor_tests.rs +++ b/rust/integration-tests/src/sdk_tests/default_processor_tests.rs @@ -47,7 +47,7 @@ mod tests { setup_test_environment, validate_json, DEFAULT_OUTPUT_FOLDER, }, }; - use aptos_indexer_test_transactions::{ + use aptos_indexer_test_transactions::json_transactions::generated_transactions::{ IMPORTED_MAINNET_TXNS_155112189_DEFAULT_TABLE_ITEMS, IMPORTED_MAINNET_TXNS_1845035942_DEFAULT_CURRENT_TABLE_ITEMS, IMPORTED_MAINNET_TXNS_423176063_ACCOUNT_TRANSACTION_DELETE, diff --git a/rust/integration-tests/src/sdk_tests/events_processor_tests.rs b/rust/integration-tests/src/sdk_tests/events_processor_tests.rs index f6a411157..62be9b180 100644 --- a/rust/integration-tests/src/sdk_tests/events_processor_tests.rs +++ b/rust/integration-tests/src/sdk_tests/events_processor_tests.rs @@ -48,7 +48,7 @@ mod tests { }, }; use aptos_indexer_processor_sdk::traits::processor_trait::ProcessorTrait; - use aptos_indexer_test_transactions::{ + use aptos_indexer_test_transactions::json_transactions::generated_transactions::{ IMPORTED_DEVNET_TXNS_78753811_COIN_TRANSFER_WITH_V2_EVENTS, IMPORTED_DEVNET_TXNS_78753831_TOKEN_V1_MINT_TRANSFER_WITH_V2_EVENTS, IMPORTED_DEVNET_TXNS_78753832_TOKEN_V2_MINT_TRANSFER_WITH_V2_EVENTS, diff --git a/rust/integration-tests/src/sdk_tests/fungible_asset_processor_tests.rs b/rust/integration-tests/src/sdk_tests/fungible_asset_processor_tests.rs index f7df83060..bd87f862d 100644 --- a/rust/integration-tests/src/sdk_tests/fungible_asset_processor_tests.rs +++ b/rust/integration-tests/src/sdk_tests/fungible_asset_processor_tests.rs @@ -48,7 +48,7 @@ mod sdk_fungible_asset_processor_tests { setup_test_environment, validate_json, DEFAULT_OUTPUT_FOLDER, }, }; - use aptos_indexer_test_transactions::{ + use aptos_indexer_test_transactions::json_transactions::generated_transactions::{ IMPORTED_DEVNET_TXNS_78753811_COIN_TRANSFER_WITH_V2_EVENTS, IMPORTED_MAINNET_TXNS_508365567_FA_V1_EVENTS, IMPORTED_MAINNET_TXNS_999929475_COIN_AND_FA_TRANSFERS, diff --git a/rust/integration-tests/src/sdk_tests/objects_processor_tests.rs b/rust/integration-tests/src/sdk_tests/objects_processor_tests.rs index 9e50a2402..b2f4005ef 100644 --- a/rust/integration-tests/src/sdk_tests/objects_processor_tests.rs +++ b/rust/integration-tests/src/sdk_tests/objects_processor_tests.rs @@ -58,7 +58,7 @@ mod sdk_objects_processor_tests { run_processor_test, setup_test_environment, validate_json, DEFAULT_OUTPUT_FOLDER, }, }; - use aptos_indexer_test_transactions::{ + use aptos_indexer_test_transactions::json_transactions::generated_transactions::{ IMPORTED_MAINNET_TXNS_1806220919_OBJECT_UNTRANSFERABLE, IMPORTED_MAINNET_TXNS_578318306_OBJECTS_WRITE_RESOURCE, IMPORTED_MAINNET_TXNS_578366445_TOKEN_V2_BURN_EVENT_V2, diff --git a/rust/integration-tests/src/sdk_tests/stake_processor_tests.rs b/rust/integration-tests/src/sdk_tests/stake_processor_tests.rs index 7577202e0..d22906726 100644 --- a/rust/integration-tests/src/sdk_tests/stake_processor_tests.rs +++ b/rust/integration-tests/src/sdk_tests/stake_processor_tests.rs @@ -56,7 +56,7 @@ mod tests { DEFAULT_OUTPUT_FOLDER, }, }; - use aptos_indexer_test_transactions::{ + use aptos_indexer_test_transactions::json_transactions::generated_transactions::{ IMPORTED_MAINNET_TXNS_121508544_STAKE_DISTRIBUTE, IMPORTED_MAINNET_TXNS_139449359_STAKE_REACTIVATE, IMPORTED_MAINNET_TXNS_1830706009_STAKER_GOVERNANCE_RECORD, diff --git a/rust/integration-tests/src/sdk_tests/token_v2_processor_tests.rs b/rust/integration-tests/src/sdk_tests/token_v2_processor_tests.rs index efec2941e..ce2b54149 100644 --- a/rust/integration-tests/src/sdk_tests/token_v2_processor_tests.rs +++ b/rust/integration-tests/src/sdk_tests/token_v2_processor_tests.rs @@ -57,8 +57,8 @@ mod sdk_token_v2_processor_tests { run_processor_test, setup_test_environment, validate_json, DEFAULT_OUTPUT_FOLDER, }, }; - use aptos_indexer_test_transactions::{ - // IMPORTED_DEVNET_TXNS_19922017_TOKEN_V1_OFFER_CLAIM, + use aptos_indexer_test_transactions::json_transactions::generated_transactions::{ + IMPORTED_DEVNET_TXNS_19922017_TOKEN_V1_OFFER_CLAIM, IMPORTED_DEVNET_TXNS_78753831_TOKEN_V1_MINT_TRANSFER_WITH_V2_EVENTS, IMPORTED_DEVNET_TXNS_78753832_TOKEN_V2_MINT_TRANSFER_WITH_V2_EVENTS, IMPORTED_MAINNET_TXNS_1058723093_TOKEN_V1_MINT_WITHDRAW_DEPOSIT_EVENTS, @@ -315,14 +315,14 @@ mod sdk_token_v2_processor_tests { .await; } - // #[tokio::test(flavor = "multi_thread", worker_threads = 2)] - // async fn test_token_v1_offer_claim_no_table_metadata() { - // process_single_transaction( - // IMPORTED_DEVNET_TXNS_19922017_TOKEN_V1_OFFER_CLAIM, - // Some("test_token_v1_offer_claim_no_table_metadata".to_string()), - // ) - // .await; - // } + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] + async fn test_token_v1_offer_claim_no_table_metadata() { + process_single_transaction( + IMPORTED_DEVNET_TXNS_19922017_TOKEN_V1_OFFER_CLAIM, + Some("test_token_v1_offer_claim_no_table_metadata".to_string()), + ) + .await; + } /** * This test includes processing for the following: @@ -351,6 +351,7 @@ mod sdk_token_v2_processor_tests { ) .await; } + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] async fn test_token_v2_with_module_events() { process_single_transaction( diff --git a/rust/integration-tests/src/sdk_tests/user_transaction_processor_tests.rs b/rust/integration-tests/src/sdk_tests/user_transaction_processor_tests.rs index 70a7986d0..ae48ecb24 100644 --- a/rust/integration-tests/src/sdk_tests/user_transaction_processor_tests.rs +++ b/rust/integration-tests/src/sdk_tests/user_transaction_processor_tests.rs @@ -48,7 +48,7 @@ mod sdk_user_txn_processor_tests { run_processor_test, setup_test_environment, validate_json, DEFAULT_OUTPUT_FOLDER, }, }; - use aptos_indexer_test_transactions::{ + use aptos_indexer_test_transactions::json_transactions::generated_transactions::{ IMPORTED_MAINNET_TXNS_1803170308_USER_TXN_MULTI_KEY_KEYLESS, IMPORTED_MAINNET_TXNS_2175935_USER_TXN_MULTI_ED25519, IMPORTED_MAINNET_TXNS_407418623_USER_TXN_SINGLE_KEY_SECP256K1_ECDSA,