From b2cad77bb0a8112379b9e4a37a9f64f9c9be11be Mon Sep 17 00:00:00 2001 From: yuunlimm Date: Thu, 17 Oct 2024 23:50:12 -0700 Subject: [PATCH] rebase and update dependency --- rust/Cargo.lock | 8 ++++---- rust/Cargo.toml | 2 +- .../scripted_txns/events_processor/23/events.json | 5 ++--- .../scripted_txns/events_processor/43/events.json | 5 ++--- .../scripted_txns/events_processor/65/events.json | 5 ++--- .../scripted_txns/events_processor/85/events.json | 5 ++--- .../src/sdk_tests/events_processor_tests.rs | 6 +++--- 7 files changed, 16 insertions(+), 20 deletions(-) diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 76ef4edaa..b02bc00d8 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -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=87acec023264cdd756e5eae073ddf302fda0917a#87acec023264cdd756e5eae073ddf302fda0917a" +source = "git+https://github.com/aptos-labs/aptos-core.git?rev=3099bbe1e100be815ca0cb262cd7eceef9c75dad#3099bbe1e100be815ca0cb262cd7eceef9c75dad" dependencies = [ - "aptos-protos 1.3.1 (git+https://github.com/aptos-labs/aptos-core.git?rev=87acec023264cdd756e5eae073ddf302fda0917a)", + "aptos-protos 1.3.1 (git+https://github.com/aptos-labs/aptos-core.git?rev=3099bbe1e100be815ca0cb262cd7eceef9c75dad)", "serde_json", ] @@ -296,7 +296,7 @@ dependencies = [ [[package]] name = "aptos-protos" version = "1.3.1" -source = "git+https://github.com/aptos-labs/aptos-core.git?rev=5c48aee129b5a141be2792ffa3d9bd0a1a61c9cb#5c48aee129b5a141be2792ffa3d9bd0a1a61c9cb" +source = "git+https://github.com/aptos-labs/aptos-core.git?rev=3099bbe1e100be815ca0cb262cd7eceef9c75dad#3099bbe1e100be815ca0cb262cd7eceef9c75dad" dependencies = [ "futures-core", "pbjson", @@ -308,7 +308,7 @@ dependencies = [ [[package]] name = "aptos-protos" version = "1.3.1" -source = "git+https://github.com/aptos-labs/aptos-core.git?rev=87acec023264cdd756e5eae073ddf302fda0917a#87acec023264cdd756e5eae073ddf302fda0917a" +source = "git+https://github.com/aptos-labs/aptos-core.git?rev=5c48aee129b5a141be2792ffa3d9bd0a1a61c9cb#5c48aee129b5a141be2792ffa3d9bd0a1a61c9cb" dependencies = [ "futures-core", "pbjson", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 0f5d87060..7335b4d5d 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -34,7 +34,7 @@ aptos-indexer-processor-sdk = { git = "https://github.com/aptos-labs/aptos-index aptos-indexer-processor-sdk-server-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "1f989c65abbd5cf00a0631a30755ef05818e1894" } aptos-protos = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "5c48aee129b5a141be2792ffa3d9bd0a1a61c9cb" } aptos-system-utils = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "202bdccff2b2d333a385ae86a4fcf23e89da9f62" } -aptos-indexer-test-transactions = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "87acec023264cdd756e5eae073ddf302fda0917a" } +aptos-indexer-test-transactions = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "3099bbe1e100be815ca0cb262cd7eceef9c75dad" } aptos-indexer-testing-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "1f989c65abbd5cf00a0631a30755ef05818e1894" } async-trait = "0.1.53" diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/23/events.json b/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/23/events.json index e4474af36..6ff94bb16 100644 --- a/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/23/events.json +++ b/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/23/events.json @@ -13,8 +13,7 @@ "total_charge_gas_units": "3", "storage_fee_refund_octas": "0" }, - "inserted_at": "2024-10-15T04:55:32.412203", - "event_index": 0, - "indexed_type": "0x1::transaction_fee::FeeStatement" + "indexed_type": "0x1::transaction_fee::FeeStatement", + "event_index": 0 } ] \ No newline at end of file diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/43/events.json b/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/43/events.json index 78fcf79a8..5f5f8ee20 100644 --- a/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/43/events.json +++ b/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/43/events.json @@ -13,8 +13,7 @@ "total_charge_gas_units": "3", "storage_fee_refund_octas": "0" }, - "inserted_at": "2024-10-15T04:55:32.404901", - "event_index": 0, - "indexed_type": "0x1::transaction_fee::FeeStatement" + "indexed_type": "0x1::transaction_fee::FeeStatement", + "event_index": 0 } ] \ No newline at end of file diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/65/events.json b/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/65/events.json index 0a8a207d6..dde6479b4 100644 --- a/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/65/events.json +++ b/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/65/events.json @@ -13,8 +13,7 @@ "total_charge_gas_units": "3", "storage_fee_refund_octas": "0" }, - "inserted_at": "2024-10-15T04:55:32.413924", - "event_index": 0, - "indexed_type": "0x1::transaction_fee::FeeStatement" + "indexed_type": "0x1::transaction_fee::FeeStatement", + "event_index": 0 } ] \ No newline at end of file diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/85/events.json b/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/85/events.json index cd2cd722e..ed9d921df 100644 --- a/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/85/events.json +++ b/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/85/events.json @@ -13,8 +13,7 @@ "total_charge_gas_units": "3", "storage_fee_refund_octas": "0" }, - "inserted_at": "2024-10-15T04:55:32.409748", - "event_index": 0, - "indexed_type": "0x1::transaction_fee::FeeStatement" + "indexed_type": "0x1::transaction_fee::FeeStatement", + "event_index": 0 } ] \ No newline at end of file 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 613143190..1ac79d334 100644 --- a/rust/integration-tests/src/sdk_tests/events_processor_tests.rs +++ b/rust/integration-tests/src/sdk_tests/events_processor_tests.rs @@ -51,7 +51,7 @@ mod tests { }; use aptos_indexer_test_transactions::{ ALL_IMPORTED_TESTNET_TXNS, IMPORTED_TESTNET_TXNS_1_GENESIS, - IMPORTED_TESTNET_TXNS_2_GENESIS, IMPORTED_TESTNET_TXNS_3_GENESIS, + IMPORTED_TESTNET_TXNS_2_NEW_BLOCK_EVENT, IMPORTED_TESTNET_TXNS_3_EMPTY_TXN, }; use aptos_indexer_testing_framework::{cli_parser::get_test_config, database::TestDatabase}; use aptos_protos::transaction::v1::Transaction; @@ -126,8 +126,8 @@ mod tests { let imported = [ IMPORTED_TESTNET_TXNS_1_GENESIS, - IMPORTED_TESTNET_TXNS_2_GENESIS, - IMPORTED_TESTNET_TXNS_3_GENESIS, + IMPORTED_TESTNET_TXNS_2_NEW_BLOCK_EVENT, + IMPORTED_TESTNET_TXNS_3_EMPTY_TXN, ]; let (db, mut test_context) = setup_test_environment(&imported).await;