plumb staking_account and voting_keypair from multinode-demo to Vote (#3199)
* plumb staking_account and voting_keypair from bash to Vote
This commit is contained in:
committed by
Greg Fitzgerald
parent
c8c85ff93b
commit
0acdbc0d03
@ -2,11 +2,34 @@ use bs58;
|
||||
use generic_array::typenum::U32;
|
||||
use generic_array::GenericArray;
|
||||
use std::fmt;
|
||||
use std::mem;
|
||||
use std::str::FromStr;
|
||||
|
||||
#[repr(C)]
|
||||
#[derive(Serialize, Deserialize, Clone, Copy, Default, Eq, PartialEq, Ord, PartialOrd, Hash)]
|
||||
pub struct Pubkey(GenericArray<u8, U32>);
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub enum ParsePubkeyError {
|
||||
WrongSize,
|
||||
Invalid,
|
||||
}
|
||||
|
||||
impl FromStr for Pubkey {
|
||||
type Err = ParsePubkeyError;
|
||||
|
||||
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
||||
let pubkey_vec = bs58::decode(s)
|
||||
.into_vec()
|
||||
.map_err(|_| ParsePubkeyError::Invalid)?;
|
||||
if pubkey_vec.len() != mem::size_of::<Pubkey>() {
|
||||
Err(ParsePubkeyError::WrongSize)
|
||||
} else {
|
||||
Ok(Pubkey::new(&pubkey_vec))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Pubkey {
|
||||
pub fn new(pubkey_vec: &[u8]) -> Self {
|
||||
Pubkey(GenericArray::clone_from_slice(&pubkey_vec))
|
||||
@ -30,3 +53,46 @@ impl fmt::Display for Pubkey {
|
||||
write!(f, "{}", bs58::encode(self.0).into_string())
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::signature::{Keypair, KeypairUtil};
|
||||
use bs58;
|
||||
|
||||
#[test]
|
||||
fn pubkey_fromstr() {
|
||||
let pubkey = Keypair::new().pubkey();
|
||||
let mut pubkey_base58_str = bs58::encode(pubkey.0).into_string();
|
||||
|
||||
dbg!(&pubkey_base58_str);
|
||||
|
||||
assert_eq!(pubkey_base58_str.parse::<Pubkey>(), Ok(pubkey));
|
||||
|
||||
pubkey_base58_str.push_str(&bs58::encode(pubkey.0).into_string());
|
||||
assert_eq!(
|
||||
pubkey_base58_str.parse::<Pubkey>(),
|
||||
Err(ParsePubkeyError::WrongSize)
|
||||
);
|
||||
|
||||
pubkey_base58_str.truncate(pubkey_base58_str.len() / 2);
|
||||
assert_eq!(pubkey_base58_str.parse::<Pubkey>(), Ok(pubkey));
|
||||
|
||||
pubkey_base58_str.truncate(pubkey_base58_str.len() / 2);
|
||||
assert_eq!(
|
||||
pubkey_base58_str.parse::<Pubkey>(),
|
||||
Err(ParsePubkeyError::WrongSize)
|
||||
);
|
||||
|
||||
let mut pubkey_base58_str = bs58::encode(pubkey.0).into_string();
|
||||
assert_eq!(pubkey_base58_str.parse::<Pubkey>(), Ok(pubkey));
|
||||
|
||||
// throw some non-base58 stuff in there
|
||||
pubkey_base58_str.replace_range(..1, "I");
|
||||
assert_eq!(
|
||||
pubkey_base58_str.parse::<Pubkey>(),
|
||||
Err(ParsePubkeyError::Invalid)
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user