gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

v1.9: Enforce tx metadata upload to bigtable (#23212)

Browse Source 
* Enforce tx metadata upload with static types (#23028)

* resolve conflicts

* fix test
This commit is contained in:
Justin Starry
2022-02-23 12:03:17 +08:00
committed by GitHub
parent 8413700a2f
commit 450404f800
16 changed files with 367 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
programs/bpf/tests/programs.rs
View File

@ -61,7 +61,8 @@ use solana_sdk::{
};
use solana_transaction_status::{
token_balances::collect_token_balances, ConfirmedTransaction, InnerInstructions,
TransactionStatusMeta, TransactionWithStatusMeta,
TransactionStatusMeta,
TransactionWithMetadata,
};
use std::{collections::HashMap, env, fs::File, io::Read, path::PathBuf, str::FromStr, sync::Arc};
@ -420,9 +421,9 @@ fn execute_transactions(
Ok(ConfirmedTransaction {
slot: bank.slot(),
transaction: TransactionWithStatusMeta {
transaction: TransactionWithMetadata {
transaction: tx.clone(),
meta: Some(tx_status_meta),
meta: tx_status_meta,
},
block_time: None,
})
@ -2466,8 +2467,8 @@ fn test_program_upgradeable_locks() {
assert!(matches!(
results1[0],
Ok(ConfirmedTransaction {
transaction: TransactionWithStatusMeta {
meta: Some(TransactionStatusMeta { status: Ok(()), .. }),
transaction: TransactionWithMetadata {
meta: TransactionStatusMeta { status: Ok(()), .. },
..
},
..
@ -2478,14 +2479,14 @@ fn test_program_upgradeable_locks() {
assert!(matches!(
results2[0],
Ok(ConfirmedTransaction {
transaction: TransactionWithStatusMeta {
meta: Some(TransactionStatusMeta {
transaction: TransactionWithMetadata {
meta: TransactionStatusMeta {
status: Err(TransactionError::InstructionError(
0,
InstructionError::ProgramFailedToComplete
)),
..
}),
},
..
},
..