* Revert "add genesis stake placeholders (#6969)"
This reverts commit 8a879faac7
.
* fixup! Revert "add genesis stake placeholders (#6969)"
* fixup! fixup! Revert "add genesis stake placeholders (#6969)"
* fixup! fixup! fixup! Revert "add genesis stake placeholders (#6969)"
* fixup! fixup! fixup! fixup! Revert "add genesis stake placeholders (#6969)"
* fmt
This commit is contained in:
committed by
Michael Vines
parent
b8cd0a1bc0
commit
702f7cc51d
@ -1871,10 +1871,7 @@ mod tests {
|
||||
stake_account: bob_keypair.into(),
|
||||
staker: None,
|
||||
withdrawer: None,
|
||||
lockup: Lockup {
|
||||
epoch: 0,
|
||||
custodian,
|
||||
},
|
||||
lockup: Lockup { slot: 0, custodian },
|
||||
lamports: 1234,
|
||||
};
|
||||
let signature = process_command(&config);
|
||||
|
@ -271,7 +271,7 @@ impl StakeSubCommands for App<'_, '_> {
|
||||
|
||||
pub fn parse_stake_create_account(matches: &ArgMatches<'_>) -> Result<CliCommandInfo, CliError> {
|
||||
let stake_account = keypair_of(matches, "stake_account").unwrap();
|
||||
let epoch = value_of(&matches, "lockup").unwrap_or(0);
|
||||
let slot = value_of(&matches, "lockup").unwrap_or(0);
|
||||
let custodian = pubkey_of(matches, "custodian").unwrap_or_default();
|
||||
let staker = pubkey_of(matches, "authorized_staker");
|
||||
let withdrawer = pubkey_of(matches, "authorized_withdrawer");
|
||||
@ -282,7 +282,7 @@ pub fn parse_stake_create_account(matches: &ArgMatches<'_>) -> Result<CliCommand
|
||||
stake_account: stake_account.into(),
|
||||
staker,
|
||||
withdrawer,
|
||||
lockup: Lockup { custodian, epoch },
|
||||
lockup: Lockup { custodian, slot },
|
||||
lamports,
|
||||
},
|
||||
require_keypair: true,
|
||||
@ -547,7 +547,7 @@ pub fn process_show_stake_account(
|
||||
println!("authorized withdrawer: {}", authorized.staker);
|
||||
}
|
||||
fn show_lockup(lockup: &Lockup) {
|
||||
println!("lockup epoch: {}", lockup.epoch);
|
||||
println!("lockup slot: {}", lockup.slot);
|
||||
println!("lockup custodian: {}", lockup.custodian);
|
||||
}
|
||||
match stake_account.state() {
|
||||
@ -793,7 +793,7 @@ mod tests {
|
||||
staker: Some(authorized),
|
||||
withdrawer: Some(authorized),
|
||||
lockup: Lockup {
|
||||
epoch: 43,
|
||||
slot: 43,
|
||||
custodian,
|
||||
},
|
||||
lamports: 50
|
||||
@ -823,7 +823,10 @@ mod tests {
|
||||
stake_account: stake_account_keypair.into(),
|
||||
staker: None,
|
||||
withdrawer: None,
|
||||
lockup: Lockup::default(),
|
||||
lockup: Lockup {
|
||||
slot: 0,
|
||||
custodian: Pubkey::default(),
|
||||
},
|
||||
lamports: 50
|
||||
},
|
||||
require_keypair: true
|
||||
|
Reference in New Issue
Block a user