Fix conflicts

solana-labs · Sep 20, 2023 · 267ee9c · 267ee9c
1 parent a929f98
commit 267ee9c
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 193 deletions.
diff --git a/cli/tests/stake.rs b/cli/tests/stake.rs
@@ -1468,7 +1468,7 @@ fn test_stake_split() {
     config.signers = vec![&default_signer];
 
     let minimum_balance = rpc_client
-        .get_minimum_balance_for_rent_exemption(StakeStateV2::size_of())
+        .get_minimum_balance_for_rent_exemption(StakeState::size_of())
         .unwrap();
 
     let mut config_offline = CliConfig::recent_for_tests();
@@ -1498,14 +1498,7 @@ fn test_stake_split() {
     check_balance!(1_000_000_000_000, &rpc_client, &offline_pubkey);
 
     // Create stake account, identity is authority
-<<<<<<< HEAD
-    let stake_balance = rpc_client
-        .get_minimum_balance_for_rent_exemption(StakeState::size_of())
-        .unwrap()
-        + 10_000_000_000;
-=======
     let stake_balance = minimum_balance + 10_000_000_000;
->>>>>>> bca41edf20 (Make active stake consistent in split (#33295))
     let stake_keypair = keypair_from_seed(&[0u8; 32]).unwrap();
     let stake_account_pubkey = stake_keypair.pubkey();
     config.signers.push(&stake_keypair);