Apply suggestions from code review

Co-authored-by: Michael Vines <[email protected]>

programs/ed25519-tests/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-ed25519-program-tests"
-version = "1.10.0"
+version = "1.9.7"
 authors = ["Solana Maintainers <[email protected]>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
@@ -12,8 +12,8 @@ publish = false
 assert_matches = "1.5.0"
 ed25519-dalek = "=1.0.1"
 rand = "0.7.0"
-solana-program-test = { path = "../../program-test", version = "=1.10.0" }
-solana-sdk = { path = "../../sdk", version = "=1.10.0" }
+solana-program-test = { path = "../../program-test", version = "=1.9.7" }
+solana-sdk = { path = "../../sdk", version = "=1.9.7" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

runtime/src/genesis_utils.rs

@@ -24,28 +24,6 @@ pub fn bootstrap_validator_stake_lamports() -> u64 {
     StakeState::get_rent_exempt_reserve(&Rent::default())
 }
 
-<<<<<<< HEAD
-=======
-// Number of lamports automatically used for genesis accounts
-pub const fn genesis_sysvar_and_builtin_program_lamports() -> u64 {
-    const NUM_BUILTIN_PROGRAMS: u64 = 6;
-    const FEES_SYSVAR_MIN_BALANCE: u64 = 946_560;
-    const STAKE_HISTORY_MIN_BALANCE: u64 = 114_979_200;
-    const CLOCK_SYSVAR_MIN_BALANCE: u64 = 1_169_280;
-    const RENT_SYSVAR_MIN_BALANCE: u64 = 1_009_200;
-    const EPOCH_SCHEDULE_SYSVAR_MIN_BALANCE: u64 = 1_120_560;
-    const RECENT_BLOCKHASHES_SYSVAR_MIN_BALANCE: u64 = 42_706_560;
-
-    FEES_SYSVAR_MIN_BALANCE
-        + STAKE_HISTORY_MIN_BALANCE
-        + CLOCK_SYSVAR_MIN_BALANCE
-        + RENT_SYSVAR_MIN_BALANCE
-        + EPOCH_SCHEDULE_SYSVAR_MIN_BALANCE
-        + RECENT_BLOCKHASHES_SYSVAR_MIN_BALANCE
-        + NUM_BUILTIN_PROGRAMS
-}
-
->>>>>>> 813725dfe (Fix ed25519 builtin program handling (#23182))
 pub struct ValidatorVoteKeypairs {
     pub node_keypair: Keypair,
     pub vote_keypair: Keypair,