From 0e85f6de0fd94dc8b39724c9492d950deff00ece Mon Sep 17 00:00:00 2001 From: Dave Hrycyszyn Date: Fri, 24 Jan 2020 15:39:27 +0000 Subject: [PATCH] topology: using base58 for decoding keys --- common/topology/src/mix.rs | 3 +-- common/topology/src/provider.rs | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/common/topology/src/mix.rs b/common/topology/src/mix.rs index 5236e191fa..4f5a9c2b2e 100644 --- a/common/topology/src/mix.rs +++ b/common/topology/src/mix.rs @@ -14,9 +14,8 @@ pub struct Node { impl Node { pub fn get_pub_key_bytes(&self) -> [u8; 32] { - let decoded_key_bytes = base64::decode_config(&self.pub_key, base64::URL_SAFE).unwrap(); let mut key_bytes = [0; 32]; - key_bytes.copy_from_slice(&decoded_key_bytes[..]); + bs58::decode(&self.pub_key).into(&mut key_bytes).unwrap(); key_bytes } } diff --git a/common/topology/src/provider.rs b/common/topology/src/provider.rs index e9d4869e0e..a4d268822b 100644 --- a/common/topology/src/provider.rs +++ b/common/topology/src/provider.rs @@ -20,9 +20,8 @@ pub struct Node { impl Node { pub fn get_pub_key_bytes(&self) -> [u8; 32] { - let decoded_key_bytes = base64::decode_config(&self.pub_key, base64::URL_SAFE).unwrap(); let mut key_bytes = [0; 32]; - key_bytes.copy_from_slice(&decoded_key_bytes[..]); + bs58::decode(&self.pub_key).into(&mut key_bytes).unwrap(); key_bytes } }