Skip to content

Commit

Permalink
Merge pull request #41 from nymtech/feature/bs58
Browse files Browse the repository at this point in the history
Removed base64 in favour of base58.
  • Loading branch information
jstuczyn authored Jan 27, 2020
2 parents c3ba144 + ccff84f commit 8424f4b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
base64 = "0.11.0"
bs58 = "0.3.0"
curve25519-dalek = "1.2.3"
hmac = "0.7.1"
log = "0.4"
Expand Down
12 changes: 6 additions & 6 deletions src/route.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ pub type DestinationAddressBytes = [u8; DESTINATION_ADDRESS_LENGTH];
pub struct NodeAddressBytes(pub [u8; NODE_ADDRESS_LENGTH]);

impl NodeAddressBytes {
pub fn to_b64_string(&self) -> String {
base64::encode_config(&self.0, base64::URL_SAFE)
pub fn to_base58_string(&self) -> String {
bs58::encode(&self.0).into_string()
}

pub fn from_b64_string(value: String) -> Self {
let decoded_address = base64::decode_config(&value, base64::URL_SAFE).unwrap();
pub fn from_base58_string(value: String) -> Self {
let decoded_address = bs58::decode(&value).into_vec().unwrap();
assert_eq!(decoded_address.len(), NODE_ADDRESS_LENGTH);
let mut address_bytes = [0; NODE_ADDRESS_LENGTH];
address_bytes.copy_from_slice(&decoded_address[..]);
Expand Down Expand Up @@ -102,8 +102,8 @@ mod address_encoding {
#[test]
fn it_is_possible_to_encode_and_decode_address() {
let dummy_address = NodeAddressBytes([42u8; 32]);
let dummy_address_str = dummy_address.to_b64_string();
let recovered = NodeAddressBytes::from_b64_string(dummy_address_str);
let dummy_address_str = dummy_address.to_base58_string();
let recovered = NodeAddressBytes::from_base58_string(dummy_address_str);
assert_eq!(dummy_address, recovered)
}
}

0 comments on commit 8424f4b

Please sign in to comment.