Skip to content

Commit

Permalink
Update existing processor tests with the latest dependency change
Browse files Browse the repository at this point in the history
  • Loading branch information
@yuunlimm
yuunlimm committed Oct 17, 2024
1 parent 4cc90a3 commit b95f3da
Show file tree
Hide file tree
Showing 94 changed files with 1,098 additions and 278 deletions.
210 changes: 122 additions & 88 deletions rust/Cargo.lock
View file

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions rust/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,13 @@ testing-transactions = { path = "testing-transactions" }

ahash = { version = "0.8.7", features = ["serde"] }
anyhow = "1.0.86"
aptos-indexer-processor-sdk = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "95d76e07dd66a20a0e50a9e6c559885bff7ab52b" }
aptos-indexer-processor-sdk-server-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "95d76e07dd66a20a0e50a9e6c559885bff7ab52b" }
aptos-indexer-processor-sdk = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "376647ed207aa05a5149dfb49a0ae6e2ca15aa32" }
aptos-indexer-processor-sdk-server-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "376647ed207aa05a5149dfb49a0ae6e2ca15aa32" }
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 = "7246f0536d599789d7dd5e9fb776554abbe11eac" }
aptos-indexer-test-transactions = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "c583502c69529fddbbf7e47bf920f1dc60e71b72" }
aptos-indexer-testing-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "376647ed207aa05a5149dfb49a0ae6e2ca15aa32" }

async-trait = "0.1.53"
backtrace = "0.3.58"
base64 = "0.13.0"
Expand Down
18 changes: 18 additions & 0 deletions rust/integration-tests/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,42 @@ repository = "https://github.com/aptos-labs/aptos-core"
rust-version = { workspace = true }

[dependencies]
ahash = { workspace = true }
anyhow = { workspace = true }
aptos-indexer-processor-sdk = { workspace = true }
aptos-indexer-test-transactions = { workspace = true }
aptos-indexer-testing-framework = { workspace = true }
aptos-protos = { workspace = true }
assert-json-diff = { workspace = true }
bigdecimal = { workspace = true }
chrono = { workspace = true }
clap = { workspace = true }
diesel = { workspace = true }
dirs = { workspace = true }
field_count = { workspace = true }
futures = { workspace = true }
itertools = { workspace = true }
json-structural-diff = { workspace = true }
once_cell = { workspace = true }
processor = { workspace = true }
prost = { workspace = true }
regex = { workspace = true }
sdk-processor = { workspace = true }
serde = { workspace = true }
serde_canonical_json = { workspace = true }
serde_json = { workspace = true }
tempfile = { workspace = true }
testcontainers = { workspace = true }
testing-transactions = { workspace = true }
tokio = { workspace = true }
tonic = { workspace = true }
url = { workspace = true }

[dev-dependencies]
ahash = { workspace = true }
aptos-indexer-processor-sdk = { workspace = true }
futures = { workspace = true }
sdk-processor = { workspace = true }
tempfile = { workspace = true }
tonic = { workspace = true }
url = { workspace = true }
0 ...processor/events_processor_308783012.json → ...ns/events_processor/308783012/events.json
View file
File renamed without changes.
10 changes: 10 additions & 0 deletions ...db_output_files/imported_mainnet_txns/fungible_asset_processor/308783012/coin_supply.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[
{
"transaction_version": 308783012,
"coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6",
"coin_type": "0x1::aptos_coin::AptosCoin",
"supply": "106177548228160480",
"transaction_timestamp": "2023-10-24T09:08:03",
"transaction_epoch": 4534
}
]
13 changes: 13 additions & 0 deletions ...rted_mainnet_txns/fungible_asset_processor/308783012/current_fungible_asset_balances.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[
{
"storage_id": "0xc617f51a505e596fb85ca0c323c884cbe718782a9606c8023b8910f7fa16fe87",
"owner_address": "0x28f87126ce5c2ead81ec4fef494c73d545757a9a634eb54d36ae5a9737f4f287",
"asset_type": "0x1::aptos_coin::AptosCoin",
"is_primary": true,
"is_frozen": false,
"amount": "464000",
"last_transaction_timestamp": "2023-10-24T09:08:03",
"last_transaction_version": 308783012,
"token_standard": "v1"
}
]
0 ...r/fungible_asset_processor_308783012.json → .../308783012/fungible_asset_activities.json
View file
File renamed without changes.
14 changes: 14 additions & 0 deletions ...les/imported_mainnet_txns/fungible_asset_processor/308783012/fungible_asset_balances.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[
{
"transaction_version": 308783012,
"write_set_change_index": 0,
"storage_id": "0xc617f51a505e596fb85ca0c323c884cbe718782a9606c8023b8910f7fa16fe87",
"owner_address": "0x28f87126ce5c2ead81ec4fef494c73d545757a9a634eb54d36ae5a9737f4f287",
"asset_type": "0x1::aptos_coin::AptosCoin",
"is_primary": true,
"is_frozen": false,
"amount": "464000",
"transaction_timestamp": "2023-10-24T09:08:03",
"token_standard": "v1"
}
]
0 ...processor/fungible_asset_processor_1.json → ...or/308783012/fungible_asset_metadata.json
View file
File renamed without changes.
0 ...ocessor/token_v2_processor_308783012.json → ...cessor/308783012/token_activities_v2.json
View file
File renamed without changes.
0 .../events_processor/events_processor_1.json → ...stnet_txns/events_processor/1/events.json
View file
File renamed without changes.
0 ...rocessor/events_processor_1255836496.json → ...s/events_processor/1255836496/events.json
View file
File renamed without changes.
0 ...processor/events_processor_278556781.json → ...ns/events_processor/278556781/events.json
View file
File renamed without changes.
0 ...rocessor/events_processor_5523474016.json → ...s/events_processor/5523474016/events.json
View file
File renamed without changes.
0 ...rocessor/events_processor_5979639459.json → ...s/events_processor/5979639459/events.json
View file
File renamed without changes.
0 ...rocessor/events_processor_5992795934.json → ...s/events_processor/5992795934/events.json
View file
File renamed without changes.
10 changes: 10 additions & 0 deletions ...xpected_db_output_files/imported_testnet_txns/fungible_asset_processor/1/coin_supply.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[
{
"transaction_version": 1,
"coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6",
"coin_type": "0x1::aptos_coin::AptosCoin",
"supply": "18448344078275751615",
"transaction_timestamp": "2022-09-09T01:24:17",
"transaction_epoch": 1
}
]
0 .../fungible_asset_processor_5523474016.json → ...or/1/current_fungible_asset_balances.json
View file
File renamed without changes.
0 ...n_v2_processor/token_v2_processor_23.json → ...rocessor/1/fungible_asset_activities.json
View file
File renamed without changes.
0 ...n_v2_processor/token_v2_processor_43.json → ..._processor/1/fungible_asset_balances.json
View file
File renamed without changes.
0 ...n_v2_processor/token_v2_processor_65.json → ..._processor/1/fungible_asset_metadata.json
View file
File renamed without changes.
10 changes: 10 additions & 0 deletions ...b_output_files/imported_testnet_txns/fungible_asset_processor/1255836496/coin_supply.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[
{
"transaction_version": 1255836496,
"coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6",
"coin_type": "0x1::aptos_coin::AptosCoin",
"supply": "29152644549222814344",
"transaction_timestamp": "2024-06-18T05:07:55",
"transaction_epoch": 15650
}
]
46 changes: 46 additions & 0 deletions ...ted_testnet_txns/fungible_asset_processor/1255836496/current_fungible_asset_balances.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
[
{
"storage_id": "0x2086a7aaf18928233884d1725d4f92c5f26c67ac03cb98fe2dc40c99671282dc",
"owner_address": "0xf21d4c76354db6492841e31fefeaa5a3e8a1071d2bcbbdd1cf1cbc6fa3954b88",
"asset_type": "0x1::aptos_coin::AptosCoin",
"is_primary": true,
"is_frozen": false,
"amount": "29450400",
"last_transaction_timestamp": "2024-06-18T05:07:55",
"last_transaction_version": 1255836496,
"token_standard": "v1"
},
{
"storage_id": "0x56c216a20a151df2e917008e27f3b70250f1cbb80eeef24e64e2335630825fa3",
"owner_address": "0x6cbd58aec3b1eb5aff37ece4dff62b829ecbc6b851ee94056e852bcde5690ab4",
"asset_type": "0x1::aptos_coin::AptosCoin",
"is_primary": true,
"is_frozen": false,
"amount": "17374075418",
"last_transaction_timestamp": "2024-06-18T05:07:55",
"last_transaction_version": 1255836496,
"token_standard": "v1"
},
{
"storage_id": "0x7ea259eaaacce518a7479baca008e17fab2d0267a16e11979d52eb6c5433aad6",
"owner_address": "0xbe1390db94c2f8e83fd870c195656921ed4a2a5dee644c6d9c3168fea082a828",
"asset_type": "0x4551f2167c446b219c4dee2aa5496395c82a465cd57c5b362621af451c5d062b",
"is_primary": false,
"is_frozen": false,
"amount": "93054699",
"last_transaction_timestamp": "2024-06-18T05:07:55",
"last_transaction_version": 1255836496,
"token_standard": "v2"
},
{
"storage_id": "0x8f4f0991e18bd9620a4b3756dbe15afd20135eaaa93e0d0b82e6e2412a8e12b8",
"owner_address": "0xbe1390db94c2f8e83fd870c195656921ed4a2a5dee644c6d9c3168fea082a828",
"asset_type": "0x4551f2167c446b219c4dee2aa5496395c82a465cd57c5b362621af451c5d062b",
"is_primary": false,
"is_frozen": false,
"amount": "17272186129",
"last_transaction_timestamp": "2024-06-18T05:07:55",
"last_transaction_version": 1255836496,
"token_standard": "v2"
}
]
0 .../fungible_asset_processor_1255836496.json → ...1255836496/fungible_asset_activities.json
View file
File renamed without changes.
50 changes: 50 additions & 0 deletions ...es/imported_testnet_txns/fungible_asset_processor/1255836496/fungible_asset_balances.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
[
{
"transaction_version": 1255836496,
"write_set_change_index": 4,
"storage_id": "0x56c216a20a151df2e917008e27f3b70250f1cbb80eeef24e64e2335630825fa3",
"owner_address": "0x6cbd58aec3b1eb5aff37ece4dff62b829ecbc6b851ee94056e852bcde5690ab4",
"asset_type": "0x1::aptos_coin::AptosCoin",
"is_primary": true,
"is_frozen": false,
"amount": "17374075418",
"transaction_timestamp": "2024-06-18T05:07:55",
"token_standard": "v1"
},
{
"transaction_version": 1255836496,
"write_set_change_index": 5,
"storage_id": "0x7ea259eaaacce518a7479baca008e17fab2d0267a16e11979d52eb6c5433aad6",
"owner_address": "0xbe1390db94c2f8e83fd870c195656921ed4a2a5dee644c6d9c3168fea082a828",
"asset_type": "0x4551f2167c446b219c4dee2aa5496395c82a465cd57c5b362621af451c5d062b",
"is_primary": false,
"is_frozen": false,
"amount": "93054699",
"transaction_timestamp": "2024-06-18T05:07:55",
"token_standard": "v2"
},
{
"transaction_version": 1255836496,
"write_set_change_index": 8,
"storage_id": "0x8f4f0991e18bd9620a4b3756dbe15afd20135eaaa93e0d0b82e6e2412a8e12b8",
"owner_address": "0xbe1390db94c2f8e83fd870c195656921ed4a2a5dee644c6d9c3168fea082a828",
"asset_type": "0x4551f2167c446b219c4dee2aa5496395c82a465cd57c5b362621af451c5d062b",
"is_primary": false,
"is_frozen": false,
"amount": "17272186129",
"transaction_timestamp": "2024-06-18T05:07:55",
"token_standard": "v2"
},
{
"transaction_version": 1255836496,
"write_set_change_index": 16,
"storage_id": "0x2086a7aaf18928233884d1725d4f92c5f26c67ac03cb98fe2dc40c99671282dc",
"owner_address": "0xf21d4c76354db6492841e31fefeaa5a3e8a1071d2bcbbdd1cf1cbc6fa3954b88",
"asset_type": "0x1::aptos_coin::AptosCoin",
"is_primary": true,
"is_frozen": false,
"amount": "29450400",
"transaction_timestamp": "2024-06-18T05:07:55",
"token_standard": "v1"
}
]
19 changes: 19 additions & 0 deletions ...es/imported_testnet_txns/fungible_asset_processor/1255836496/fungible_asset_metadata.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[
{
"asset_type": "0x4551f2167c446b219c4dee2aa5496395c82a465cd57c5b362621af451c5d062b",
"creator_address": "0x6cbd58aec3b1eb5aff37ece4dff62b829ecbc6b851ee94056e852bcde5690ab4",
"name": "Aptos Coin",
"symbol": "APT",
"decimals": 8,
"icon_uri": "",
"project_uri": "",
"last_transaction_version": 1255836496,
"last_transaction_timestamp": "2024-06-18T05:07:55",
"supply_aggregator_table_handle_v1": null,
"supply_aggregator_table_key_v1": null,
"token_standard": "v2",
"is_token_v2": null,
"maximum_v2": "340282366920938463463374607431768211455",
"supply_v2": "17374075418"
}
]
10 changes: 10 additions & 0 deletions ...db_output_files/imported_testnet_txns/fungible_asset_processor/278556781/coin_supply.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[
{
"transaction_version": 278556781,
"coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6",
"coin_type": "0x1::aptos_coin::AptosCoin",
"supply": "18544645433533405815",
"transaction_timestamp": "2022-10-13T01:46:57",
"transaction_epoch": 746
}
]
24 changes: 24 additions & 0 deletions ...rted_testnet_txns/fungible_asset_processor/278556781/current_fungible_asset_balances.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
[
{
"storage_id": "0xa0f5bae99aac34d548f1c5f487800e375e451c1d9576bcdae6f3902752c83c01",
"owner_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862",
"asset_type": "0x1::aptos_coin::AptosCoin",
"is_primary": true,
"is_frozen": false,
"amount": "10041540182",
"last_transaction_timestamp": "2022-10-13T01:46:57",
"last_transaction_version": 278556781,
"token_standard": "v1"
},
{
"storage_id": "0xfc6edbad85409914ab088b68fed0528e4d8e36dcee31075bb8252b4f426a6cff",
"owner_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862",
"asset_type": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862::proton_cbdy::PRT_KFBCCC",
"is_primary": true,
"is_frozen": false,
"amount": "1000000000000000000",
"last_transaction_timestamp": "2022-10-13T01:46:57",
"last_transaction_version": 278556781,
"token_standard": "v1"
}
]
0 ...r/fungible_asset_processor_278556781.json → .../278556781/fungible_asset_activities.json
View file
File renamed without changes.
26 changes: 26 additions & 0 deletions ...les/imported_testnet_txns/fungible_asset_processor/278556781/fungible_asset_balances.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
[
{
"transaction_version": 278556781,
"write_set_change_index": 3,
"storage_id": "0xa0f5bae99aac34d548f1c5f487800e375e451c1d9576bcdae6f3902752c83c01",
"owner_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862",
"asset_type": "0x1::aptos_coin::AptosCoin",
"is_primary": true,
"is_frozen": false,
"amount": "10041540182",
"transaction_timestamp": "2022-10-13T01:46:57",
"token_standard": "v1"
},
{
"transaction_version": 278556781,
"write_set_change_index": 4,
"storage_id": "0xfc6edbad85409914ab088b68fed0528e4d8e36dcee31075bb8252b4f426a6cff",
"owner_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862",
"asset_type": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862::proton_cbdy::PRT_KFBCCC",
"is_primary": true,
"is_frozen": false,
"amount": "1000000000000000000",
"transaction_timestamp": "2022-10-13T01:46:57",
"token_standard": "v1"
}
]
19 changes: 19 additions & 0 deletions ...les/imported_testnet_txns/fungible_asset_processor/278556781/fungible_asset_metadata.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[
{
"asset_type": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862::proton_cbdy::PRT_KFBCCC",
"creator_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862",
"name": "Aptos",
"symbol": "APT",
"decimals": 10,
"icon_uri": null,
"project_uri": null,
"last_transaction_version": 278556781,
"last_transaction_timestamp": "2022-10-13T01:46:57",
"supply_aggregator_table_handle_v1": null,
"supply_aggregator_table_key_v1": null,
"token_standard": "v1",
"is_token_v2": null,
"maximum_v2": null,
"supply_v2": null
}
]
10 changes: 10 additions & 0 deletions ...b_output_files/imported_testnet_txns/fungible_asset_processor/5523474016/coin_supply.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[
{
"transaction_version": 5523474016,
"coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6",
"coin_type": "0x1::aptos_coin::AptosCoin",
"supply": "29159026553346716168",
"transaction_timestamp": "2024-07-29T00:02:18",
"transaction_epoch": 16643
}
]
0 ...n_v2_processor/token_v2_processor_85.json → ...4016/current_fungible_asset_balances.json
View file
File renamed without changes.
1 change: 1 addition & 0 deletions .../imported_testnet_txns/fungible_asset_processor/5523474016/fungible_asset_activities.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[]
1 change: 1 addition & 0 deletions ...es/imported_testnet_txns/fungible_asset_processor/5523474016/fungible_asset_balances.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[]
1 change: 1 addition & 0 deletions ...es/imported_testnet_txns/fungible_asset_processor/5523474016/fungible_asset_metadata.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[]
10 changes: 10 additions & 0 deletions ...b_output_files/imported_testnet_txns/fungible_asset_processor/5979639459/coin_supply.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[
{
"transaction_version": 5979639459,
"coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6",
"coin_type": "0x1::aptos_coin::AptosCoin",
"supply": "29164832318786122251",
"transaction_timestamp": "2024-09-13T16:48:29",
"transaction_epoch": 17778
}
]
24 changes: 24 additions & 0 deletions ...ted_testnet_txns/fungible_asset_processor/5979639459/current_fungible_asset_balances.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
[
{
"storage_id": "0x239f9719aceb8223231f615e436fcfc8b7e7a6cb03350d00dc72b47678e5d78b",
"owner_address": "0xb7a4a81a3d513e3e18ee6bec61a001d7e18c5d92bb6645a2f21f0b0fec2531a6",
"asset_type": "0x1::aptos_coin::AptosCoin",
"is_primary": true,
"is_frozen": false,
"amount": "10",
"last_transaction_timestamp": "2024-09-13T16:48:29",
"last_transaction_version": 5979639459,
"token_standard": "v1"
},
{
"storage_id": "0x32edf0b123cd57094ba7b0b5a0b1524e0f2117b547adf65e8b0c08b39e30d242",
"owner_address": "0x54ce130990ecf55cd12de74bff03dcfaacf63066e0945d3c415d61644303da39",
"asset_type": "0x1::aptos_coin::AptosCoin",
"is_primary": true,
"is_frozen": false,
"amount": "16673484350",
"last_transaction_timestamp": "2024-09-13T16:48:29",
"last_transaction_version": 5979639459,
"token_standard": "v1"
}
]
0 .../fungible_asset_processor_5979639459.json → ...5979639459/fungible_asset_activities.json
View file
File renamed without changes.
Loading

0 comments on commit b95f3da

Please sign in to comment.