From ebc45bd73f5d299ec61bc93ae52f1d1aae9a1894 Mon Sep 17 00:00:00 2001
From: Justin Starry <justin@solana.com>
Date: Sun, 9 Aug 2020 18:28:25 +0800
Subject: [PATCH] Fallback to base64 account encoding if json parse fails
 (#11483)

* Fallback to base64 account encoding if json parse fails

* Remove default binary conversion
---
 account-decoder/src/lib.rs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/account-decoder/src/lib.rs b/account-decoder/src/lib.rs
index 108e1c1b32..4b83a7a319 100644
--- a/account-decoder/src/lib.rs
+++ b/account-decoder/src/lib.rs
@@ -37,12 +37,6 @@ pub enum UiAccountData {
     Binary64(String),
 }
 
-impl From<Vec<u8>> for UiAccountData {
-    fn from(data: Vec<u8>) -> Self {
-        Self::Binary(bs58::encode(data).into_string())
-    }
-}
-
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
 #[serde(rename_all = "camelCase")]
 pub enum UiAccountEncoding {
@@ -59,7 +53,9 @@ impl UiAccount {
         additional_data: Option<AccountAdditionalData>,
     ) -> Self {
         let data = match encoding {
-            UiAccountEncoding::Binary => account.data.into(),
+            UiAccountEncoding::Binary => {
+                UiAccountData::Binary(bs58::encode(account.data).into_string())
+            }
             UiAccountEncoding::Binary64 => UiAccountData::Binary64(base64::encode(account.data)),
             UiAccountEncoding::JsonParsed => {
                 if let Ok(parsed_data) =
@@ -67,7 +63,7 @@ impl UiAccount {
                 {
                     UiAccountData::Json(parsed_data)
                 } else {
-                    account.data.into()
+                    UiAccountData::Binary64(base64::encode(account.data))
                 }
             }
         };