Refactor UniFFI standalone functions to enum/record methods

android/app/src/main/java/org/bitcoinppl/cove/MainActivity.kt

@@ -82,7 +82,6 @@ import org.bitcoinppl.cove.views.TermsAndConditionsSheet
 import org.bitcoinppl.cove_core.bootstrap
 import org.bitcoinppl.cove_core.activeMigration
 import org.bitcoinppl.cove_core.bootstrapProgress
-import org.bitcoinppl.cove.utils.isMigrationInProgress
 import org.bitcoinppl.cove_core.cancelBootstrap
 import org.bitcoinppl.cove_core.AfterPinAction
 import org.bitcoinppl.cove_core.AppInitException
@@ -390,7 +389,7 @@ class MainActivity : FragmentActivity() {
             delay(66)
 
             val step = bootstrapProgress()
-            if (!migrationDetected && step.isMigrationInProgress) {
+            if (!migrationDetected && step.isMigrationInProgress()) {
                 migrationDetected = true
             }
 

android/app/src/main/java/org/bitcoinppl/cove/flows/SettingsFlow/AppearanceSettingsScreen.kt

@@ -36,7 +36,6 @@ import org.bitcoinppl.cove.views.SectionHeader
 import org.bitcoinppl.cove_core.AppAction
 import org.bitcoinppl.cove_core.types.ColorSchemeSelection
 import org.bitcoinppl.cove_core.types.allColorSchemes
-import org.bitcoinppl.cove_core.types.colorSchemeSelectionCapitalizedString
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -118,7 +117,7 @@ private fun ColorSchemeRow(
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Text(
-            text = colorSchemeSelectionCapitalizedString(colorScheme),
+            text = colorScheme.capitalizedString(),
             style = MaterialTheme.typography.bodyLarge,
         )
 

android/app/src/main/java/org/bitcoinppl/cove/flows/SettingsFlow/FiatCurrencySettingsScreen.kt

@@ -36,8 +36,6 @@ import org.bitcoinppl.cove.views.SectionHeader
 import org.bitcoinppl.cove_core.AppAction
 import org.bitcoinppl.cove_core.FiatCurrency
 import org.bitcoinppl.cove_core.allFiatCurrencies
-import org.bitcoinppl.cove_core.fiatCurrencyEmoji
-import org.bitcoinppl.cove_core.fiatCurrencyToString
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -119,7 +117,7 @@ private fun FiatCurrencyRow(
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Text(
-            text = "${fiatCurrencyEmoji(fiatCurrency)} ${fiatCurrencyToString(fiatCurrency)}",
+            text = "${fiatCurrency.emojiString()} ${fiatCurrency}",
             style = MaterialTheme.typography.bodyLarge,
         )
 

android/app/src/main/java/org/bitcoinppl/cove/flows/SettingsFlow/NetworkSettingsScreen.kt

@@ -41,7 +41,6 @@ import org.bitcoinppl.cove.views.SectionHeader
 import org.bitcoinppl.cove_core.AppAction
 import org.bitcoinppl.cove_core.types.Network
 import org.bitcoinppl.cove_core.types.allNetworks
-import org.bitcoinppl.cove_core.types.networkToString
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -113,7 +112,7 @@ fun NetworkSettingsScreen(
         AlertDialog(
             onDismissRequest = { pendingNetworkChange = null },
             title = { Text("Warning: Network Changed") },
-            text = { Text("You've changed your network to ${networkToString(network)}") },
+            text = { Text("You've changed your network to ${network.toString()}") },
             confirmButton = {
                 TextButton(
                     onClick = {
@@ -153,7 +152,7 @@ private fun NetworkRow(
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Text(
-            text = networkToString(network),
+            text = network.toString(),
             style = MaterialTheme.typography.bodyLarge,
         )
 

android/app/src/main/java/org/bitcoinppl/cove/flows/SettingsFlow/NodeSettingsScreen.kt

@@ -60,7 +60,6 @@ import org.bitcoinppl.cove_core.ApiType
 import org.bitcoinppl.cove_core.NodeSelection
 import org.bitcoinppl.cove_core.NodeSelector
 import org.bitcoinppl.cove_core.NodeSelectorException
-import org.bitcoinppl.cove_core.nodeSelectionToNode
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -75,7 +74,7 @@ fun NodeSettingsScreen(
     val nodeList = remember { nodeSelector.nodeList() }
     var selectedNodeSelection by remember { mutableStateOf(nodeSelector.selectedNode()) }
     var selectedNodeName by remember {
-        mutableStateOf(nodeSelectionToNode(selectedNodeSelection).name)
+        mutableStateOf(selectedNodeSelection.toNode().name)
     }
 
     var customUrl by remember { mutableStateOf("") }
@@ -109,7 +108,7 @@ fun NodeSettingsScreen(
         if (showCustomFields && customUrl.isEmpty()) {
             val savedNode = selectedNodeSelection
             if (savedNode is NodeSelection.Custom) {
-                val node = nodeSelectionToNode(savedNode)
+                val node = savedNode.toNode()
                 val matchesType =
                     when (selectedNodeName) {
                         customElectrum -> node.apiType == ApiType.ELECTRUM
@@ -266,7 +265,7 @@ fun NodeSettingsScreen(
                     Column {
                         // preset nodes
                         nodeList.forEachIndexed { index, nodeSelection ->
-                            val node = nodeSelectionToNode(nodeSelection)
+                            val node = nodeSelection.toNode()
                             NodeRow(
                                 nodeName = node.name,
                                 isSelected = selectedNodeName == node.name,

android/app/src/main/java/org/bitcoinppl/cove/flows/TapSignerFlow/TapSignerEnterPinView.kt

@@ -383,5 +383,5 @@ private suspend fun signAction(
 private fun isAuthError(error: Exception): Boolean {
     // check if error is a bad auth error using type-safe FFI function
     return error is org.bitcoinppl.cove_core.TapSignerReaderException &&
-        org.bitcoinppl.cove_core.tapSignerErrorIsAuthError(error)
+        error.isAuthError()
 }

android/app/src/main/java/org/bitcoinppl/cove_core/types/cove_types.kt

@@ -644,8 +644,6 @@ external fun uniffi_cove_types_checksum_func_address_string_spaced_out(
 ): Short
 external fun uniffi_cove_types_checksum_func_all_color_schemes(
 ): Short
-external fun uniffi_cove_types_checksum_func_color_scheme_selection_capitalized_string(
-): Short
 external fun uniffi_cove_types_checksum_func_confirm_details_preview_new(
 ): Short
 external fun uniffi_cove_types_checksum_func_qr_density_is_equal(
@@ -660,20 +658,10 @@ external fun uniffi_cove_types_checksum_func_fee_speed_to_circle_color(
 ): Short
 external fun uniffi_cove_types_checksum_func_all_networks(
 ): Short
-external fun uniffi_cove_types_checksum_func_network_to_string(
-): Short
 external fun uniffi_cove_types_checksum_func_all_units(
 ): Short
 external fun uniffi_cove_types_checksum_func_previewnewutxolist(
 ): Short
-external fun uniffi_cove_types_checksum_func_utxo_date(
-): Short
-external fun uniffi_cove_types_checksum_func_utxo_hash_to_uint(
-): Short
-external fun uniffi_cove_types_checksum_func_utxo_is_equal(
-): Short
-external fun uniffi_cove_types_checksum_func_utxo_name(
-): Short
 external fun uniffi_cove_types_checksum_method_address_hashtouint(
 ): Short
 external fun uniffi_cove_types_checksum_method_address_spaced_out(
@@ -1232,6 +1220,8 @@ external fun uniffi_cove_types_fn_clone_utxolist(`handle`: Long,uniffi_out_err:
 ): Long
 external fun uniffi_cove_types_fn_free_utxolist(`handle`: Long,uniffi_out_err: UniffiRustCallStatus, 
 ): Unit
+external fun uniffi_cove_types_fn_method_colorschemeselection_capitalized_string(`ptr`: RustBuffer.ByValue,uniffi_out_err: UniffiRustCallStatus, 
+): RustBuffer.ByValue
 external fun uniffi_cove_types_fn_method_qrexportformat_uniffi_trait_display(`ptr`: RustBuffer.ByValue,uniffi_out_err: UniffiRustCallStatus, 
 ): RustBuffer.ByValue
 external fun uniffi_cove_types_fn_method_feespeed_uniffi_trait_display(`ptr`: RustBuffer.ByValue,uniffi_out_err: UniffiRustCallStatus, 
@@ -1242,6 +1232,14 @@ external fun uniffi_cove_types_fn_method_network_uniffi_trait_display(`ptr`: Rus
 ): RustBuffer.ByValue
 external fun uniffi_cove_types_fn_method_bitcoinunit_uniffi_trait_display(`ptr`: RustBuffer.ByValue,uniffi_out_err: UniffiRustCallStatus, 
 ): RustBuffer.ByValue
+external fun uniffi_cove_types_fn_method_utxo_date(`ptr`: RustBuffer.ByValue,uniffi_out_err: UniffiRustCallStatus, 
+): RustBuffer.ByValue
+external fun uniffi_cove_types_fn_method_utxo_hash_to_uint(`ptr`: RustBuffer.ByValue,uniffi_out_err: UniffiRustCallStatus, 
+): Long
+external fun uniffi_cove_types_fn_method_utxo_is_equal(`ptr`: RustBuffer.ByValue,`other`: RustBuffer.ByValue,uniffi_out_err: UniffiRustCallStatus, 
+): Byte
+external fun uniffi_cove_types_fn_method_utxo_name(`ptr`: RustBuffer.ByValue,uniffi_out_err: UniffiRustCallStatus, 
+): RustBuffer.ByValue
 external fun uniffi_cove_types_fn_method_utxo_uniffi_trait_eq_eq(`ptr`: RustBuffer.ByValue,`other`: RustBuffer.ByValue,uniffi_out_err: UniffiRustCallStatus, 
 ): Byte
 external fun uniffi_cove_types_fn_method_utxo_uniffi_trait_eq_ne(`ptr`: RustBuffer.ByValue,`other`: RustBuffer.ByValue,uniffi_out_err: UniffiRustCallStatus, 
@@ -1256,8 +1254,6 @@ external fun uniffi_cove_types_fn_func_address_string_spaced_out(`address`: Rust
 ): RustBuffer.ByValue
 external fun uniffi_cove_types_fn_func_all_color_schemes(uniffi_out_err: UniffiRustCallStatus, 
 ): RustBuffer.ByValue
-external fun uniffi_cove_types_fn_func_color_scheme_selection_capitalized_string(`colorScheme`: RustBuffer.ByValue,uniffi_out_err: UniffiRustCallStatus, 
-): RustBuffer.ByValue
 external fun uniffi_cove_types_fn_func_confirm_details_preview_new(uniffi_out_err: UniffiRustCallStatus, 
 ): Long
 external fun uniffi_cove_types_fn_func_qr_density_is_equal(`lhs`: Long,`rhs`: Long,uniffi_out_err: UniffiRustCallStatus, 
@@ -1272,20 +1268,10 @@ external fun uniffi_cove_types_fn_func_fee_speed_to_circle_color(`feeSpeed`: Rus
 ): RustBuffer.ByValue
 external fun uniffi_cove_types_fn_func_all_networks(uniffi_out_err: UniffiRustCallStatus, 
 ): RustBuffer.ByValue
-external fun uniffi_cove_types_fn_func_network_to_string(`network`: RustBuffer.ByValue,uniffi_out_err: UniffiRustCallStatus, 
-): RustBuffer.ByValue
 external fun uniffi_cove_types_fn_func_all_units(uniffi_out_err: UniffiRustCallStatus, 
 ): RustBuffer.ByValue
 external fun uniffi_cove_types_fn_func_previewnewutxolist(`outputCount`: Byte,`changeCount`: Byte,uniffi_out_err: UniffiRustCallStatus, 
 ): RustBuffer.ByValue
-external fun uniffi_cove_types_fn_func_utxo_date(`utxo`: RustBuffer.ByValue,uniffi_out_err: UniffiRustCallStatus, 
-): RustBuffer.ByValue
-external fun uniffi_cove_types_fn_func_utxo_hash_to_uint(`utxo`: RustBuffer.ByValue,uniffi_out_err: UniffiRustCallStatus, 
-): Long
-external fun uniffi_cove_types_fn_func_utxo_is_equal(`lhs`: RustBuffer.ByValue,`rhs`: RustBuffer.ByValue,uniffi_out_err: UniffiRustCallStatus, 
-): Byte
-external fun uniffi_cove_types_fn_func_utxo_name(`utxo`: RustBuffer.ByValue,uniffi_out_err: UniffiRustCallStatus, 
-): RustBuffer.ByValue
 external fun ffi_cove_types_rustbuffer_alloc(`size`: Long,uniffi_out_err: UniffiRustCallStatus, 
 ): RustBuffer.ByValue
 external fun ffi_cove_types_rustbuffer_from_bytes(`bytes`: ForeignBytes.ByValue,uniffi_out_err: UniffiRustCallStatus, 
@@ -1417,9 +1403,6 @@ private fun uniffiCheckApiChecksums(lib: IntegrityCheckingUniffiLib) {
     if (lib.uniffi_cove_types_checksum_func_all_color_schemes() != 49693.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
-    if (lib.uniffi_cove_types_checksum_func_color_scheme_selection_capitalized_string() != 30731.toShort()) {
-        throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
-    }
     if (lib.uniffi_cove_types_checksum_func_confirm_details_preview_new() != 41030.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
@@ -1441,27 +1424,12 @@ private fun uniffiCheckApiChecksums(lib: IntegrityCheckingUniffiLib) {
     if (lib.uniffi_cove_types_checksum_func_all_networks() != 5848.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
-    if (lib.uniffi_cove_types_checksum_func_network_to_string() != 16428.toShort()) {
-        throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
-    }
     if (lib.uniffi_cove_types_checksum_func_all_units() != 35208.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
     if (lib.uniffi_cove_types_checksum_func_previewnewutxolist() != 31621.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
-    if (lib.uniffi_cove_types_checksum_func_utxo_date() != 26239.toShort()) {
-        throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
-    }
-    if (lib.uniffi_cove_types_checksum_func_utxo_hash_to_uint() != 33471.toShort()) {
-        throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
-    }
-    if (lib.uniffi_cove_types_checksum_func_utxo_is_equal() != 34078.toShort()) {
-        throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
-    }
-    if (lib.uniffi_cove_types_checksum_func_utxo_name() != 48729.toShort()) {
-        throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
-    }
     if (lib.uniffi_cove_types_checksum_method_address_hashtouint() != 25307.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
@@ -9332,6 +9300,46 @@ data class Utxo (
     var `type`: UtxoType
 
 ): Disposable{
+     fun `date`(): kotlin.String {
+            return FfiConverterString.lift(
+    uniffiRustCall() { _status ->
+    UniffiLib.uniffi_cove_types_fn_method_utxo_date(FfiConverterTypeUtxo.lower(this),
+        _status)
+}
+    )
+    }
+
+
+     fun `hashToUint`(): kotlin.ULong {
+            return FfiConverterULong.lift(
+    uniffiRustCall() { _status ->
+    UniffiLib.uniffi_cove_types_fn_method_utxo_hash_to_uint(FfiConverterTypeUtxo.lower(this),
+        _status)
+}
+    )
+    }
+
+
+     fun `isEqual`(`other`: Utxo): kotlin.Boolean {
+            return FfiConverterBoolean.lift(
+    uniffiRustCall() { _status ->
+    UniffiLib.uniffi_cove_types_fn_method_utxo_is_equal(FfiConverterTypeUtxo.lower(this),
+        FfiConverterTypeUtxo.lower(`other`),_status)
+}
+    )
+    }
+
+
+     fun `name`(): kotlin.String {
+            return FfiConverterString.lift(
+    uniffiRustCall() { _status ->
+    UniffiLib.uniffi_cove_types_fn_method_utxo_name(FfiConverterTypeUtxo.lower(this),
+        _status)
+}
+    )
+    }
+
+
 
 
 
@@ -9614,6 +9622,16 @@ enum class ColorSchemeSelection {
     DARK,
     SYSTEM;
 
+     fun `capitalizedString`(): kotlin.String {
+            return FfiConverterString.lift(
+    uniffiRustCall() { _status ->
+    UniffiLib.uniffi_cove_types_fn_method_colorschemeselection_capitalized_string(FfiConverterTypeColorSchemeSelection.lower(this),
+        _status)
+}
+    )
+    }
+
+
 
 
 
@@ -10818,16 +10836,6 @@ public typealias FfiConverterTypeWalletId = FfiConverterString
     )
     }
 
- fun `colorSchemeSelectionCapitalizedString`(`colorScheme`: ColorSchemeSelection): kotlin.String {
-            return FfiConverterString.lift(
-    uniffiRustCall() { _status ->
-    UniffiLib.uniffi_cove_types_fn_func_color_scheme_selection_capitalized_string(
-
-        FfiConverterTypeColorSchemeSelection.lower(`colorScheme`),_status)
-}
-    )
-    }
-
 
         /**
          * Preview `ConfirmDetails` for `SwiftUI` previews
@@ -10904,16 +10912,6 @@ public typealias FfiConverterTypeWalletId = FfiConverterString
     )
     }
 
- fun `networkToString`(`network`: Network): kotlin.String {
-            return FfiConverterString.lift(
-    uniffiRustCall() { _status ->
-    UniffiLib.uniffi_cove_types_fn_func_network_to_string(
-
-        FfiConverterTypeNetwork.lower(`network`),_status)
-}
-    )
-    }
-
  fun `allUnits`(): List<BitcoinUnit> {
             return FfiConverterSequenceTypeBitcoinUnit.lift(
     uniffiRustCall() { _status ->
@@ -10934,45 +10932,5 @@ public typealias FfiConverterTypeWalletId = FfiConverterString
     )
     }
 
- fun `utxoDate`(`utxo`: Utxo): kotlin.String {
-            return FfiConverterString.lift(
-    uniffiRustCall() { _status ->
-    UniffiLib.uniffi_cove_types_fn_func_utxo_date(
-
-        FfiConverterTypeUtxo.lower(`utxo`),_status)
-}
-    )
-    }
-
- fun `utxoHashToUint`(`utxo`: Utxo): kotlin.ULong {
-            return FfiConverterULong.lift(
-    uniffiRustCall() { _status ->
-    UniffiLib.uniffi_cove_types_fn_func_utxo_hash_to_uint(
-
-        FfiConverterTypeUtxo.lower(`utxo`),_status)
-}
-    )
-    }
-
- fun `utxoIsEqual`(`lhs`: Utxo, `rhs`: Utxo): kotlin.Boolean {
-            return FfiConverterBoolean.lift(
-    uniffiRustCall() { _status ->
-    UniffiLib.uniffi_cove_types_fn_func_utxo_is_equal(
-
-        FfiConverterTypeUtxo.lower(`lhs`),FfiConverterTypeUtxo.lower(`rhs`),_status)
-}
-    )
-    }
-
- fun `utxoName`(`utxo`: Utxo): kotlin.String {
-            return FfiConverterString.lift(
-    uniffiRustCall() { _status ->
-    UniffiLib.uniffi_cove_types_fn_func_utxo_name(
-
-        FfiConverterTypeUtxo.lower(`utxo`),_status)
-}
-    )
-    }
-