From 7415fda312ab85b49ff0e6fed880bc9f8a0073b0 Mon Sep 17 00:00:00 2001
From: Reisen <dparyente@jumptrading.com>
Date: Fri, 29 Oct 2021 10:24:05 +0000
Subject: [PATCH] terra/token_bridge: migration prep

Change-Id: I3bc054265e6296ce2fa4191c0395ca8531b0f4a8
---
 terra/contracts/token-bridge/src/contract.rs | 10 +++++-----
 terra/contracts/wormhole/src/byte_utils.rs   | 11 ++++-------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/terra/contracts/token-bridge/src/contract.rs b/terra/contracts/token-bridge/src/contract.rs
index 9d7f40e2e..57a4a42d4 100644
--- a/terra/contracts/token-bridge/src/contract.rs
+++ b/terra/contracts/token-bridge/src/contract.rs
@@ -131,7 +131,7 @@ pub fn migrate(deps: DepsMut, _env: Env, _msg: MigrateMsg) -> StdResult<Response
                 .api
                 .addr_humanize(&contract_address.into())?
                 .to_string(),
-            new_code_id: 3,
+            new_code_id: 767,
             msg: to_binary(&MigrateMsg {})?,
         }));
     }
@@ -449,8 +449,8 @@ fn handle_create_asset_meta_token(
         token_chain: CHAIN_ID,
         token_address: extend_address_to_32(&asset_canonical),
         decimals: token_info.decimals,
-        symbol: extend_string_to_32(&token_info.symbol)?,
-        name: extend_string_to_32(&token_info.name)?,
+        symbol: extend_string_to_32(&token_info.symbol),
+        name: extend_string_to_32(&token_info.name),
     };
 
     let token_bridge_message = TokenBridgeMessage {
@@ -489,8 +489,8 @@ fn handle_create_asset_meta_native_token(
         token_chain: CHAIN_ID,
         token_address: asset_id.clone(),
         decimals: 6,
-        symbol: extend_string_to_32(&symbol)?,
-        name: extend_string_to_32(&symbol)?,
+        symbol: extend_string_to_32(&symbol),
+        name: extend_string_to_32(&symbol),
     };
     let token_bridge_message = TokenBridgeMessage {
         action: Action::ATTEST_META,
diff --git a/terra/contracts/wormhole/src/byte_utils.rs b/terra/contracts/wormhole/src/byte_utils.rs
index 9f3a0e636..1b59db973 100644
--- a/terra/contracts/wormhole/src/byte_utils.rs
+++ b/terra/contracts/wormhole/src/byte_utils.rs
@@ -59,14 +59,11 @@ pub fn extend_address_to_32(addr: &CanonicalAddr) -> Vec<u8> {
     result
 }
 
-pub fn extend_string_to_32(s: &String) -> StdResult<Vec<u8>> {
+pub fn extend_string_to_32(s: &str) -> Vec<u8> {
     let bytes = s.as_bytes();
-    if bytes.len() > 32 {
-        return Err(StdError::generic_err("string more than 32 "));
-    }
-
-    let result = vec![0; 32 - bytes.len()];
-    Ok([bytes.to_vec(), result].concat())
+    let len = usize::min(32, bytes.len());
+    let result = vec![0; 32 - len];
+    [bytes[..len].to_vec(), result].concat()
 }
 
 pub fn get_string_from_32(v: &Vec<u8>) -> StdResult<String> {