fix tari address

Author: SWvheerden

base_layer/common_types/src/tari_address/mod.rs

@@ -259,12 +259,6 @@ impl TariAddress {
 
     /// helper function to convert emojis to u8
     fn emoji_to_bytes(emoji: &str) -> Result<Vec<u8>, TariAddressError> {
-        // The string must be the correct size, including the checksum
-        if !(emoji.chars().count() == TARI_ADDRESS_INTERNAL_SINGLE_SIZE ||
-            emoji.chars().count() == TARI_ADDRESS_INTERNAL_DUAL_SIZE)
-        {
-            return Err(TariAddressError::InvalidSize);
-        }
         if emoji.chars().count() == TARI_ADDRESS_INTERNAL_SINGLE_SIZE {
             SingleAddress::emoji_to_bytes(emoji)
         } else {

base_layer/wallet_ffi/src/lib.rs

@@ -1968,13 +1968,14 @@ pub unsafe extern "C" fn emoji_id_to_tari_address(
         return ptr::null_mut();
     }
 
-    match CStr::from_ptr(emoji)
+    let cstring = CStr::from_ptr(emoji)
         .to_str()
         .map_err(|_| TariAddressError::InvalidEmoji)
-        .and_then(TariAddress::from_emoji_string)
-    {
+        .unwrap();
+    match TariAddress::from_emoji_string(cstring) {
         Ok(address) => Box::into_raw(Box::new(address)),
-        Err(_) => {
+        Err(e) => {
+            dbg!(e);
             *error_out = LibWalletError::from(InterfaceError::InvalidEmojiId).code;
             ptr::null_mut()
         },
@@ -10924,6 +10925,23 @@ mod test {
         }
     }
 
+    #[test]
+    fn test_emoji_string() {
+        unsafe {
+            let mut error = 0;
+            let error_ptr = &mut error as *mut c_int;
+            let emoji_string = "🐢🐋🏦💤🐣👣📱🚜🍍🍉🎺🥊📖🔦😷👾🐺🐬👗🔱🌻💍🎢🎪🛵🐋🐊👞🥝🐍🌸📷🔧🎭🐮⏰🍇💯🐛🌴💨🔌🍪📟🎲🐝🤢🎉🔑🌵🚒🐙😍🐝🍑🐜👂🧩⏰🎀🚀🍵👑💐🎮🎮🎣🎒🍬🍳🍸🍷🍶🍯🍵🥄🍭🥐💣";
+
+            let _tari_address = TariAddress::from_emoji_string(emoji_string).unwrap();
+
+            let cstring = CString::new(emoji_string).unwrap();
+            let cstring_ptr: *const c_char = CString::into_raw(cstring) as *const c_char;
+
+            let _result = emoji_id_to_tari_address(cstring_ptr, error_ptr);
+            assert_eq!(*error_ptr, 0, "No error expected");
+        }
+    }
+
     #[test]
     fn test_emoji_convert() {
         unsafe {