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

Include Rent in ProgramTest::start() output (#13356)

Browse Source 
(cherry picked from commit c3d2d2134c)

Co-authored-by: Michael Vines <mvines@gmail.com>
This commit is contained in:
mergify[bot]
2020-11-03 03:12:17 +00:00
committed by GitHub
parent 0bf45cbab6
commit fe8b2b7850
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
program-test/src/lib.rs
View File

@ -387,6 +387,14 @@ impl Default for ProgramTest {
} }
} }
// Values returned by `ProgramTest::start`
pub struct StartOutputs {
pub banks_client: BanksClient,
pub payer: Keypair,
pub recent_blockhash: Hash,
pub rent: Rent,
}
impl ProgramTest { impl ProgramTest {
pub fn new( pub fn new(
program_name: &str, program_name: &str,
@ -536,7 +544,7 @@ impl ProgramTest {
/// ///
/// Returns a `BanksClient` interface into the test environment as well as a payer `Keypair` /// Returns a `BanksClient` interface into the test environment as well as a payer `Keypair`
/// with SOL for sending transactions /// with SOL for sending transactions
pub async fn start(self) -> (BanksClient, Keypair, Hash) { pub async fn start(self) -> StartOutputs {
{ {
use std::sync::Once; use std::sync::Once;
static ONCE: Once = Once::new(); static ONCE: Once = Once::new();
@ -555,7 +563,8 @@ impl ProgramTest {
bootstrap_validator_stake_lamports, bootstrap_validator_stake_lamports,
); );
let mut genesis_config = gci.genesis_config; let mut genesis_config = gci.genesis_config;
genesis_config.rent = Rent::default(); let rent = Rent::default();
genesis_config.rent = rent;
genesis_config.fee_rate_governor = genesis_config.fee_rate_governor =
solana_program::fee_calculator::FeeRateGovernor::default(); solana_program::fee_calculator::FeeRateGovernor::default();
let payer = gci.mint_keypair; let payer = gci.mint_keypair;
@ -607,6 +616,11 @@ impl ProgramTest {
.unwrap_or_else(|err| panic!("Failed to start banks client: {}", err)); .unwrap_or_else(|err| panic!("Failed to start banks client: {}", err));
let recent_blockhash = banks_client.get_recent_blockhash().await.unwrap(); let recent_blockhash = banks_client.get_recent_blockhash().await.unwrap();
(banks_client, payer, recent_blockhash) StartOutputs {
banks_client,
payer,
recent_blockhash,
rent,
}
} }
} }