Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Loading
Loading status checks…
update simulation test for internal indexer delay
Browse files Browse the repository at this point in the history
@areshand
areshand committed Oct 1, 2024

Verified

This commit was signed with the committer’s verified signature.
KyleFromNVIDIA Kyle Edwards
SSH Key Fingerprint: HCOKmVHDGRyoBbxy3oHe2oM/H/VI74oAiMzA3TKFtmM
Verified
Learn about vigilant mode
1 parent 5ae992d commit 5fff7b0
Showing 5 changed files with 41 additions and 186 deletions.
170 changes: 7 additions & 163 deletions ...tests__transactions_test__test_get_transaction_by_hash_with_delayed_internal_indexer.json
View file
Original file line number Diff line number Diff line change
@@ -1,179 +1,23 @@
{
"version": "2",
"hash": "",
"state_change_hash": "",
"event_root_hash": "",
"state_checkpoint_hash": null,
"gas_used": "9",
"success": true,
"vm_status": "Executed successfully",
"accumulator_root_hash": "",
"changes": [
{
"address": "0xa550c18",
"state_key_hash": "",
"data": {
"type": "0x1::account::Account",
"data": {
"authentication_key": "0xcef8ffd1ab9017e96132df8a56b22de39a8155e1c3fc32affbbf93eb624b532a",
"coin_register_events": {
"counter": "1",
"guid": {
"id": {
"addr": "0xa550c18",
"creation_num": "0"
}
}
},
"guid_creation_num": "4",
"key_rotation_events": {
"counter": "0",
"guid": {
"id": {
"addr": "0xa550c18",
"creation_num": "1"
}
}
},
"rotation_capability_offer": {
"for": {
"vec": []
}
},
"sequence_number": "1",
"signer_capability_offer": {
"for": {
"vec": []
}
}
}
},
"type": "write_resource"
},
{
"address": "0x34bf7e2d17674feb234371a7ea58efd715f0e56ba20ebf13789480d9d643afaf",
"state_key_hash": "",
"data": {
"type": "0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>",
"data": {
"coin": {
"value": "0"
},
"deposit_events": {
"counter": "0",
"guid": {
"id": {
"addr": "0x34bf7e2d17674feb234371a7ea58efd715f0e56ba20ebf13789480d9d643afaf",
"creation_num": "2"
}
}
},
"frozen": false,
"withdraw_events": {
"counter": "0",
"guid": {
"id": {
"addr": "0x34bf7e2d17674feb234371a7ea58efd715f0e56ba20ebf13789480d9d643afaf",
"creation_num": "3"
}
}
}
}
},
"type": "write_resource"
},
{
"address": "0x34bf7e2d17674feb234371a7ea58efd715f0e56ba20ebf13789480d9d643afaf",
"state_key_hash": "",
"data": {
"type": "0x1::account::Account",
"data": {
"authentication_key": "0x34bf7e2d17674feb234371a7ea58efd715f0e56ba20ebf13789480d9d643afaf",
"coin_register_events": {
"counter": "1",
"guid": {
"id": {
"addr": "0x34bf7e2d17674feb234371a7ea58efd715f0e56ba20ebf13789480d9d643afaf",
"creation_num": "0"
}
}
},
"guid_creation_num": "4",
"key_rotation_events": {
"counter": "0",
"guid": {
"id": {
"addr": "0x34bf7e2d17674feb234371a7ea58efd715f0e56ba20ebf13789480d9d643afaf",
"creation_num": "1"
}
}
},
"rotation_capability_offer": {
"for": {
"vec": []
}
},
"sequence_number": "0",
"signer_capability_offer": {
"for": {
"vec": []
}
}
}
},
"type": "write_resource"
}
],
"sender": "0xa550c18",
"sender": "0x34bf7e2d17674feb234371a7ea58efd715f0e56ba20ebf13789480d9d643afaf",
"sequence_number": "0",
"max_gas_amount": "100000000",
"gas_unit_price": "0",
"expiration_timestamp_secs": "18446744073709551615",
"payload": {
"function": "0x1::aptos_account::create_account",
"function": "0x1::aptos_account::transfer",
"type_arguments": [],
"arguments": [
"0x34bf7e2d17674feb234371a7ea58efd715f0e56ba20ebf13789480d9d643afaf"
"0x1",
"1"
],
"type": "entry_function_payload"
},
"signature": {
"public_key": "0x14418f867a0bd6d42abb2daa50cd68a5a869ce208282481f57504f630510d0d3",
"signature": "0x95915d42cd822b6195581e9be3c164b70afeb9228ebb68c2e3f14240e3f43a164caabae8096163c6a341fc3830b36618b4619b7d5f2edcd603690e91a62fdb05",
"public_key": "0xd5a781494d2bf1a174ddffde1e02cb8881cff6dab70e61cbdef393deac0ce639",
"signature": "0xbdc9e553e86cdee876de3318bccd8c6499923b719ab5f189e8b43ba91771645f01c3ded4061e20b3bb85767e475dfe24f76b4aed46860c9328baf28d11d2c701",
"type": "ed25519_signature"
},
"events": [
{
"guid": {
"creation_number": "0",
"account_address": "0x34bf7e2d17674feb234371a7ea58efd715f0e56ba20ebf13789480d9d643afaf"
},
"sequence_number": "0",
"type": "0x1::account::CoinRegisterEvent",
"data": {
"type_info": {
"account_address": "0x1",
"module_name": "0x6170746f735f636f696e",
"struct_name": "0x4170746f73436f696e"
}
}
},
{
"guid": {
"creation_number": "0",
"account_address": "0x0"
},
"sequence_number": "0",
"type": "0x1::transaction_fee::FeeStatement",
"data": {
"execution_gas_units": "5",
"io_gas_units": "4",
"storage_fee_octas": "0",
"storage_fee_refund_octas": "0",
"total_charge_gas_units": "9"
}
}
],
"timestamp": "500000",
"type": "user_transaction"
"type": "pending_transaction"
}
4 changes: 2 additions & 2 deletions api/src/tests/mod.rs
View file
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ fn new_test_context_with_db_sharding_and_internal_indexer(test_name: String) ->
let mut node_config = NodeConfig::default();
node_config.storage.rocksdb_configs.enable_storage_sharding = true;
node_config.indexer_db_config = InternalIndexerDBConfig::new(true, true, true, 10);
super_new_test_context(test_name, node_config, true, None)
super_new_test_context(test_name, node_config, false, None)
}

fn new_test_context_with_sharding_and_delayed_internal_indexer(
@@ -46,5 +46,5 @@ fn new_test_context_with_sharding_and_delayed_internal_indexer(
let mut node_config = NodeConfig::default();
node_config.storage.rocksdb_configs.enable_storage_sharding = true;
node_config.indexer_db_config = InternalIndexerDBConfig::new(true, true, true, 1);
super_new_test_context(test_name, node_config, true, end_version)
super_new_test_context(test_name, node_config, false, end_version)
}
9 changes: 7 additions & 2 deletions api/src/tests/transactions_test.rs
View file
Original file line number Diff line number Diff line change
@@ -498,10 +498,15 @@ async fn test_get_transaction_by_hash_with_delayed_internal_indexer() {
current_function_name!(),
Some(1),
);
let account = context.gen_account();

let mut account = context.gen_account();
let txn = context.create_user_account(&account).await;
let committed_hash = txn.committed_hash().to_hex_literal();
context.commit_block(&vec![txn.clone()]).await;
let txn1 = context.account_transfer_to(&mut account, AccountAddress::from_hex_literal("0x1").unwrap(), 1);
context.commit_block(&vec![txn1.clone()]).await;
let committed_hash = txn1.committed_hash().to_hex_literal();


let _ = context
.get_indexer_reader()
.unwrap()
42 changes: 23 additions & 19 deletions api/test-context/src/test_context.rs
View file
Original file line number Diff line number Diff line change
@@ -135,28 +135,32 @@ pub fn new_test_context_inner(
&tmp_dir,
node_config.storage.rocksdb_configs.enable_storage_sharding,
);
aptos_db.add_version_update_subscriber(sender).unwrap();
if node_config.indexer_db_config.is_internal_indexer_db_enabled() {
aptos_db.add_version_update_subscriber(sender).unwrap();
}
DbReaderWriter::wrap(aptos_db)
} else {
DbReaderWriter::wrap(
AptosDB::open(
StorageDirPaths::from_path(&tmp_dir),
false, /* readonly */
NO_OP_STORAGE_PRUNER_CONFIG, /* pruner */
RocksdbConfigs {
enable_storage_sharding: node_config
.storage
.rocksdb_configs
.enable_storage_sharding,
..Default::default()
},
false, /* indexer */
BUFFERED_STATE_TARGET_ITEMS_FOR_TEST,
DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD,
None,
)
.unwrap(),
let mut aptos_db = AptosDB::open(
StorageDirPaths::from_path(&tmp_dir),
false, /* readonly */
NO_OP_STORAGE_PRUNER_CONFIG, /* pruner */
RocksdbConfigs {
enable_storage_sharding: node_config
.storage
.rocksdb_configs
.enable_storage_sharding,
..Default::default()
},
false, /* indexer */
BUFFERED_STATE_TARGET_ITEMS_FOR_TEST,
DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD,
None,
)
.unwrap();
if node_config.indexer_db_config.is_internal_indexer_db_enabled() {
aptos_db.add_version_update_subscriber(sender).unwrap();
}
DbReaderWriter::wrap(aptos_db)
};
let ret =
db_bootstrapper::maybe_bootstrap::<AptosVM>(&db_rw, &genesis, genesis_waypoint).unwrap();
2 changes: 2 additions & 0 deletions ecosystem/indexer-grpc/indexer-grpc-table-info/src/internal_indexer_db_service.rs
View file
Original file line number Diff line number Diff line change
@@ -190,6 +190,8 @@ impl InternalIndexerDBService {
}
start_version = next_version;
}
// We should never stop the internal indexer
tokio::time::sleep(std::time::Duration::from_secs(100)).await;

Ok(())
}

0 comments on commit 5fff7b0

Please sign in to comment.