Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fromStr for private and public keys #60

Merged
merged 7 commits into from
Dec 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ pub enum Error {
HexError(#[from] FromHexError),
#[error("unsupported operation: {0}")]
UnsupportedOperation(String),
#[error("failed to convert vector {0:?} to array")]
VectorToArrayConversionError(Vec<u8>),
#[error("alias must be {min_length:?} to {max_length:?} length of {alphabet:?} and may have a prefix \"{max_length:?}{chain_id:?}:\"")]
InvalidAliasName {
min_length: u8,
Expand Down
19 changes: 19 additions & 0 deletions src/model/account/address.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,16 @@ impl fmt::Debug for Address {
}
}

impl std::str::FromStr for Address {
type Err = Error;

fn from_str(base58string: &str) -> Result<Address> {
devyatkinalexandr marked this conversation as resolved.
Show resolved Hide resolved
Ok(Address {
bytes: Base58::decode(base58string)?,
})
}
}

impl Address {
pub fn from_public_key(chain_id: u8, public_key: &PublicKey) -> Result<Address> {
Ok(Address {
Expand Down Expand Up @@ -72,6 +82,7 @@ mod tests {
use crate::model::{ByteString, ChainId};
use serde_json::Value;
use std::borrow::Borrow;
use std::str::FromStr;

#[test]
fn test_address_from_public_key() {
Expand All @@ -97,6 +108,14 @@ mod tests {
assert_eq!(expected_address, address.encoded())
}

#[test]
fn test_address_std_from_str() {
let expected_address = "3MtQQX9NwYH5URGGcS2e6ptEgV7wTFesaRW";
let address =
Address::from_str(expected_address).expect("failed to get address from string");
assert_eq!(expected_address, address.encoded())
}

#[test]
fn test_address_from_json() -> Result<()> {
let expected_address = "3MtQQX9NwYH5URGGcS2e6ptEgV7wTFesaRW";
Expand Down
23 changes: 23 additions & 0 deletions src/model/account/private_key.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,18 @@ pub struct PrivateKey {
public_key: PublicKey,
}

impl std::str::FromStr for PrivateKey {
type Err = Error;

fn from_str(base58string: &str) -> Result<PrivateKey> {
let bytes = Base58::decode(base58string)?;
let bytes_array: [u8; 32] = bytes
.try_into()
.map_err(Error::VectorToArrayConversionError)?;
PrivateKey::from_bytes(bytes_array)
}
}

impl PrivateKey {
pub fn from_seed(seed_phrase: &str, nonce: u8) -> Result<Self> {
let hash_seed = Crypto::get_account_seed(seed_phrase.as_bytes(), nonce)?;
Expand Down Expand Up @@ -79,6 +91,8 @@ impl PrivateKey {

#[cfg(test)]
mod tests {
use std::str::FromStr;

use crate::error::Error::InvalidBytesLength;
use crate::error::Result;
use crate::model::account::PrivateKey;
Expand Down Expand Up @@ -149,4 +163,13 @@ mod tests {
assert_eq!(private_key.bytes(), [0_u8; 32]);
Ok(())
}

#[test]
fn test_private_key_std_from_str() -> Result<()> {
let seed_phrase = "blame vacant regret company chase trip grant funny brisk innocent";
let private_key_from_seed = PrivateKey::from_seed(seed_phrase, 0)?;
let private_key_from_str = PrivateKey::from_str(&private_key_from_seed.encoded())?;
assert_eq!(private_key_from_seed.bytes(), private_key_from_str.bytes());
Ok(())
}
}
19 changes: 19 additions & 0 deletions src/model/account/public_key.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@ impl fmt::Debug for PublicKey {
}
}

impl std::str::FromStr for PublicKey {
type Err = Error;

fn from_str(base58string: &str) -> Result<PublicKey> {
devyatkinalexandr marked this conversation as resolved.
Show resolved Hide resolved
let bytes = Base58::decode(base58string)?;
Ok(PublicKey { bytes })
}
}

impl PublicKey {
pub fn from_bytes(bytes: &[u8]) -> Result<PublicKey> {
if bytes.len() != 32 {
Expand Down Expand Up @@ -71,6 +80,8 @@ impl TryFrom<String> for PublicKey {

#[cfg(test)]
mod tests {
use std::str::FromStr;

use crate::error::Error::InvalidBytesLength;
use crate::error::Result;
use crate::model::account::{PrivateKey, PublicKey};
Expand Down Expand Up @@ -136,6 +147,14 @@ mod tests {
Ok(())
}

#[test]
fn test_public_key_std_from_str() -> Result<()> {
let expected_string = "8cj6YzvQPhSHGvnjupNTW8zrADTT8CMAAd2xTuej84gB".to_owned();
let public_key = PublicKey::from_str(&expected_string)?;
assert_eq!(expected_string, public_key.encoded());
Ok(())
}

#[test]
fn test_byte_string_for_public_key() -> Result<()> {
let public_key: PublicKey = "8cj6YzvQPhSHGvnjupNTW8zrADTT8CMAAd2xTuej84gB".try_into()?;
Expand Down
Loading