Skip to content

Commit 331aad5

Browse files
sergeytimoshinsergeytimoshin
committed
feat: add grpc_port configuration to tests
1 parent 5e85e0d commit 331aad5

7 files changed

Lines changed: 45 additions & 44 deletions

File tree

‎forester/tests/e2e_test.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ async fn e2e_test() {
250250
"../target/deploy/create_address_test_program.so".to_string(),
251251
)],
252252
limit_ledger_size: None,
253+
grpc_port: None,
253254
}))
254255
.await;
255256
spawn_prover().await;

‎forester/tests/test_batch_append_spent.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ async fn test_batch_sequence() {
5050
wait_time: 10,
5151
sbf_programs: vec![],
5252
limit_ledger_size: None,
53+
grpc_port: None,
5354
}))
5455
.await;
5556

‎program-tests/compressed-token-test/tests/v1.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5443,6 +5443,7 @@ async fn test_transfer_with_photon_and_batched_tree() {
54435443
wait_time: 15,
54445444
sbf_programs: vec![],
54455445
limit_ledger_size: None,
5446+
grpc_port: None,
54465447
})
54475448
.await;
54485449

‎program-tests/system-cpi-v2-test/tests/event.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,7 @@ async fn generate_photon_test_data_multiple_events() {
538538
"../../target/deploy/create_address_test_program.so".to_string(),
539539
)],
540540
limit_ledger_size: None,
541+
grpc_port: None,
541542
})
542543
.await;
543544

‎sdk-libs/client/src/indexer/photon_indexer.rs‎

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1618,33 +1618,33 @@ impl Indexer for PhotonIndexer {
16181618
let result: Result<Response<QueueElementsResult>, IndexerError> = match result {
16191619
Ok(api_response) => match api_response.result {
16201620
Some(api_result) => {
1621-
println!("get_queue_elements response {:?}", api_result);
16221621
if api_result.context.slot < config.slot {
16231622
return Err(IndexerError::IndexerNotSyncedToSlot);
16241623
}
16251624

16261625
// Parse output queue elements
1627-
let output_queue_elements =
1628-
api_result.output_queue_elements.map(|elements| {
1626+
let output_queue_elements = api_result
1627+
.output_queue_elements
1628+
.map(|elements| {
16291629
elements
16301630
.iter()
1631-
.map(|x| {
1632-
let proof = x
1631+
.map(|x| -> Result<_, IndexerError> {
1632+
let proof: Vec<Hash> = x
16331633
.proof
16341634
.iter()
1635-
.map(|x| Hash::from_base58(x).unwrap())
1636-
.collect();
1637-
let root = Hash::from_base58(&x.root).unwrap();
1638-
let leaf = Hash::from_base58(&x.leaf).unwrap();
1639-
let merkle_tree = Hash::from_base58(&x.tree).unwrap();
1635+
.map(|p| Hash::from_base58(p))
1636+
.collect::<Result<Vec<_>, _>>()?;
1637+
let root = Hash::from_base58(&x.root)?;
1638+
let leaf = Hash::from_base58(&x.leaf)?;
1639+
let merkle_tree = Hash::from_base58(&x.tree)?;
16401640
let tx_hash = x
16411641
.tx_hash
16421642
.as_ref()
1643-
.map(|x| Hash::from_base58(x).unwrap());
1644-
let account_hash =
1645-
Hash::from_base58(&x.account_hash).unwrap();
1643+
.map(|h| Hash::from_base58(h))
1644+
.transpose()?;
1645+
let account_hash = Hash::from_base58(&x.account_hash)?;
16461646

1647-
MerkleProofWithContext {
1647+
Ok(MerkleProofWithContext {
16481648
proof,
16491649
root,
16501650
leaf_index: x.leaf_index,
@@ -1653,33 +1653,35 @@ impl Indexer for PhotonIndexer {
16531653
root_seq: x.root_seq,
16541654
tx_hash,
16551655
account_hash,
1656-
}
1656+
})
16571657
})
1658-
.collect()
1659-
});
1658+
.collect::<Result<Vec<_>, _>>()
1659+
})
1660+
.transpose()?;
16601661

16611662
// Parse input queue elements
1662-
let input_queue_elements =
1663-
api_result.input_queue_elements.map(|elements| {
1663+
let input_queue_elements = api_result
1664+
.input_queue_elements
1665+
.map(|elements| {
16641666
elements
16651667
.iter()
1666-
.map(|x| {
1667-
let proof = x
1668+
.map(|x| -> Result<_, IndexerError> {
1669+
let proof: Vec<Hash> = x
16681670
.proof
16691671
.iter()
1670-
.map(|x| Hash::from_base58(x).unwrap())
1671-
.collect();
1672-
let root = Hash::from_base58(&x.root).unwrap();
1673-
let leaf = Hash::from_base58(&x.leaf).unwrap();
1674-
let merkle_tree = Hash::from_base58(&x.tree).unwrap();
1672+
.map(|p| Hash::from_base58(p))
1673+
.collect::<Result<Vec<_>, _>>()?;
1674+
let root = Hash::from_base58(&x.root)?;
1675+
let leaf = Hash::from_base58(&x.leaf)?;
1676+
let merkle_tree = Hash::from_base58(&x.tree)?;
16751677
let tx_hash = x
16761678
.tx_hash
16771679
.as_ref()
1678-
.map(|x| Hash::from_base58(x).unwrap());
1679-
let account_hash =
1680-
Hash::from_base58(&x.account_hash).unwrap();
1680+
.map(|h| Hash::from_base58(h))
1681+
.transpose()?;
1682+
let account_hash = Hash::from_base58(&x.account_hash)?;
16811683

1682-
MerkleProofWithContext {
1684+
Ok(MerkleProofWithContext {
16831685
proof,
16841686
root,
16851687
leaf_index: x.leaf_index,
@@ -1688,10 +1690,11 @@ impl Indexer for PhotonIndexer {
16881690
root_seq: x.root_seq,
16891691
tx_hash,
16901692
account_hash,
1691-
}
1693+
})
16921694
})
1693-
.collect()
1694-
});
1695+
.collect::<Result<Vec<_>, _>>()
1696+
})
1697+
.transpose()?;
16951698

16961699
Ok(Response {
16971700
context: Context {

‎sdk-libs/program-test/src/indexer/test_indexer.rs‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -652,15 +652,14 @@ impl Indexer for TestIndexer {
652652

653653
let merkle_proofs_with_context = queue_elements
654654
.iter()
655-
.enumerate()
656-
.map(|(i, element)| MerkleProofWithContext {
655+
.map(|element| MerkleProofWithContext {
657656
proof: Vec::new(),
658657
leaf: [0u8; 32],
659658
leaf_index: 0,
660659
merkle_tree: address_tree_bundle.accounts.merkle_tree.to_bytes(),
661660
root: address_tree_bundle.root(),
662661
tx_hash: None,
663-
root_seq: output_queue_start_index + i as u64,
662+
root_seq: output_queue_start_index,
664663
account_hash: *element,
665664
})
666665
.collect();
@@ -837,14 +836,8 @@ impl Indexer for TestIndexer {
837836
None
838837
};
839838

840-
let output_queue_index = if output_queue_elements.is_some()
841-
&& output_queue_start_index
842-
< state_tree_bundle.output_queue_elements.len() as u64
843-
{
844-
Some(
845-
state_tree_bundle.output_queue_elements[output_queue_start_index as usize]
846-
.1,
847-
)
839+
let output_queue_index = if output_queue_elements.is_some() {
840+
Some(output_queue_start_index)
848841
} else {
849842
None
850843
};

‎sdk-tests/client-test/tests/light_client.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ async fn test_all_endpoints() {
5656
wait_time: 10,
5757
sbf_programs: vec![],
5858
limit_ledger_size: None,
59+
grpc_port: None,
5960
};
6061

6162
spawn_validator(config).await;

0 commit comments

Comments
 (0)